Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
index b99c5ba0d62e0bb5a65cf2ad95f714a57b47f5dd..28506f9c58e105cae11fc2250cc55905c9ea4836 100644 |
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
@@ -150,19 +150,6 @@ private: |
TestData m_testData; |
}; |
-class SaveImageFromDataURLWebViewClient : public FrameTestHelpers::TestWebViewClient { |
-public: |
- // WebViewClient methods |
- void saveImageFromDataURL(const WebString& dataURL) override { m_dataURL = dataURL; } |
- |
- // Local methods |
- const WebString& result() const { return m_dataURL; } |
- void reset() { m_dataURL = WebString(); } |
- |
-private: |
- WebString m_dataURL; |
-}; |
- |
class TapHandlingWebViewClient : public FrameTestHelpers::TestWebViewClient { |
public: |
// WebViewClient methods |
@@ -254,130 +241,6 @@ protected: |
FrameTestHelpers::WebViewHelper m_webViewHelper; |
}; |
-TEST_F(WebViewTest, SaveImageAt) |
-{ |
- SaveImageFromDataURLWebViewClient client; |
- |
- std::string url = m_baseURL + "image-with-data-url.html"; |
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-with-data-url.html"); |
- URLTestHelpers::registerMockedURLLoad(toKURL("http://test"), "white-1x1.png"); |
- WebViewImpl* webView = m_webViewHelper.initializeAndLoad(url, true, 0, &client); |
- webView->resize(WebSize(400, 400)); |
- webView->updateAllLifecyclePhases(); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(1, 1)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(1, 2)); |
- EXPECT_EQ(WebString(), client.result()); |
- |
- webView->setPageScaleFactor(4); |
- webView->setVisualViewportOffset(WebFloatPoint(1, 1)); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(3, 3)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client. |
-}; |
- |
-TEST_F(WebViewTest, SaveImageWithImageMap) |
-{ |
- SaveImageFromDataURLWebViewClient client; |
- |
- std::string url = m_baseURL + "image-map.html"; |
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-map.html"); |
- WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0, &client); |
- webView->resize(WebSize(400, 400)); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(25, 25)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(75, 25)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(125, 25)); |
- EXPECT_EQ(WebString(), client.result()); |
- |
- m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client. |
-} |
- |
-TEST_F(WebViewTest, CopyImageAt) |
-{ |
- std::string url = m_baseURL + "canvas-copy-image.html"; |
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "canvas-copy-image.html"); |
- WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0); |
- webView->resize(WebSize(400, 400)); |
- |
- uint64_t sequence = Platform::current()->clipboard()->sequenceNumber(WebClipboard::BufferStandard); |
- |
- webView->copyImageAt(WebPoint(50, 50)); |
- |
- EXPECT_NE(sequence, Platform::current()->clipboard()->sequenceNumber(WebClipboard::BufferStandard)); |
- |
- WebImage image = static_cast<WebMockClipboard*>(Platform::current()->clipboard())->readRawImage(WebClipboard::Buffer()); |
- |
- SkAutoLockPixels autoLock(image.getSkBitmap()); |
- EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.getSkBitmap().getColor(0, 0)); |
-}; |
- |
-TEST_F(WebViewTest, CopyImageAtWithPinchZoom) |
-{ |
- std::string url = m_baseURL + "canvas-copy-image.html"; |
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "canvas-copy-image.html"); |
- WebViewImpl* webView = m_webViewHelper.initializeAndLoad(url, true, 0); |
- webView->resize(WebSize(400, 400)); |
- webView->updateAllLifecyclePhases(); |
- webView->setPageScaleFactor(2); |
- webView->setVisualViewportOffset(WebFloatPoint(200, 200)); |
- |
- uint64_t sequence = Platform::current()->clipboard()->sequenceNumber(WebClipboard::BufferStandard); |
- |
- webView->copyImageAt(WebPoint(0, 0)); |
- |
- EXPECT_NE(sequence, Platform::current()->clipboard()->sequenceNumber(WebClipboard::BufferStandard)); |
- |
- WebImage image = static_cast<WebMockClipboard*>(Platform::current()->clipboard())->readRawImage(WebClipboard::Buffer()); |
- |
- SkAutoLockPixels autoLock(image.getSkBitmap()); |
- EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.getSkBitmap().getColor(0, 0)); |
-}; |
- |
-TEST_F(WebViewTest, CopyImageWithImageMap) |
-{ |
- SaveImageFromDataURLWebViewClient client; |
- |
- std::string url = m_baseURL + "image-map.html"; |
- URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-map.html"); |
- WebView* webView = m_webViewHelper.initializeAndLoad(url, true, 0, &client); |
- webView->resize(WebSize(400, 400)); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(25, 25)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(75, 25)); |
- EXPECT_EQ(WebString::fromUTF8("data:image/gif;base64" |
- ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="), client.result()); |
- |
- client.reset(); |
- webView->saveImageAt(WebPoint(125, 25)); |
- EXPECT_EQ(WebString(), client.result()); |
- |
- m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client. |
-} |
- |
static bool hitTestIsContentEditable(WebView* view, int x, int y) |
{ |
WebPoint hitPoint(x, y); |