Diff
Modified: trunk/Source/WebCore/ChangeLog (136209 => 136210)
--- trunk/Source/WebCore/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,30 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebCore.exp.in:
+ * WebCore.vcproj/copyForwardingHeaders.cmd:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore):
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (RuntimeEnabledFeatures):
+ (WebCore::RuntimeEnabledFeatures::setCSSRegionsEnabled):
+ (WebCore::RuntimeEnabledFeatures::cssRegionsEnabled):
+ * dom/Document.cpp:
+ (WebCore::Document::cssRegionsEnabled):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ * page/Settings.h:
+ (Settings):
+
2012-11-29 Martin Robinson <[email protected]>
[GTK] [WebKit2] WebKitWebViewBase creates a GL context for the redirected XComposite window crashing WebKit in Xvfb
Modified: trunk/Source/WebCore/WebCore.exp.in (136209 => 136210)
--- trunk/Source/WebCore/WebCore.exp.in 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/WebCore.exp.in 2012-11-30 08:48:28 UTC (rev 136210)
@@ -2695,3 +2695,7 @@
_wkCaptionAppearanceGetTextEdgeStyle
_wkCaptionAppearanceGetSettingsChangedNotification
#endif
+
+#if ENABLE(CSS_REGIONS)
+__ZN7WebCore22RuntimeEnabledFeatures19isCSSRegionsEnabledE
+#endif
Modified: trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd (136209 => 136210)
--- trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/WebCore.vcproj/copyForwardingHeaders.cmd 2012-11-30 08:48:28 UTC (rev 136210)
@@ -63,6 +63,7 @@
xcopy /y /d "%ProjectDir%..\platform\sql\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\platform\cairo\cairo\src\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\bindings\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
+xcopy /y /d "%ProjectDir%..\bindings\generic\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\bindings\js\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\page\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
xcopy /y /d "%ProjectDir%..\page\animation\*.h" "%CONFIGURATIONBUILDDIR%\include\WebCore"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (136209 => 136210)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-30 08:48:28 UTC (rev 136210)
@@ -3151,7 +3151,7 @@
8C0E334E138A92C7008DA94F /* LevelDBWriteBatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C0E334A138A92C7008DA94F /* LevelDBWriteBatch.cpp */; };
8C0E334F138A92C7008DA94F /* LevelDBWriteBatch.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C0E334B138A92C7008DA94F /* LevelDBWriteBatch.h */; };
8C6EA61911EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8C6EA61711EF7E0400FD8EE3 /* RuntimeEnabledFeatures.cpp */; };
- 8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */; };
+ 8C6EA61A11EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C6EA61811EF7E0400FD8EE3 /* RuntimeEnabledFeatures.h */; settings = {ATTRIBUTES = (Private, ); }; };
8CADF2A9135C7B36009EF43F /* LevelDBComparator.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CADF2A3135C7B36009EF43F /* LevelDBComparator.h */; };
8CADF2AA135C7B36009EF43F /* LevelDBDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CADF2A4135C7B36009EF43F /* LevelDBDatabase.cpp */; };
8CADF2AB135C7B36009EF43F /* LevelDBDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CADF2A5135C7B36009EF43F /* LevelDBDatabase.h */; };
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp (136209 => 136210)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -55,6 +55,7 @@
bool RuntimeEnabledFeatures::isDeviceOrientationEnabled = true;
bool RuntimeEnabledFeatures::isSpeechInputEnabled = true;
bool RuntimeEnabledFeatures::isCSSExclusionsEnabled = false;
+bool RuntimeEnabledFeatures::isCSSRegionsEnabled = false;
bool RuntimeEnabledFeatures::isLangAttributeAwareFormControlUIEnabled = false;
#if ENABLE(SCRIPTED_SPEECH)
Modified: trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h (136209 => 136210)
--- trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -71,6 +71,14 @@
static bool cssExclusionsEnabled() { return false; }
#endif
+#if ENABLE(CSS_REGIONS)
+ static void setCSSRegionsEnabled(bool isEnabled) { isCSSRegionsEnabled = isEnabled; }
+ static bool cssRegionsEnabled() { return isCSSRegionsEnabled; }
+#else
+ static void setCSSRegionsEnabled(bool) { }
+ static bool cssRegionsEnabled() { return false; }
+#endif
+
#if ENABLE(FULLSCREEN_API)
// Mozilla version
static bool webkitFullScreenAPIEnabled() { return isFullScreenAPIEnabled; }
@@ -274,6 +282,7 @@
static bool isDeviceOrientationEnabled;
static bool isSpeechInputEnabled;
static bool isCSSExclusionsEnabled;
+ static bool isCSSRegionsEnabled;
WEBCORE_TESTING static bool isLangAttributeAwareFormControlUIEnabled;
#if ENABLE(SCRIPTED_SPEECH)
static bool isScriptedSpeechEnabled;
Modified: trunk/Source/WebCore/dom/Document.cpp (136209 => 136210)
--- trunk/Source/WebCore/dom/Document.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1124,7 +1124,7 @@
bool Document::cssRegionsEnabled() const
{
- return settings() && settings()->cssRegionsEnabled();
+ return RuntimeEnabledFeatures::cssRegionsEnabled();
}
bool Document::cssGridLayoutEnabled() const
Modified: trunk/Source/WebCore/page/Settings.cpp (136209 => 136210)
--- trunk/Source/WebCore/page/Settings.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -164,9 +164,6 @@
#if ENABLE(CSS_STICKY_POSITION)
, m_cssStickyPositionEnabled(true)
#endif
-#if ENABLE(CSS_REGIONS)
- , m_cssRegionsEnabled(false)
-#endif
#if ENABLE(CSS_VARIABLES)
, m_cssVariablesEnabled(false)
#endif
Modified: trunk/Source/WebCore/page/Settings.h (136209 => 136210)
--- trunk/Source/WebCore/page/Settings.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebCore/page/Settings.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -224,14 +224,6 @@
bool cssStickyPositionEnabled() const { return false; }
#endif
-#if ENABLE(CSS_REGIONS)
- void setCSSRegionsEnabled(bool enabled) { m_cssRegionsEnabled = enabled; }
- bool cssRegionsEnabled() const { return m_cssRegionsEnabled; }
-#else
- void setCSSRegionsEnabled(bool) { }
- bool cssRegionsEnabled() const { return false; }
-#endif
-
#if ENABLE(CSS_VARIABLES)
void setCSSVariablesEnabled(bool enabled) { m_cssVariablesEnabled = enabled; }
bool cssVariablesEnabled() const { return m_cssVariablesEnabled; }
@@ -349,9 +341,6 @@
bool m_isCSSCustomFilterEnabled : 1;
#if ENABLE(CSS_STICKY_POSITION)
bool m_cssStickyPositionEnabled : 1;
-#endif
-#if ENABLE(CSS_REGIONS)
- bool m_cssRegionsEnabled : 1;
#endif
#if ENABLE(CSS_VARIABLES)
bool m_cssVariablesEnabled : 1;
Modified: trunk/Source/WebKit/chromium/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,27 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * public/WebRuntimeFeatures.h:
+ (WebRuntimeFeatures):
+ * public/WebSettings.h: moved setExperimentalCSSRegionsEnabled to the bottom of the interface and made it a
+ no-op. After this patch lands and Chromium's webkit_rev is increased, we'll remove any callers in Chromium. Once
+ the Chromium callers are gone and WebKit's chromium_rev is increased, we'll remove the deprecated API.
+ * src/WebRuntimeFeatures.cpp:
+ (WebKit::WebRuntimeFeatures::enableCSSRegions):
+ (WebKit):
+ (WebKit::WebRuntimeFeatures::isCSSRegionsEnabled):
+ * src/WebSettingsImpl.cpp:
+ * src/WebSettingsImpl.h:
+ (WebSettingsImpl):
+
2012-11-29 Rafael Weinstein <[email protected]>
[HTMLTemplateElement] Add feature flag
Modified: trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h (136209 => 136210)
--- trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/public/WebRuntimeFeatures.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -157,6 +157,9 @@
WEBKIT_EXPORT static void enableRequestAutocomplete(bool);
WEBKIT_EXPORT static bool isRequestAutocompleteEnabled();
+ WEBKIT_EXPORT static void enableCSSRegions(bool);
+ WEBKIT_EXPORT static bool isCSSRegionsEnabled();
+
private:
WebRuntimeFeatures();
};
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (136209 => 136210)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -101,7 +101,6 @@
virtual void setExperimentalCSSCustomFilterEnabled(bool) = 0;
virtual void setExperimentalCSSGridLayoutEnabled(bool) = 0;
virtual void setCSSStickyPositionEnabled(bool) = 0;
- virtual void setExperimentalCSSRegionsEnabled(bool) = 0;
virtual void setExperimentalCSSVariablesEnabled(bool) = 0;
virtual void setExperimentalWebGLEnabled(bool) = 0;
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON) = 0;
@@ -174,6 +173,9 @@
// DEPRECATED (renamed. remove this after all call sites changed to the new name)
void setApplyDefaultDeviceScaleFactorInCompositor(bool enabled) { setApplyDeviceScaleFactorInCompositor(enabled); }
+ // DEPRECATED
+ void setExperimentalCSSRegionsEnabled(bool) { }
+
protected:
~WebSettings() { }
};
Modified: trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp (136209 => 136210)
--- trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/src/WebRuntimeFeatures.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -621,6 +621,16 @@
return RuntimeEnabledFeatures::cssExclusionsEnabled();
}
+void WebRuntimeFeatures::enableCSSRegions(bool enable)
+{
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(enable);
+}
+
+bool WebRuntimeFeatures::isCSSRegionsEnabled()
+{
+ return RuntimeEnabledFeatures::cssRegionsEnabled();
+}
+
void WebRuntimeFeatures::enableRequestAutocomplete(bool enable)
{
#if ENABLE(REQUEST_AUTOCOMPLETE)
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (136209 => 136210)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -371,11 +371,6 @@
m_settings->setCSSStickyPositionEnabled(enabled);
}
-void WebSettingsImpl::setExperimentalCSSRegionsEnabled(bool enabled)
-{
- m_settings->setCSSRegionsEnabled(enabled);
-}
-
void WebSettingsImpl::setExperimentalCSSGridLayoutEnabled(bool enabled)
{
m_settings->setCSSGridLayoutEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (136209 => 136210)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -93,7 +93,6 @@
virtual void setExperimentalCSSCustomFilterEnabled(bool);
virtual void setExperimentalCSSGridLayoutEnabled(bool);
virtual void setCSSStickyPositionEnabled(bool);
- virtual void setExperimentalCSSRegionsEnabled(bool);
virtual void setExperimentalCSSVariablesEnabled(bool);
virtual void setExperimentalWebGLEnabled(bool);
virtual void setFantasyFontFamily(const WebString&, UScriptCode = USCRIPT_COMMON);
Modified: trunk/Source/WebKit/efl/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/efl/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,19 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::setCSSRegionsEnabled):
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+
2012-11-29 Alexey Proskuryakov <[email protected]>
[WK2] Forward cookie jar calls to NetworkProcess
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (136209 => 136210)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -53,6 +53,7 @@
#include <PrintContext.h>
#include <RenderTreeAsText.h>
#include <ResourceLoadScheduler.h>
+#include <RuntimeEnabledFeatures.h>
#include <SchemeRegistry.h>
#include <ScriptValue.h>
#include <Settings.h>
@@ -367,7 +368,7 @@
{
DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
- page->settings()->setCSSRegionsEnabled(enabled);
+ WebCore::RuntimeEnabledFeatures::setCSSRegionsEnabled(enabled);
}
bool DumpRenderTreeSupportEfl::isCommandEnabled(const Evas_Object* ewkView, const char* name)
Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (136209 => 136210)
--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -57,6 +57,7 @@
#include "RefPtrCairo.h"
#include "RenderThemeEfl.h"
#include "ResourceHandle.h"
+#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
#include "TiledBackingStore.h"
#include "c_instance.h"
@@ -821,7 +822,7 @@
priv->pageSettings->setSansSerifFontFamily("sans");
priv->pageSettings->setStandardFontFamily("sans");
priv->pageSettings->setHyperlinkAuditingEnabled(false);
- priv->pageSettings->setCSSRegionsEnabled(true);
+ WebCore::RuntimeEnabledFeatures::setCSSRegionsEnabled(true);
priv->pageSettings->setScriptEnabled(true);
priv->pageSettings->setPluginsEnabled(true);
priv->pageSettings->setLocalStorageEnabled(true);
Modified: trunk/Source/WebKit/gtk/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,17 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setCSSRegionsEnabled):
+
2012-11-29 Alexey Proskuryakov <[email protected]>
[WK2] Forward cookie jar calls to NetworkProcess
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (136209 => 136210)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -690,7 +690,7 @@
void DumpRenderTreeSupportGtk::setCSSRegionsEnabled(WebKitWebView* webView, bool enabled)
{
- core(webView)->settings()->setCSSRegionsEnabled(enabled);
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(enabled);
}
void DumpRenderTreeSupportGtk::setCSSCustomFilterEnabled(WebKitWebView* webView, bool enabled)
Modified: trunk/Source/WebKit/mac/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/mac/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/mac/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,17 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebView/WebView.mm:
+ (-[WebView _preferencesChanged:]):
+
2012-11-29 Rafael Weinstein <[email protected]>
[HTMLTemplateElement] Add feature flag
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (136209 => 136210)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2012-11-30 08:48:28 UTC (rev 136210)
@@ -163,6 +163,7 @@
#import <WebCore/ResourceRequest.h>
#import <WebCore/RunLoop.h>
#import <WebCore/RuntimeApplicationChecks.h>
+#import <WebCore/RuntimeEnabledFeatures.h>
#import <WebCore/SchemeRegistry.h>
#import <WebCore/ScriptController.h>
#import <WebCore/ScriptValue.h>
@@ -1538,7 +1539,7 @@
#if ENABLE(CSS_SHADERS)
settings->setCSSCustomFilterEnabled([preferences cssCustomFilterEnabled]);
#endif
- settings->setCSSRegionsEnabled([preferences cssRegionsEnabled]);
+ RuntimeEnabledFeatures::setCSSRegionsEnabled([preferences cssRegionsEnabled]);
settings->setCSSGridLayoutEnabled([preferences cssGridLayoutEnabled]);
#if ENABLE(FULLSCREEN_API)
settings->setFullScreenEnabled([preferences fullScreenEnabled]);
Modified: trunk/Source/WebKit/qt/Api/qwebsettings.cpp (136209 => 136210)
--- trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/qt/Api/qwebsettings.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -41,6 +41,7 @@
#include "Page.h"
#include "PageCache.h"
#include "PluginDatabase.h"
+#include "RuntimeEnabledFeatures.h"
#include "Settings.h"
#include <QDir>
#include <QFileInfo>
@@ -167,7 +168,7 @@
value = attributes.value(QWebSettings::CSSRegionsEnabled,
global->attributes.value(QWebSettings::CSSRegionsEnabled));
- settings->setCSSRegionsEnabled(value);
+ WebCore::RuntimeEnabledFeatures::setCSSRegionsEnabled(value);
value = attributes.value(QWebSettings::CSSGridLayoutEnabled,
global->attributes.value(QWebSettings::CSSGridLayoutEnabled));
settings->setCSSGridLayoutEnabled(value);
Modified: trunk/Source/WebKit/qt/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,17 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * Api/qwebsettings.cpp:
+ (QWebSettingsPrivate::apply):
+
2012-11-29 Alexey Proskuryakov <[email protected]>
[WK2] Forward cookie jar calls to NetworkProcess
Modified: trunk/Source/WebKit/win/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit/win/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/win/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,17 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebView.cpp:
+ (WebView::notifyPreferencesChanged):
+
2012-11-29 Alexey Proskuryakov <[email protected]>
[WK2] Forward cookie jar calls to NetworkProcess
Modified: trunk/Source/WebKit/win/WebView.cpp (136209 => 136210)
--- trunk/Source/WebKit/win/WebView.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit/win/WebView.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -129,6 +129,7 @@
#include <WebCore/ResourceHandle.h>
#include <WebCore/ResourceHandleClient.h>
#include <WebCore/ResourceRequest.h>
+#include <WebCore/RuntimeEnabledFeatures.h>
#include <WebCore/SchemeRegistry.h>
#include <WebCore/ScriptValue.h>
#include <WebCore/Scrollbar.h>
@@ -4671,7 +4672,7 @@
hr = preferences->isCSSRegionsEnabled(&enabled);
if (FAILED(hr))
return hr;
- settings->setCSSRegionsEnabled(!!enabled);
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(!!enabled);
hr = preferences->privateBrowsingEnabled(&enabled);
if (FAILED(hr))
Modified: trunk/Source/WebKit2/ChangeLog (136209 => 136210)
--- trunk/Source/WebKit2/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,23 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+ (WebKit::InjectedBundle::setCSSRegionsEnabled):
+ (WebKit):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ (InjectedBundle):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2012-11-29 Tim Horton <[email protected]>
PDFPlugin: Only plain text can be copied out of PDFs
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (136209 => 136210)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -71,7 +71,7 @@
#include <wtf/OwnArrayPtr.h>
#include <wtf/PassOwnArrayPtr.h>
-#if ENABLE(SHADOW_DOM)
+#if ENABLE(SHADOW_DOM) || ENABLE(CSS_REGIONS)
#include <WebCore/RuntimeEnabledFeatures.h>
#endif
@@ -182,11 +182,15 @@
}
}
+#if ENABLE(CSS_REGIONS)
+ if (preference == "WebKitCSSRegionsEnabled")
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(enabled);
+#endif
+
// Map the names used in LayoutTests with the names used in WebCore::Settings and WebPreferencesStore.
#define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
macro(WebKitCSSCustomFilterEnabled, CSSCustomFilterEnabled, cssCustomFilterEnabled) \
- macro(WebKitCSSRegionsEnabled, CSSRegionsEnabled, cssRegionsEnabled) \
macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
macro(WebKitJavaScriptEnabled, ScriptEnabled, _javascript_Enabled) \
@@ -646,6 +650,15 @@
#endif
}
+void InjectedBundle::setCSSRegionsEnabled(bool enabled)
+{
+#if ENABLE(CSS_REGIONS)
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(enabled);
+#else
+ UNUSED_PARAM(enabled);
+#endif
+}
+
void InjectedBundle::dispatchPendingLoadRequests()
{
resourceLoadScheduler()->servePendingRequests();
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (136209 => 136210)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2012-11-30 08:48:28 UTC (rev 136210)
@@ -180,6 +180,7 @@
void setTabKeyCyclesThroughElements(WebPage*, bool enabled);
void setSerialLoadingEnabled(bool);
void setShadowDOMEnabled(bool);
+ void setCSSRegionsEnabled(bool);
void dispatchPendingLoadRequests();
private:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (136209 => 136210)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -114,6 +114,7 @@
#include <WebCore/ResourceRequest.h>
#include <WebCore/ResourceResponse.h>
#include <WebCore/RunLoop.h>
+#include <WebCore/RuntimeEnabledFeatures.h>
#include <WebCore/SchemeRegistry.h>
#include <WebCore/ScriptValue.h>
#include <WebCore/SerializedScriptValue.h>
@@ -2258,7 +2259,7 @@
settings->setShowDebugBorders(store.getBoolValueForKey(WebPreferencesKey::compositingBordersVisibleKey()));
settings->setShowRepaintCounter(store.getBoolValueForKey(WebPreferencesKey::compositingRepaintCountersVisibleKey()));
settings->setCSSCustomFilterEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCustomFilterEnabledKey()));
- settings->setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
+ RuntimeEnabledFeatures::setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
settings->setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
settings->setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
settings->setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
Modified: trunk/Tools/ChangeLog (136209 => 136210)
--- trunk/Tools/ChangeLog 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Tools/ChangeLog 2012-11-30 08:48:28 UTC (rev 136210)
@@ -1,3 +1,17 @@
+2012-11-30 Mihai Maerean <[email protected]>
+
+ [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=101192
+
+ Reviewed by Hajime Morita.
+
+ Removed the CSS Regions flag in Settings and switched to using the new flag I have added in RuntimeEnabledFeatures.
+
+ Tests: No new tests because there is no functional change.
+
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::applyTo):
+
2012-11-29 Rafael Weinstein <[email protected]>
[HTMLTemplateElement] Add feature flag
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (136209 => 136210)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-30 08:08:59 UTC (rev 136209)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2012-11-30 08:48:28 UTC (rev 136210)
@@ -30,6 +30,7 @@
#include "config.h"
#include "WebPreferences.h"
+#include "WebRuntimeFeatures.h"
#include "WebView.h"
@@ -200,7 +201,7 @@
settings->setDefaultTextEncodingName(defaultTextEncodingName);
settings->setDeveloperExtrasEnabled(developerExtrasEnabled);
settings->setExperimentalWebGLEnabled(experimentalWebGLEnabled);
- settings->setExperimentalCSSRegionsEnabled(experimentalCSSRegionsEnabled);
+ WebRuntimeFeatures::enableCSSRegions(experimentalCSSRegionsEnabled);
settings->setExperimentalCSSGridLayoutEnabled(experimentalCSSGridLayoutEnabled);
settings->setExperimentalCSSCustomFilterEnabled(cssCustomFilterEnabled);
settings->setJavaEnabled(javaEnabled);
