Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117163 => 117164)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:39:23 UTC (rev 117164)
@@ -1,3 +1,13 @@
+2012-05-15 Sam Weinig <[email protected]>
+
+ Disable CSS regions
+ <rdar://problem/10887709>
+
+ Reviewed by Anders Carlsson.
+
+ * dom/Document.idl:
+ #ifdef out webkitGetFlowByName.
+
2012-05-15 Lucas Forschler <[email protected]>
Merge 116960
Modified: branches/safari-536-branch/Source/WebCore/dom/Document.idl (117163 => 117164)
--- branches/safari-536-branch/Source/WebCore/dom/Document.idl 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebCore/dom/Document.idl 2012-05-15 21:39:23 UTC (rev 117164)
@@ -253,7 +253,9 @@
[V8EnabledAtRuntime] void webkitExitFullscreen();
#endif
+#if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
WebKitNamedFlow webkitGetFlowByName(in DOMString name);
+#endif
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
// Event handler DOM attributes
Modified: branches/safari-536-branch/Source/WebKit/mac/ChangeLog (117163 => 117164)
--- branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebKit/mac/ChangeLog 2012-05-15 21:39:23 UTC (rev 117164)
@@ -1,3 +1,14 @@
+2012-05-15 Sam Weinig <[email protected]>
+
+ Disable CSS regions
+ <rdar://problem/10887709>
+
+ Reviewed by Anders Carlsson.
+
+ * WebView/WebPreferences.mm:
+ (+[WebPreferences initialize]):
+ Disable regions by default
+
2012-05-15 Lucas Forschler <[email protected]>
Merge 116820
Modified: branches/safari-536-branch/Source/WebKit/mac/WebView/WebPreferences.mm (117163 => 117164)
--- branches/safari-536-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebKit/mac/WebView/WebPreferences.mm 2012-05-15 21:39:23 UTC (rev 117164)
@@ -369,7 +369,7 @@
[NSNumber numberWithBool:YES], WebKitAcceleratedCompositingEnabledPreferenceKey,
// CSS Shaders also need WebGL enabled (which is disabled by default), so we can keep it enabled for now.
[NSNumber numberWithBool:YES], WebKitCSSCustomFilterEnabledPreferenceKey,
- [NSNumber numberWithBool:YES], WebKitCSSRegionsEnabledPreferenceKey,
+ [NSNumber numberWithBool:NO], WebKitCSSRegionsEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitAcceleratedDrawingEnabledPreferenceKey,
[NSNumber numberWithBool:NO], WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
[NSNumber numberWithBool:NO], WebKitShowDebugBordersPreferenceKey,
Modified: branches/safari-536-branch/Source/WebKit2/ChangeLog (117163 => 117164)
--- branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebKit2/ChangeLog 2012-05-15 21:39:23 UTC (rev 117164)
@@ -1,3 +1,13 @@
+2012-05-15 Sam Weinig <[email protected]>
+
+ Disable CSS regions
+ <rdar://problem/10887709>
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPreferencesStore.h:
+ Disable regions by default
+
2012-05-15 Lucas Forschler <[email protected]>
Merge 116993
Modified: branches/safari-536-branch/Source/WebKit2/Shared/WebPreferencesStore.h (117163 => 117164)
--- branches/safari-536-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-05-15 21:38:04 UTC (rev 117163)
+++ branches/safari-536-branch/Source/WebKit2/Shared/WebPreferencesStore.h 2012-05-15 21:39:23 UTC (rev 117164)
@@ -74,7 +74,7 @@
macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \
macro(CSSCustomFilterEnabled, cssCustomFilterEnabled, Bool, bool, true) \
macro(WebGLEnabled, webGLEnabled, Bool, bool, false) \
- macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
+ macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, false) \
macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, false) \
macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
