Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1733)

Unified Diff: Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

Issue 15535005: Added window.testRunner.isChooserShown() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Moved things WebTestProxy Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
+ }
};
}
« no previous file with comments | « Tools/DumpRenderTree/DumpRenderTree.gypi ('k') | Tools/DumpRenderTree/chromium/TestRunner/src/MockColorChooser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698