Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
@@ -1,3 +1,22 @@
+2014-09-19 Dean Jackson <d...@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ We should not allow multithreaded GL access. Remove the
+ feature.
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::create):
+ * page/Settings.in:
+ * platform/graphics/GraphicsContext3D.h:
+ (WebCore::GraphicsContext3D::Attributes::Attributes):
+ * platform/graphics/mac/GraphicsContext3DMac.mm:
+ (WebCore::GraphicsContext3D::GraphicsContext3D):
+
2014-09-26 Lorenzo Tilve <lti...@igalia.com>
[GTK] Fix support for the initial-letter CSS property to first-letter
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-10-07 07:42:40 UTC (rev 174392)
@@ -431,9 +431,6 @@
attributes.shareResources = false;
attributes.preferDiscreteGPU = true;
- if (frame->settings().multithreadedWebGLEnabled())
- attributes.multithreaded = true;
-
if (frame->settings().forceSoftwareWebGLRendering())
attributes.forceSoftwareRenderer = true;
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/page/Settings.in 2014-10-07 07:42:40 UTC (rev 174392)
@@ -100,7 +100,6 @@
webGLEnabled initial=false
webGLErrorsToConsoleEnabled initial=true
openGLMultisamplingEnabled initial=true
-multithreadedWebGLEnabled initial=false
privilegedWebGLExtensionsEnabled initial=false
forceSoftwareWebGLRendering initial=false
accelerated2dCanvasEnabled initial=false
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/GraphicsContext3D.h 2014-10-07 07:42:40 UTC (rev 174392)
@@ -441,7 +441,6 @@
, noExtensions(false)
, shareResources(true)
, preferDiscreteGPU(false)
- , multithreaded(false)
, forceSoftwareRenderer(false)
{
}
@@ -455,7 +454,6 @@
bool noExtensions;
bool shareResources;
bool preferDiscreteGPU;
- bool multithreaded;
bool forceSoftwareRenderer;
};
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm 2014-10-07 07:42:40 UTC (rev 174392)
@@ -207,14 +207,6 @@
// Set the current context to the one given to us.
CGLSetCurrentContext(m_contextObj);
- if (attrs.multithreaded) {
- err = CGLEnable(m_contextObj, kCGLCEMPEngine);
- if (err != kCGLNoError) {
- // We could not create a multi-threaded context.
- m_contextObj = 0;
- return;
- }
- }
#endif // !PLATFORM(IOS)
validateAttributes();
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
@@ -1,3 +1,22 @@
+2014-09-19 Dean Jackson <d...@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ Remove the setting to allow multithreaded WebGL.
+
+ * WebView/WebPreferenceKeysPrivate.h:
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ (-[WebPreferences multithreadedWebGLEnabled]): Deleted.
+ (-[WebPreferences setMultithreadedWebGLEnabled:]): Deleted.
+ * WebView/WebPreferencesPrivate.h:
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2014-09-17 Daniel Bates <daba...@apple.com>
Unreviewed, rolling out r173695.
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
@@ -106,7 +106,6 @@
#define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
#define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
#define WebKitWebGLEnabledPreferenceKey @"WebKitWebGLEnabled"
-#define WebKitMultithreadedWebGLEnabledPreferenceKey @"WebKitMultithreadedWebGLEnabled"
#define WebKitForceSoftwareWebGLRenderingPreferenceKey @"WebKitForceSoftwareWebGLRendering"
#define WebKitAccelerated2dCanvasEnabledPreferenceKey @"WebKitAccelerated2dCanvasEnabled"
#define WebKitFrameFlatteningEnabledPreferenceKey @"WebKitFrameFlatteningEnabled"
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferences.mm 2014-10-07 07:42:40 UTC (rev 174392)
@@ -494,7 +494,6 @@
[NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
[NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
- [NSNumber numberWithBool:NO], WebKitMultithreadedWebGLEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitForceSoftwareWebGLRenderingPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitSubpixelCSSOMElementMetricsEnabledPreferenceKey,
@@ -1874,16 +1873,6 @@
[self _setBoolValue:enabled forKey:WebKitWebGLEnabledPreferenceKey];
}
-- (BOOL)multithreadedWebGLEnabled
-{
- return [self _boolValueForKey:WebKitMultithreadedWebGLEnabledPreferenceKey];
-}
-
-- (void)setMultithreadedWebGLEnabled:(BOOL)enabled
-{
- [self _setBoolValue:enabled forKey:WebKitMultithreadedWebGLEnabledPreferenceKey];
-}
-
- (BOOL)forceSoftwareWebGLRendering
{
return [self _boolValueForKey:WebKitForceSoftwareWebGLRenderingPreferenceKey];
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
@@ -220,9 +220,6 @@
- (BOOL)webGLEnabled;
- (void)setWebGLEnabled:(BOOL)enabled;
-- (BOOL)multithreadedWebGLEnabled;
-- (void)setMultithreadedWebGLEnabled:(BOOL)enabled;
-
- (BOOL)forceSoftwareWebGLRendering;
- (void)setForceSoftwareWebGLRendering:(BOOL)forced;
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit/mac/WebView/WebView.mm 2014-10-07 07:42:40 UTC (rev 174392)
@@ -2333,9 +2333,6 @@
settings.setShowsURLsInToolTips([preferences showsURLsInToolTips]);
settings.setShowsToolTipOverTruncatedText([preferences showsToolTipOverTruncatedText]);
settings.setQTKitEnabled([preferences isQTKitEnabled]);
-
- // FIXME: Should we enable this following <rdar://problem/15290404>?
- settings.setMultithreadedWebGLEnabled([preferences multithreadedWebGLEnabled]);
#endif // PLATFORM(MAC)
#if ENABLE(SQL_DATABASE)
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-07 07:42:40 UTC (rev 174392)
@@ -1,3 +1,21 @@
+2014-09-19 Dean Jackson <d...@apple.com>
+
+ Multithreaded WebGL is a bad idea - remove it
+ https://bugs.webkit.org/show_bug.cgi?id=136964
+ <rdar://problem/18399858>
+
+ Reviewed by Brent Fulgham.
+
+ Remove the setting to allow multithreaded WebGL.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetMultithreadedWebGLEnabled): Deleted.
+ (WKPreferencesGetMultithreadedWebGLEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2014-09-29 Carlos Garcia Campos <cgar...@igalia.com>
REGRESSION(r172919): WebKitPluginProcess fails to scan GTK+2 plugins after r172919.
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-10-07 07:42:40 UTC (rev 174392)
@@ -113,7 +113,6 @@
macro(AcceleratedDrawingEnabled, acceleratedDrawingEnabled, Bool, bool, DEFAULT_ACCELERATED_DRAWING_ENABLED) \
macro(CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing, Bool, bool, DEFAULT_CANVAS_USES_ACCELERATED_DRAWING) \
macro(WebGLEnabled, webGLEnabled, Bool, bool, true) \
- macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2014-10-07 07:42:40 UTC (rev 174392)
@@ -469,16 +469,6 @@
return toImpl(preferencesRef)->webGLEnabled();
}
-void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setMultithreadedWebGLEnabled(flag);
-}
-
-bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->multithreadedWebGLEnabled();
-}
-
void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setForceSoftwareWebGLRendering(flag);
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h 2014-10-07 07:42:40 UTC (rev 174392)
@@ -93,10 +93,6 @@
WK_EXPORT bool WKPreferencesGetWebGLEnabled(WKPreferencesRef);
// Defaults to false.
-WK_EXPORT void WKPreferencesSetMultithreadedWebGLEnabled(WKPreferencesRef, bool);
-WK_EXPORT bool WKPreferencesGetMultithreadedWebGLEnabled(WKPreferencesRef);
-
-// Defaults to false.
WK_EXPORT void WKPreferencesSetForceSoftwareWebGLRendering(WKPreferencesRef, bool);
WK_EXPORT bool WKPreferencesGetForceSoftwareWebGLRendering(WKPreferencesRef);
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (174391 => 174392)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-07 07:26:41 UTC (rev 174391)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-07 07:42:40 UTC (rev 174392)
@@ -2702,7 +2702,6 @@
RuntimeEnabledFeatures::sharedFeatures().setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCompositingEnabledKey()));
settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
- settings.setMultithreadedWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::multithreadedWebGLEnabledKey()));
settings.setForceSoftwareWebGLRendering(store.getBoolValueForKey(WebPreferencesKey::forceSoftwareWebGLRenderingKey()));
settings.setAccelerated2dCanvasEnabled(store.getBoolValueForKey(WebPreferencesKey::accelerated2dCanvasEnabledKey()));
settings.setMediaPlaybackRequiresUserGesture(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackRequiresUserGestureKey()));
