diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 17:55:55 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-21 17:55:55 +0000 |
| commit | f0c25f02bcf2690ca6a24e7be72fd7be87c7198c (patch) | |
| tree | d3a7d693c468aaac53616381006985b905f22221 /content/shell/webkit_test_controller.cc | |
| parent | 390f837febccbc849abad049f013678ed87cbf66 (diff) | |
| download | chromium_src-f0c25f02bcf2690ca6a24e7be72fd7be87c7198c.zip chromium_src-f0c25f02bcf2690ca6a24e7be72fd7be87c7198c.tar.gz chromium_src-f0c25f02bcf2690ca6a24e7be72fd7be87c7198c.tar.bz2 | |
[content shell] don't use WebTestRunner::WebPreferences in the browser process
Instead, I've added a function that applies the differing defaults, and we
only override the entire WebPreferences when a renderer asks us to.
BUG=111316
TEST=running layout tests in single process mode shouldn't crash immediately
Review URL: https://chromiumcodereview.appspot.com/11666008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_controller.cc')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index 25557ee..7b28276 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -19,12 +19,9 @@ #include "content/shell/shell_messages.h" #include "content/shell/shell_switches.h" #include "content/shell/webkit_test_helpers.h" -#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebPreferences.h" #include "webkit/fileapi/isolated_context.h" #include "webkit/support/webkit_support_gfx.h" -using WebTestRunner::WebPreferences; - namespace content { namespace { @@ -194,7 +191,7 @@ bool WebKitTestController::ResetAfterLayoutTest() { wait_until_done_ = false; did_finish_load_ = false; prefs_ = webkit_glue::WebPreferences(); - ExportLayoutTestSpecificPreferences(WebPreferences(), &prefs_); + should_override_prefs_ = false; { base::AutoLock lock(lock_); can_open_windows_ = false; @@ -217,7 +214,10 @@ void WebKitTestController::RendererUnresponsive() { void WebKitTestController::OverrideWebkitPrefs( webkit_glue::WebPreferences* prefs) { - CopyLayoutTestSpecificPreferences(prefs_, prefs); + if (should_override_prefs_) + *prefs = prefs_; + else + ApplyLayoutTestDefaultPreferences(prefs); } bool WebKitTestController::CanOpenWindows() const { @@ -386,6 +386,7 @@ void WebKitTestController::OnReadFileToString(const FilePath& local_file, void WebKitTestController::OnOverridePreferences( const webkit_glue::WebPreferences& prefs) { + should_override_prefs_ = true; prefs_ = prefs; } |