diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/DumpRenderTree/LayoutTestController.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/DumpRenderTree/LayoutTestController.h')
-rw-r--r-- | Tools/DumpRenderTree/LayoutTestController.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Tools/DumpRenderTree/LayoutTestController.h b/Tools/DumpRenderTree/LayoutTestController.h index 11558dd..4b1c04e 100644 --- a/Tools/DumpRenderTree/LayoutTestController.h +++ b/Tools/DumpRenderTree/LayoutTestController.h @@ -111,6 +111,7 @@ public: void setUseDashboardCompatibilityMode(bool flag); void setUserStyleSheetEnabled(bool flag); void setUserStyleSheetLocation(JSStringRef path); + void setValueForUser(JSContextRef, JSValueRef nodeObject, JSStringRef value); void setViewModeMediaFeature(JSStringRef mode); void setXSSAuditorEnabled(bool flag); void setFrameFlatteningEnabled(bool enable); @@ -291,8 +292,8 @@ public: bool hasSpellingMarker(int from, int length); - void dumpConfigurationForViewport(int availableWidth, int availableHeight); - + void dumpConfigurationForViewport(int deviceDPI, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight); + static void setSerializeHTTPLoads(bool serialize); // The following API test functions should probably be moved to platform-specific @@ -307,9 +308,14 @@ public: JSRetainPtr<JSStringRef> markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const; + void setShouldPaintBrokenImage(bool); + bool shouldPaintBrokenImage() const { return m_shouldPaintBrokenImage; } + static const unsigned maxViewWidth; static const unsigned maxViewHeight; + void setMinimumTimerInterval(double); + private: LayoutTestController(const std::string& testPathOrURL, const std::string& expectedPixelHash); @@ -356,6 +362,7 @@ private: bool m_handlesAuthenticationChallenges; bool m_isPrinting; bool m_deferMainResourceDataLoad; + bool m_shouldPaintBrokenImage; std::string m_authenticationUsername; std::string m_authenticationPassword; |