Index: Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h |
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h b/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h |
index 4f617ecfeb1c606f2c9909dc3513ba4b7adb62e1..b9b583ca1a33924cdbafa28fc4f8a5fcf53b1388 100644 |
--- a/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h |
+++ b/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h |
@@ -52,6 +52,8 @@ |
namespace WebKit { |
class WebAccessibilityObject; |
class WebCachedURLRequest; |
+class WebColorChooser; |
+class WebColorChooserClient; |
class WebDataSource; |
class WebDeviceOrientationClient; |
class WebDeviceOrientationClientMock; |
@@ -82,6 +84,7 @@ struct WebPluginParams; |
struct WebPoint; |
struct WebSize; |
struct WebWindowFeatures; |
+typedef unsigned WebColor; |
} |
class SkCanvas; |
@@ -105,6 +108,7 @@ public: |
void reset(); |
WebKit::WebSpellCheckClient *spellCheckClient() const; |
+ WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*, const WebKit::WebColor&); |
std::string captureTree(bool debugRenderTree); |
SkCanvas* capturePixels(); |
@@ -114,6 +118,10 @@ public: |
// FIXME: Make this private again. |
void scheduleComposite(); |
+ void didOpenChooser(); |
+ void didCloseChooser(); |
+ bool isChooserShown(); |
+ |
#if WEBTESTRUNNER_IMPLEMENTATION |
void display(); |
void displayInvalidatedRegion(); |
@@ -223,6 +231,7 @@ private: |
std::map<unsigned, WebKit::WebURLRequest> m_requestMap; |
bool m_logConsoleOutput; |
+ int m_chooserCount; |
std::auto_ptr<WebKit::WebGeolocationClientMock> m_geolocationClient; |
std::auto_ptr<WebKit::WebDeviceOrientationClientMock> m_deviceOrientationClient; |
@@ -597,6 +606,10 @@ public: |
return true; |
return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event); |
} |
+ virtual WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient* client, const WebKit::WebColor& color) |
+ { |
+ return WebTestProxyBase::createColorChooser(client, color); |
+ } |
}; |
} |