diff options
Diffstat (limited to 'WebKitTools/DumpRenderTree/chromium/TestShell.h')
| -rw-r--r-- | WebKitTools/DumpRenderTree/chromium/TestShell.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.h b/WebKitTools/DumpRenderTree/chromium/TestShell.h index cb5f862..6d93d4a 100644 --- a/WebKitTools/DumpRenderTree/chromium/TestShell.h +++ b/WebKitTools/DumpRenderTree/chromium/TestShell.h @@ -38,6 +38,7 @@ #include "PlainTextController.h" #include "TestEventPrinter.h" #include "TextInputController.h" +#include "WebPreferences.h" #include "WebViewHost.h" #include <string> #include <wtf/OwnPtr.h> @@ -50,7 +51,6 @@ namespace WebKit { class WebDevToolsAgentClient; class WebFrame; class WebNotificationPresenter; -class WebPreferences; class WebView; class WebURL; } @@ -92,6 +92,9 @@ public: NotificationPresenter* notificationPresenter() const { return m_notificationPresenter.get(); } TestEventPrinter* printer() const { return m_printer.get(); } + WebPreferences* preferences() { return &m_prefs; } + void applyPreferences() { m_prefs.applyTo(m_webView); } + void bindJSObjectsToWindow(WebKit::WebFrame*); void runFileTest(const TestParams&); void callJSGC(); @@ -107,6 +110,7 @@ public: void setFocus(WebKit::WebWidget*, bool enable); bool shouldDumpFrameLoadCallbacks() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpFrameLoadCallbacks(); } bool shouldDumpResourceLoadCallbacks() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpResourceLoadCallbacks(); } + bool shouldDumpResourceResponseMIMETypes() const { return (m_testIsPreparing || m_testIsPending) && layoutTestController()->shouldDumpResourceResponseMIMETypes(); } void setIsLoading(bool flag) { m_isLoading = flag; } // Called by the LayoutTestController to signal test completion. @@ -147,7 +151,7 @@ public: private: void createDRTDevToolsClient(DRTDevToolsAgent*); - static void resetWebSettings(WebKit::WebView&); + void resetWebSettings(WebKit::WebView&); void dump(); std::string dumpAllBackForwardLists(); void dumpImage(skia::PlatformCanvas*) const; @@ -172,6 +176,7 @@ private: TestParams m_params; int m_timeout; // timeout value in millisecond bool m_allowExternalPages; + WebPreferences m_prefs; // List of all windows in this process. // The main window should be put into windowList[0]. |