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

Unified Diff: Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.cpp

Issue 15376006: Added window.internals.isColorChooserShown() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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/src/ColorChooser.cpp
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/TestCommon.cpp b/Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.cpp
similarity index 64%
copy from Tools/DumpRenderTree/chromium/TestRunner/src/TestCommon.cpp
copy to Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.cpp
index 78a1a1c613518d8a30c182b242bb8dd873b6f316..ac3280f55a42119b6e75fa97fac7bce11de657b1 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/TestCommon.cpp
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.cpp
@@ -29,36 +29,53 @@
*/
#include "config.h"
-#include "TestCommon.h"
+#include "ColorChooser.h"
+#include "WebTestDelegate.h"
+
+using namespace WebKit;
using namespace std;
namespace WebTestRunner {
namespace {
+class HostMethodTask : public WebMethodTask<ColorChooser> {
+public:
+ typedef void (ColorChooser::*CallbackMethodType)();
+ HostMethodTask(ColorChooser* object, CallbackMethodType callback)
+ : WebMethodTask<ColorChooser>(object)
+ , m_callback(callback)
+ { }
+
+ virtual void runIfValid() { (m_object->*m_callback)(); }
-const char layoutTestsPattern[] = "/LayoutTests/";
-const string::size_type layoutTestsPatternSize = sizeof(layoutTestsPattern) - 1;
-const char fileUrlPattern[] = "file:/";
-const char fileTestPrefix[] = "(file test):";
-const char dataUrlPattern[] = "data:";
-const string::size_type dataUrlPatternSize = sizeof(dataUrlPattern) - 1;
+private:
+ CallbackMethodType m_callback;
+};
+}
+ColorChooser::ColorChooser(WebKit::WebColorChooserClient* client, WebTestDelegate* delegate)
+ : m_client(client)
+ , m_delegate(delegate)
+{
+}
+
+ColorChooser::~ColorChooser()
+{
+}
+
+void ColorChooser::setSelectedColor(const WebKit::WebColor)
+{
+}
+
+void ColorChooser::endChooser()
+{
+ m_delegate->postDelayedTask(new HostMethodTask(this, &ColorChooser::invokeDidEndChooser), 0);
}
-string normalizeLayoutTestURL(const string& url)
+void ColorChooser::invokeDidEndChooser()
{
- string result = url;
- size_t pos;
- if (!url.find(fileUrlPattern) && ((pos = url.find(layoutTestsPattern)) != string::npos)) {
- // adjust file URLs to match upstream results.
- result.replace(0, pos + layoutTestsPatternSize, fileTestPrefix);
- } else if (!url.find(dataUrlPattern)) {
- // URL-escape data URLs to match results upstream.
- string path = url.substr(dataUrlPatternSize);
- result.replace(dataUrlPatternSize, url.length(), path);
- }
- return result;
+ m_client->didEndChooser();
}
}

Powered by Google App Engine
This is Rietveld 408576698