Title: [112435] trunk/Tools
- Revision
- 112435
- Author
- [email protected]
- Date
- 2012-03-28 13:41:15 -0700 (Wed, 28 Mar 2012)
Log Message
Fix inspector tests when running in internal builds.
<rdar://problem/11050694>
Reviewed by Tim Hatcher.
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetDefaultsToConsistentValues):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112434 => 112435)
--- trunk/Tools/ChangeLog 2012-03-28 20:36:39 UTC (rev 112434)
+++ trunk/Tools/ChangeLog 2012-03-28 20:41:15 UTC (rev 112435)
@@ -1,3 +1,16 @@
+2012-03-28 Simon Fraser <[email protected]>
+
+ Fix inspector tests when running in internal builds.
+
+ <rdar://problem/11050694>
+
+ Reviewed by Tim Hatcher.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetDefaultsToConsistentValues):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetStateToConsistentValues):
+
2012-03-28 David Kilzer <[email protected]>
Use xcrun to find nm and ranlib on OS X builds
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (112434 => 112435)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-03-28 20:36:39 UTC (rev 112434)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-03-28 20:41:15 UTC (rev 112435)
@@ -572,6 +572,7 @@
[defaults setObject:[NSArray arrayWithObject:@"en"] forKey:@"AppleLanguages"];
[defaults setBool:YES forKey:WebKitEnableFullDocumentTeardownPreferenceKey];
[defaults setBool:YES forKey:WebKitFullScreenEnabledPreferenceKey];
+ [defaults setBool:YES forKey:@"UseWebKitWebInspector"];
// Scrollbars are drawn either using AppKit (which uses NSUserDefaults) or using HIToolbox (which uses CFPreferences / kCFPreferencesAnyApplication / kCFPreferencesCurrentUser / kCFPreferencesAnyHost)
[defaults setObject:@"DoubleMax" forKey:@"AppleScrollBarVariant"];
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (112434 => 112435)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-03-28 20:36:39 UTC (rev 112434)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-03-28 20:41:15 UTC (rev 112435)
@@ -475,6 +475,7 @@
WKPreferencesSetSansSerifFontFamily(preferences, sansSerifFontFamily);
WKPreferencesSetSerifFontFamily(preferences, serifFontFamily);
#endif
+ WKPreferencesSetInspectorUsesWebKitUserInterface(preferences, true);
// in the case that a test using the chrome input field failed, be sure to clean up for the next test
m_mainWebView->removeChromeInputField();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
