Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (171611 => 171612)
--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-25 20:26:35 UTC (rev 171611)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-25 20:37:11 UTC (rev 171612)
@@ -1,3 +1,14 @@
+2014-07-25 Dean Jackson <[email protected]>
+
+ Revert back to the Safari behavior from Mavericks and Mountain Lion
+ on this branch.
+ <rdar://problem/17800530>
+
+ Reviewed by Ricky Mondello.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]): Set WebGL preference default to off.
+
2014-07-24 Lucas Forschler <[email protected]>
Merge r171575
Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm (171611 => 171612)
--- branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-25 20:26:35 UTC (rev 171611)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2014-07-25 20:37:11 UTC (rev 171612)
@@ -492,7 +492,7 @@
#endif
[NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShowRepaintCounterPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitWebGLEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitWebGLEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitMultithreadedWebGLEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitForceSoftwareWebGLRenderingPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAccelerated2dCanvasEnabledPreferenceKey,
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171611 => 171612)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 20:26:35 UTC (rev 171611)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-25 20:37:11 UTC (rev 171612)
@@ -1,3 +1,13 @@
+2014-07-25 Dean Jackson <[email protected]>
+
+ Revert back to the Safari behavior from Mavericks and Mountain Lion
+ on this branch.
+ <rdar://problem/17800530>
+
+ Reviewed by Ricky Mondello.
+
+ * Shared/WebPreferencesDefinitions.h: Set WebGL preference default to off.
+
2014-07-24 Lucas Forschler <[email protected]>
Merge r171471
Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h (171611 => 171612)
--- branches/safari-600.1-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-25 20:26:35 UTC (rev 171611)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-25 20:37:11 UTC (rev 171612)
@@ -112,7 +112,7 @@
macro(ForceCompositingMode, forceCompositingMode, Bool, bool, false) \
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(WebGLEnabled, webGLEnabled, Bool, bool, false) \
macro(MultithreadedWebGLEnabled, multithreadedWebGLEnabled, Bool, bool, false) \
macro(ForceSoftwareWebGLRendering, forceSoftwareWebGLRendering, Bool, bool, false) \
macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \