Title: [90085] trunk/Tools
- Revision
- 90085
- Author
- [email protected]
- Date
- 2011-06-29 20:40:01 -0700 (Wed, 29 Jun 2011)
Log Message
2011-06-29 Yuta Kitamura <[email protected]>
Reviewed by Kent Tamura.
DRT: Make Hixie76WebSocketProtocolEnabled preference flag configurable from LayoutTestController
https://bugs.webkit.org/show_bug.cgi?id=63532
LayoutTestController::overridePreference() will be used to change the value of
the Hixie76WebSocketProtocolEnabled preference flag from layout tests. In this way,
we can avoid writing a lot of boilerplate code in each port's DumpRenderTree, but
at least we need to reset preference values in DumpRenderTree every time we start
a new test because preference values changed in some test should not be leaked
to the next test.
* DumpRenderTree/chromium/LayoutTestController.cpp:
(LayoutTestController::overridePreference):
The name of preference key is defined in WebKit/{mac/WebView,win}/WebPreferenceKeysPrivate.h.
* DumpRenderTree/chromium/WebPreferences.cpp:
(WebPreferences::reset):
Set the default value. This will be called from TestShell::resetTestController().
(WebPreferences::applyTo):
* DumpRenderTree/chromium/WebPreferences.h:
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues): Set the default value.
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90084 => 90085)
--- trunk/Tools/ChangeLog 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/ChangeLog 2011-06-30 03:40:01 UTC (rev 90085)
@@ -1,3 +1,30 @@
+2011-06-29 Yuta Kitamura <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ DRT: Make Hixie76WebSocketProtocolEnabled preference flag configurable from LayoutTestController
+ https://bugs.webkit.org/show_bug.cgi?id=63532
+
+ LayoutTestController::overridePreference() will be used to change the value of
+ the Hixie76WebSocketProtocolEnabled preference flag from layout tests. In this way,
+ we can avoid writing a lot of boilerplate code in each port's DumpRenderTree, but
+ at least we need to reset preference values in DumpRenderTree every time we start
+ a new test because preference values changed in some test should not be leaked
+ to the next test.
+
+ * DumpRenderTree/chromium/LayoutTestController.cpp:
+ (LayoutTestController::overridePreference):
+ The name of preference key is defined in WebKit/{mac/WebView,win}/WebPreferenceKeysPrivate.h.
+ * DumpRenderTree/chromium/WebPreferences.cpp:
+ (WebPreferences::reset):
+ Set the default value. This will be called from TestShell::resetTestController().
+ (WebPreferences::applyTo):
+ * DumpRenderTree/chromium/WebPreferences.h:
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues): Set the default value.
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues): Ditto.
+
2011-06-29 Kenichi Ishibashi <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp (90084 => 90085)
--- trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp 2011-06-30 03:40:01 UTC (rev 90085)
@@ -1425,6 +1425,8 @@
prefs->allowDisplayOfInsecureContent = cppVariantToBool(value);
else if (key == "WebKitAllowRunningInsecureContent")
prefs->allowRunningOfInsecureContent = cppVariantToBool(value);
+ else if (key == "WebKitHixie76WebSocketProtocolEnabled")
+ prefs->hixie76WebSocketProtocolEnabled = cppVariantToBool(value);
else {
string message("Invalid name for preference: ");
message.append(key);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp (90084 => 90085)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.cpp 2011-06-30 03:40:01 UTC (rev 90085)
@@ -110,6 +110,7 @@
legacyAccelerated2dCanvasEnabled = false;
acceleratedDrawingEnabled = false;
forceCompositingMode = false;
+ hixie76WebSocketProtocolEnabled = true;
}
void WebPreferences::applyTo(WebView* webView)
@@ -162,6 +163,7 @@
settings->setAccelerated2dCanvasEnabled(accelerated2dCanvasEnabled);
settings->setLegacyAccelerated2dCanvasEnabled(legacyAccelerated2dCanvasEnabled);
settings->setAcceleratedDrawingEnabled(acceleratedDrawingEnabled);
+ settings->setHixie76WebSocketProtocolEnabled(hixie76WebSocketProtocolEnabled);
// Fixed values.
settings->setShouldPaintCustomScrollbars(true);
Modified: trunk/Tools/DumpRenderTree/chromium/WebPreferences.h (90084 => 90085)
--- trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/DumpRenderTree/chromium/WebPreferences.h 2011-06-30 03:40:01 UTC (rev 90085)
@@ -85,6 +85,7 @@
bool accelerated2dCanvasEnabled;
bool legacyAccelerated2dCanvasEnabled;
bool acceleratedDrawingEnabled;
+ bool hixie76WebSocketProtocolEnabled;
WebPreferences() { reset(); }
void reset();
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (90084 => 90085)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2011-06-30 03:40:01 UTC (rev 90085)
@@ -477,6 +477,7 @@
[preferences setWebGLEnabled:NO];
[preferences setUsePreHTML5ParserQuirks:NO];
[preferences setAsynchronousSpellCheckingEnabled:NO];
+ [preferences setHixie76WebSocketProtocolEnabled:YES];
[[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (90084 => 90085)
--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2011-06-30 03:34:18 UTC (rev 90084)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2011-06-30 03:40:01 UTC (rev 90085)
@@ -877,6 +877,7 @@
prefsPrivate->setFrameFlatteningEnabled(FALSE);
prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
+ prefsPrivate->setHixie76WebSocketProtocolEnabled(TRUE);
}
setAlwaysAcceptCookies(false);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
