Diff
Modified: trunk/LayoutTests/ChangeLog (121596 => 121597)
--- trunk/LayoutTests/ChangeLog 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/LayoutTests/ChangeLog 2012-06-29 22:51:09 UTC (rev 121597)
@@ -1,3 +1,18 @@
+2012-06-29 Mihai Balan <[email protected]>
+
+ [CSS Regions] Adding feature defines for CSS Regions for Windows
+ https://bugs.webkit.org/show_bug.cgi?id=88645
+
+ Reviewed by Tony Chang.
+
+ Re-trying to enable CSS regions on Windows. This time only enabling
+ regions (not exclusions) because of some strange compilation/linking
+ issues. Fixing a couple of non-regions related tests that get different
+ results once regions are enabled.
+
+ * platform/win/fast/js/global-constructors-expected.txt: Added WebKitCSSRule to expected
+
+
2012-06-29 No'am Rosenthal <[email protected]>0
[Qt][WK2] Unskip/rebaseline some compositing tests.
Modified: trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt (121596 => 121597)
--- trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/LayoutTests/platform/win/fast/js/global-constructors-expected.txt 2012-06-29 22:51:09 UTC (rev 121597)
@@ -310,6 +310,7 @@
PASS WebKitCSSKeyframeRule.toString() is '[object WebKitCSSKeyframeRuleConstructor]'
PASS WebKitCSSKeyframesRule.toString() is '[object WebKitCSSKeyframesRuleConstructor]'
PASS WebKitCSSMatrix.toString() is '[object WebKitCSSMatrixConstructor]'
+PASS WebKitCSSRegionRule.toString() is '[object WebKitCSSRegionRuleConstructor]'
PASS WebKitCSSTransformValue.toString() is '[object WebKitCSSTransformValueConstructor]'
PASS WebKitMutationObserver.toString() is '[object WebKitMutationObserverConstructor]'
PASS WebKitPoint.toString() is '[object WebKitPointConstructor]'
Modified: trunk/Source/WebCore/ChangeLog (121596 => 121597)
--- trunk/Source/WebCore/ChangeLog 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebCore/ChangeLog 2012-06-29 22:51:09 UTC (rev 121597)
@@ -1,3 +1,16 @@
+2012-06-29 Mihai Balan <[email protected]>
+
+ [CSS Regions] Adding feature defines for CSS Regions for Windows
+ https://bugs.webkit.org/show_bug.cgi?id=88645
+
+ Reviewed by Tony Chang.
+
+ Re-trying to enable CSS regions on Windows. This time only enabling
+ regions (not exclusions) because of some strange compilation/linking
+ issues.
+
+ * css/CSSPropertyNames.in: Touched file to make sure property names get properly rebuilt.
+
2012-06-29 Hanna Ma <[email protected]>
Web Inspector: Add data length to resource events on timeline to
Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (121596 => 121597)
--- trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2012-06-29 22:51:09 UTC (rev 121597)
@@ -6,7 +6,7 @@
//
// Microsoft extensions are documented here:
// http://msdn.microsoft.com/workshop/author/css/reference/attributes.asp
-//
+//
// high-priority property names have to be listed first, to simplify the check
// for applying them first.
Modified: trunk/Source/WebKit/win/ChangeLog (121596 => 121597)
--- trunk/Source/WebKit/win/ChangeLog 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/ChangeLog 2012-06-29 22:51:09 UTC (rev 121597)
@@ -1,3 +1,27 @@
+2012-06-29 Mihai Balan <[email protected]>
+
+ [CSS Regions] Adding feature defines for CSS Regions for Windows
+ https://bugs.webkit.org/show_bug.cgi?id=88645
+
+ Reviewed by Tony Chang.
+
+ Re-trying to enable CSS regions on Windows. This time only enabling
+ regions since exclusions lead to some very strange compiling/linking
+ problems. This time adding preferences code to make sure the settings
+ get propagated to DRT (previous experiments by abucur showed they
+ didn't.).
+
+ * WebPreferenceKeysPrivate.h: Added preference key for CSS regions
+ * Interfaces/IWebPreferences.idl: Added getters and setters for CSS regions settings
+ * WebPreferences.cpp: ditto
+ (WebPreferences::initializeDefaultSettings):
+ (WebPreferences::isCSSRegionsEnabled):
+ (WebPreferences::setCSSRegionsEnabled):
+ * WebPreferences.h: ditto
+ (WebPreferences):
+ * WebView.cpp: Added settings code to handle CSS regions, too
+ (WebView::notifyPreferencesChanged):
+
2012-06-25 Mark Hahnenberg <[email protected]>
JSLock should be per-JSGlobalData
Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl (121596 => 121597)
--- trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferences.idl 2012-06-29 22:51:09 UTC (rev 121597)
@@ -124,6 +124,9 @@
HRESULT arePlugInsEnabled([out, retval] BOOL* enabled);
HRESULT setPlugInsEnabled([in] BOOL enabled);
+ HRESULT isCSSRegionsEnabled([out, retval] BOOL* enabled);
+ HRESULT setCSSRegionsEnabled([in] BOOL enabled);
+
HRESULT allowsAnimatedImages([out, retval] BOOL* enabled);
HRESULT setAllowsAnimatedImages([in] BOOL enabled);
HRESULT allowAnimatedImageLooping([out, retval] BOOL* enabled);
Modified: trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h (121596 => 121597)
--- trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h 2012-06-29 22:51:09 UTC (rev 121597)
@@ -53,6 +53,7 @@
#define WebKitAllowFileAccessFromFileURLsPreferenceKey "WebKitAllowFileAccessFromFileURLs"
#define WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey "WebKitJavaScriptCanOpenWindowsAutomatically"
#define WebKitPluginsEnabledPreferenceKey "WebKitPluginsEnabled"
+#define WebKitCSSRegionsEnabledPreferenceKey "WebKitCSSRegionsEnabled"
#define WebKitDatabasesEnabledPreferenceKey "WebKitDatabasesEnabled"
#define WebKitLocalStorageEnabledPreferenceKey "WebKitLocalStorageEnabled"
#define WebKitExperimentalNotificationsEnabledPreferenceKey "WebKitExperimentalNotificationsEnabled"
Modified: trunk/Source/WebKit/win/WebPreferences.cpp (121596 => 121597)
--- trunk/Source/WebKit/win/WebPreferences.cpp 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2012-06-29 22:51:09 UTC (rev 121597)
@@ -212,6 +212,7 @@
CFDictionaryAddValue(defaults, CFSTR(WebKitFrameFlatteningEnabledPreferenceKey), kCFBooleanFalse);
CFDictionaryAddValue(defaults, CFSTR(WebKitJavaScriptCanOpenWindowsAutomaticallyPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults, CFSTR(WebKitPluginsEnabledPreferenceKey), kCFBooleanTrue);
+ CFDictionaryAddValue(defaults, CFSTR(WebKitCSSRegionsEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults, CFSTR(WebKitDatabasesEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults, CFSTR(WebKitLocalStorageEnabledPreferenceKey), kCFBooleanTrue);
CFDictionaryAddValue(defaults, CFSTR(WebKitExperimentalNotificationsEnabledPreferenceKey), kCFBooleanFalse);
@@ -908,6 +909,20 @@
return S_OK;
}
+HRESULT STDMETHODCALLTYPE WebPreferences::isCSSRegionsEnabled(
+ /* [retval][out] */ BOOL* enabled)
+{
+ *enabled = boolValueForKey(CFSTR(WebKitCSSRegionsEnabledPreferenceKey));
+ return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE WebPreferences::setCSSRegionsEnabled(
+ /* [in] */ BOOL enabled)
+{
+ setBoolValue(CFSTR(WebKitCSSRegionsEnabledPreferenceKey), enabled);
+ return S_OK;
+}
+
HRESULT STDMETHODCALLTYPE WebPreferences::allowsAnimatedImages(
/* [retval][out] */ BOOL* enabled)
{
Modified: trunk/Source/WebKit/win/WebPreferences.h (121596 => 121597)
--- trunk/Source/WebKit/win/WebPreferences.h 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/WebPreferences.h 2012-06-29 22:51:09 UTC (rev 121597)
@@ -162,7 +162,13 @@
virtual HRESULT STDMETHODCALLTYPE setPlugInsEnabled(
/* [in] */ BOOL enabled);
+
+ virtual HRESULT STDMETHODCALLTYPE isCSSRegionsEnabled(
+ /* [retval][out] */ BOOL* enabled);
+ virtual HRESULT STDMETHODCALLTYPE setCSSRegionsEnabled(
+ /* [in] */ BOOL);
+
virtual HRESULT STDMETHODCALLTYPE allowsAnimatedImages(
/* [retval][out] */ BOOL* enabled);
Modified: trunk/Source/WebKit/win/WebView.cpp (121596 => 121597)
--- trunk/Source/WebKit/win/WebView.cpp 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/Source/WebKit/win/WebView.cpp 2012-06-29 22:51:09 UTC (rev 121597)
@@ -4668,6 +4668,11 @@
return hr;
settings->setPluginsEnabled(!!enabled);
+ hr = preferences->isCSSRegionsEnabled(&enabled);
+ if (FAILED(hr))
+ return hr;
+ settings->setCSSRegionsEnabled(!!enabled);
+
hr = preferences->privateBrowsingEnabled(&enabled);
if (FAILED(hr))
return hr;
Modified: trunk/WebKitLibraries/ChangeLog (121596 => 121597)
--- trunk/WebKitLibraries/ChangeLog 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/WebKitLibraries/ChangeLog 2012-06-29 22:51:09 UTC (rev 121597)
@@ -1,3 +1,17 @@
+2012-06-29 Mihai Balan <[email protected]>
+
+ [CSS Regions] Adding feature defines for CSS Regions for Windows
+ https://bugs.webkit.org/show_bug.cgi?id=88645
+
+ Reviewed by Tony Chang.
+
+ Re-trying to enable CSS regions on Windows. This time only enabling
+ regions since exclusions lead to some very strange compiling/linking
+ problems.
+
+ * win/tools/vsprops/FeatureDefines.vsprops: Added default value for ENABLE_CSS_REGIONS
+ * win/tools/vsprops/FeatureDefinesCairo.vsprops: ditto
+
2012-06-28 Brent Fulgham <[email protected]>
[WinCairo] Unreviewed build correction. Add two missing macro
Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops (121596 => 121597)
--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.vsprops 2012-06-29 22:51:09 UTC (rev 121597)
@@ -63,7 +63,7 @@
/>
<UserMacro
Name="ENABLE_CSS_REGIONS"
- Value=""
+ Value="ENABLE_CSS_REGIONS"
PerformEnvironmentSet="true"
/>
<UserMacro
Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops (121596 => 121597)
--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops 2012-06-29 22:25:24 UTC (rev 121596)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.vsprops 2012-06-29 22:51:09 UTC (rev 121597)
@@ -63,7 +63,7 @@
/>
<UserMacro
Name="ENABLE_CSS_REGIONS"
- Value=""
+ Value="ENABLE_CSS_REGIONS"
PerformEnvironmentSet="true"
/>
<UserMacro
