Refactor Samsung SmartClip implementation.

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 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 3136 matching lines @@
       "border: 2px solid skyblue; float: left; width: 190px; height: 30px; "
       "color: rgb(0, 0, 0); font-family: myahem; font-size: 8px; font-style: "
       "normal; font-variant-ligatures: normal; font-variant-caps: normal; "
       "font-weight: normal; letter-spacing: normal; orphans: 2; text-align: "
       "start; text-indent: 0px; text-transform: none; white-space: normal; "
       "widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; "
       "text-decoration-style: initial; text-decoration-color: initial;\">Price "
       "10,000,000won</div>";
   WebString clipText;
   WebString clipHtml;
-  WebRect clipRect;
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("smartclip.html"));
-  WebView* webView =
+  WebViewImpl* webView =
       m_webViewHelper.initializeAndLoad(m_baseURL + "smartclip.html");
   webView->resize(WebSize(500, 500));
   webView->updateAllLifecyclePhases();
   WebRect cropRect(300, 125, 152, 50);
-  webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
+  webView->mainFrameImpl()->extractSmartClipData(cropRect, clipText, clipHtml);
   EXPECT_STREQ(kExpectedClipText, clipText.utf8().c_str());
   EXPECT_STREQ(kExpectedClipHtml, clipHtml.utf8().c_str());
 }
 
 TEST_P(WebViewTest, SmartClipDataWithPinchZoom) {
   static const char kExpectedClipText[] = "\nPrice 10,000,000won";
   static const char kExpectedClipHtml[] =
       "<div id=\"div4\" style=\"padding: 10px; margin: 10px; border: 2px "
       "solid skyblue; float: left; width: 190px; height: 30px; "
       "color: rgb(0, 0, 0); font-family: myahem; font-size: 8px; font-style: "
       "normal; font-variant-ligatures: normal; font-variant-caps: normal; "
       "font-weight: normal; letter-spacing: "
       "normal; orphans: 2; text-align: start; "
       "text-indent: 0px; text-transform: none; white-space: normal; widows: "
       "2; word-spacing: 0px; -webkit-text-stroke-width: 0px; "
       "text-decoration-style: initial; text-decoration-color: initial;\">Air "
       "conditioner</div><div id=\"div5\" style=\"padding: 10px; margin: 10px; "
       "border: 2px solid skyblue; float: left; width: 190px; height: 30px; "
       "color: rgb(0, 0, 0); font-family: myahem; font-size: 8px; font-style: "
       "normal; font-variant-ligatures: normal; font-variant-caps: normal; "
       "font-weight: normal; letter-spacing: normal; orphans: 2; text-align: "
       "start; text-indent: 0px; text-transform: none; white-space: normal; "
       "widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; "
       "text-decoration-style: initial; text-decoration-color: initial;\">Price "
       "10,000,000won</div>";
   WebString clipText;
   WebString clipHtml;
-  WebRect clipRect;
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("smartclip.html"));
-  WebView* webView =
+  WebViewImpl* webView =
       m_webViewHelper.initializeAndLoad(m_baseURL + "smartclip.html");
   webView->resize(WebSize(500, 500));
   webView->updateAllLifecyclePhases();
   webView->setPageScaleFactor(1.5);
   webView->setVisualViewportOffset(WebFloatPoint(167, 100));
   WebRect cropRect(200, 38, 228, 75);
-  webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
+  webView->mainFrameImpl()->extractSmartClipData(cropRect, clipText, clipHtml);
   EXPECT_STREQ(kExpectedClipText, clipText.utf8().c_str());
   EXPECT_STREQ(kExpectedClipHtml, clipHtml.utf8().c_str());
 }
 
 TEST_P(WebViewTest, SmartClipReturnsEmptyStringsWhenUserSelectIsNone) {
   WebString clipText;
   WebString clipHtml;
-  WebRect clipRect;
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("smartclip_user_select_none.html"));
-  WebView* webView = m_webViewHelper.initializeAndLoad(
+  WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "smartclip_user_select_none.html");
   webView->resize(WebSize(500, 500));
   webView->updateAllLifecyclePhases();
   WebRect cropRect(0, 0, 100, 100);
-  webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
+  webView->mainFrameImpl()->extractSmartClipData(cropRect, clipText, clipHtml);
   EXPECT_STREQ("", clipText.utf8().c_str());
   EXPECT_STREQ("", clipHtml.utf8().c_str());
 }
 
 TEST_P(WebViewTest, SmartClipDoesNotCrashPositionReversed) {
   WebString clipText;
   WebString clipHtml;
-  WebRect clipRect;
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("Ahem.ttf"));
   URLTestHelpers::registerMockedURLFromBaseURL(
       WebString::fromUTF8(m_baseURL.c_str()),
       WebString::fromUTF8("smartclip_reversed_positions.html"));
-  WebView* webView = m_webViewHelper.initializeAndLoad(
+  WebViewImpl* webView = m_webViewHelper.initializeAndLoad(
       m_baseURL + "smartclip_reversed_positions.html");
   webView->resize(WebSize(500, 500));
   webView->updateAllLifecyclePhases();
   // Left upper corner of the rect will be end position in the DOM hierarchy.
   WebRect cropRect(30, 110, 400, 250);
   // This should not still crash. See crbug.com/589082 for more details.
-  webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
+  webView->mainFrameImpl()->extractSmartClipData(cropRect, clipText, clipHtml);
 }
 
 class CreateChildCounterFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   CreateChildCounterFrameClient() : m_count(0) {}
   WebLocalFrame* createChildFrame(WebLocalFrame* parent,
                                   WebTreeScopeType,
                                   const WebString& name,
                                   const WebString& uniqueName,
@@ skipping 1113 matching lines @@
   EXPECT_EQ(expectedWidth, vwElement->offsetWidth());
   EXPECT_EQ(expectedHeight, vwElement->offsetHeight());
 
   webView->resize(WebSize(800, 600));
   frame->printEnd();
 
   EXPECT_EQ(800, vwElement->offsetWidth());
 }
 
 }  // namespace blink