Diff
Modified: trunk/LayoutTests/ChangeLog (102949 => 102950)
--- trunk/LayoutTests/ChangeLog 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/LayoutTests/ChangeLog 2011-12-15 17:50:41 UTC (rev 102950)
@@ -1,3 +1,15 @@
+2011-12-15 Kenneth Russell <[email protected]>
+
+ [chromium] Add DRT support for WebKitPageCacheSupportsPluginsPreferenceKey
+ https://bugs.webkit.org/show_bug.cgi?id=74581
+
+ Reviewed by Darin Fisher.
+
+ Unskip one test which now passes. The other one will continue to
+ be covered under the other bug.
+
+ * platform/chromium/test_expectations.txt:
+
2011-12-15 Alexander Pavlov <[email protected]>
Web Inspector: #hex colors are not highlighted in CSS files
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (102949 => 102950)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-12-15 17:50:41 UTC (rev 102950)
@@ -3999,7 +3999,6 @@
BUGWK74317 LINUX : transitions/cross-fade-border-image.html = PASS CRASH
BUGWK74357 SKIP : plugins/netscape-plugin-page-cache-works.html = TEXT TIMEOUT
-BUGWK74357 SKIP : media/crash-closing-page-with-media-as-plugin-fallback.html = TEXT
BUGWK74374 WIN : fast/forms/select-listbox-multiple-no-focusring.html = PASS IMAGE
Modified: trunk/Source/WebKit/chromium/ChangeLog (102949 => 102950)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 17:50:41 UTC (rev 102950)
@@ -1,3 +1,15 @@
+2011-12-15 Kenneth Russell <[email protected]>
+
+ [chromium] Add DRT support for WebKitPageCacheSupportsPluginsPreferenceKey
+ https://bugs.webkit.org/show_bug.cgi?id=74581
+
+ Reviewed by Darin Fisher.
+
+ * public/WebSettings.h:
+ * src/WebSettingsImpl.cpp:
+ (WebKit::WebSettingsImpl::setPageCacheSupportsPlugins):
+ * src/WebSettingsImpl.h:
+
2011-12-15 Andrey Kosyakov <[email protected]>
Web Inspector: [Chromium] add support to inspector test suite to fetch test execution results from console
Modified: trunk/Source/WebKit/chromium/public/WebSettings.h (102949 => 102950)
--- trunk/Source/WebKit/chromium/public/WebSettings.h 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Source/WebKit/chromium/public/WebSettings.h 2011-12-15 17:50:41 UTC (rev 102950)
@@ -80,6 +80,7 @@
virtual void setUserStyleSheetLocation(const WebURL&) = 0;
virtual void setAuthorAndUserStylesEnabled(bool) = 0;
virtual void setUsesPageCache(bool) = 0;
+ virtual void setPageCacheSupportsPlugins(bool) = 0;
virtual void setDownloadableBinaryFontsEnabled(bool) = 0;
virtual void setJavaScriptCanAccessClipboard(bool) = 0;
virtual void setXSSAuditorEnabled(bool) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp (102949 => 102950)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.cpp 2011-12-15 17:50:41 UTC (rev 102950)
@@ -199,6 +199,11 @@
m_settings->setUsesPageCache(usesPageCache);
}
+void WebSettingsImpl::setPageCacheSupportsPlugins(bool pageCacheSupportsPlugins)
+{
+ m_settings->setPageCacheSupportsPlugins(pageCacheSupportsPlugins);
+}
+
void WebSettingsImpl::setDownloadableBinaryFontsEnabled(bool enabled)
{
m_settings->setDownloadableBinaryFontsEnabled(enabled);
Modified: trunk/Source/WebKit/chromium/src/WebSettingsImpl.h (102949 => 102950)
--- trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Source/WebKit/chromium/src/WebSettingsImpl.h 2011-12-15 17:50:41 UTC (rev 102950)
@@ -72,6 +72,7 @@
virtual void setUserStyleSheetLocation(const WebURL&);
virtual void setAuthorAndUserStylesEnabled(bool);
virtual void setUsesPageCache(bool);
+ virtual void setPageCacheSupportsPlugins(bool);
virtual void setDownloadableBinaryFontsEnabled(bool);
virtual void setJavaScriptCanAccessClipboard(bool);
virtual void setXSSAuditorEnabled(bool);
Modified: trunk/Tools/ChangeLog (102949 => 102950)
--- trunk/Tools/ChangeLog 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Tools/ChangeLog 2011-12-15 17:50:41 UTC (rev 102950)
@@ -1,3 +1,17 @@
+2011-12-15 Kenneth Russell <[email protected]>
+
+ [chromium] Add DRT support for WebKitPageCacheSupportsPluginsPreferenceKey
+ https://bugs.webkit.org/show_bug.cgi?id=74581
+
+ Reviewed by Darin Fisher.
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::overridePreference):
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+
2011-12-15 Kenneth Rohde Christiansen <[email protected]>
[Qt] Improve the look of the viewport info overlay
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (102949 => 102950)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-12-15 17:50:41 UTC (rev 102950)
@@ -1486,6 +1486,8 @@
prefs->javaEnabled = cppVariantToBool(value);
else if (key == "WebKitUsesPageCachePreferenceKey")
prefs->usesPageCache = cppVariantToBool(value);
+ else if (key == "WebKitPageCacheSupportsPluginsPreferenceKey")
+ prefs->pageCacheSupportsPlugins = cppVariantToBool(value);
else if (key == "WebKitJavaScriptCanAccessClipboard")
prefs->_javascript_CanAccessClipboard = cppVariantToBool(value);
else if (key == "WebKitXSSAuditorEnabled")
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (102949 => 102950)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-12-15 17:50:41 UTC (rev 102950)
@@ -92,6 +92,7 @@
textAreasAreResizable = false;
userStyleSheetLocation = WebURL();
usesPageCache = false;
+ pageCacheSupportsPlugins = false;
webSecurityEnabled = true;
caretBrowsingEnabled = false;
@@ -203,6 +204,7 @@
settings->setTextAreasAreResizable(textAreasAreResizable);
settings->setUserStyleSheetLocation(userStyleSheetLocation);
settings->setUsesPageCache(usesPageCache);
+ settings->setPageCacheSupportsPlugins(pageCacheSupportsPlugins);
settings->setWebSecurityEnabled(webSecurityEnabled);
settings->setAllowUniversalAccessFromFileURLs(allowUniversalAccessFromFileURLs);
settings->setEditingBehavior(editingBehavior);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (102949 => 102950)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-12-15 17:33:03 UTC (rev 102949)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-12-15 17:50:41 UTC (rev 102950)
@@ -94,6 +94,7 @@
bool textAreasAreResizable;
WebKit::WebURL userStyleSheetLocation;
bool usesPageCache;
+ bool pageCacheSupportsPlugins;
bool webSecurityEnabled;
bool allowUniversalAccessFromFileURLs;
WebKit::WebSettings::EditingBehavior editingBehavior;
