Added window.testRunner.isChooserShown()

Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
 #include "public/platform/WebRect.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebURLRequest.h"
 #include <map>
 #include <memory>
 #include <string>
 
 namespace WebKit {
 class WebAccessibilityObject;
 class WebCachedURLRequest;
+class WebColorChooser;
+class WebColorChooserClient;
 class WebDataSource;
 class WebDeviceOrientationClient;
 class WebDeviceOrientationClientMock;
 class WebDragData;
 class WebFrame;
 class WebGeolocationClient;
 class WebGeolocationClientMock;
 class WebImage;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
@@ skipping 10 matching lines @@
 class WebURL;
 class WebURLResponse;
 class WebUserMediaClient;
 class WebView;
 struct WebConsoleMessage;
 struct WebContextMenuData;
 struct WebPluginParams;
 struct WebPoint;
 struct WebSize;
 struct WebWindowFeatures;
+typedef unsigned WebColor;
 }
 
 class SkCanvas;
 
 namespace WebTestRunner {
 
 class MockWebSpeechInputController;
 class MockWebSpeechRecognizer;
 class SpellCheckClient;
 class TestInterfaces;
 class WebTestDelegate;
 class WebTestInterfaces;
 class WebTestRunner;
 class WebUserMediaClientMock;
 
 class WEBTESTRUNNER_EXPORT WebTestProxyBase {
 public:
     void setInterfaces(WebTestInterfaces*);
     void setDelegate(WebTestDelegate*);
 
     void reset();
 
     WebKit::WebSpellCheckClient *spellCheckClient() const;
+    WebKit::WebColorChooser* createColorChooser(WebKit::WebColorChooserClient*, const WebKit::WebColor&);
 
     std::string captureTree(bool debugRenderTree);
     SkCanvas* capturePixels();
 
     void setLogConsoleOutput(bool enabled);
 
     // FIXME: Make this private again.
     void scheduleComposite();
 
+    void didOpenChooser();
+    void didCloseChooser();
+    bool isChooserShown();
+
 #if WEBTESTRUNNER_IMPLEMENTATION
     void display();
     void displayInvalidatedRegion();
     void discardBackingStore();
 
     WebKit::WebDeviceOrientationClientMock* deviceOrientationClientMock();
     WebKit::WebGeolocationClientMock* geolocationClientMock();
     MockWebSpeechInputController* speechInputControllerMock();
     MockWebSpeechRecognizer* speechRecognizerMock();
 #endif
@@ skipping 89 matching lines @@
     std::auto_ptr<WebUserMediaClientMock> m_userMediaClient;
 
     // Painting.
     std::auto_ptr<SkCanvas> m_canvas;
     WebKit::WebRect m_paintRect;
     bool m_isPainting;
     std::map<unsigned, std::string> m_resourceIdentifierMap;
     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;
     std::auto_ptr<MockWebSpeechRecognizer> m_speechRecognizer;
     std::auto_ptr<MockWebSpeechInputController> m_speechInputController;
 
 private:
     WebTestProxyBase(WebTestProxyBase&);
     WebTestProxyBase& operator=(const WebTestProxyBase&);
 };
@@ skipping 354 matching lines @@
         if (policy == WebKit::WebNavigationPolicyIgnore)
             return policy;
         return Base::decidePolicyForNavigation(frame, request, type, defaultPolicy, isRedirect);
     }
     virtual bool willCheckAndDispatchMessageEvent(WebKit::WebFrame* sourceFrame, WebKit::WebFrame* targetFrame, WebKit::WebSecurityOrigin target, WebKit::WebDOMMessageEvent event)
     {
         if (WebTestProxyBase::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, target, event))
             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);
+    }
 };
 
 }
 
 #endif // WebTestProxy_h