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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2667283007: Refactor Samsung SmartClip implementation. (Closed)
Patch Set: Rebase Created 3 years, 10 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: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 19a2df0f5202b81cd8bbd87c047e4abb23069f1b..2be3d64a1ed521ec3b9b617a35ab2c15eeb44537 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -57,7 +57,6 @@
#include "core/frame/PageScaleConstraintsSet.h"
#include "core/frame/RemoteFrame.h"
#include "core/frame/Settings.h"
-#include "core/frame/SmartClip.h"
#include "core/frame/UseCounter.h"
#include "core/frame/VisualViewport.h"
#include "core/html/HTMLMediaElement.h"
@@ -3508,46 +3507,6 @@ void WebViewImpl::didCloseContextMenu() {
frame->selection().setCaretBlinkingSuspended(false);
}
-void WebViewImpl::extractSmartClipData(WebRect rectInViewport,
- WebString& clipText,
- WebString& clipHtml,
- WebRect& clipRectInViewport) {
- LocalFrame* localFrame = toLocalFrame(focusedCoreFrame());
- if (!localFrame)
- return;
- SmartClipData clipData = SmartClip(localFrame).dataForRect(rectInViewport);
- clipText = clipData.clipData();
- clipRectInViewport = clipData.rectInViewport();
-
- WebLocalFrameImpl* frame = mainFrameImpl();
- if (!frame)
- return;
- WebPoint startPoint(rectInViewport.x, rectInViewport.y);
- WebPoint endPoint(rectInViewport.x + rectInViewport.width,
- rectInViewport.y + rectInViewport.height);
- VisiblePosition startVisiblePosition =
- frame->visiblePositionForViewportPoint(startPoint);
- VisiblePosition endVisiblePosition =
- frame->visiblePositionForViewportPoint(endPoint);
-
- Position startPosition = startVisiblePosition.deepEquivalent();
- Position endPosition = endVisiblePosition.deepEquivalent();
-
- // document() will return null if -webkit-user-select is set to none.
- if (!startPosition.document() || !endPosition.document())
- return;
-
- if (startPosition.compareTo(endPosition) <= 0) {
- clipHtml =
- createMarkup(startPosition, endPosition, AnnotateForInterchange,
- ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
- } else {
- clipHtml =
- createMarkup(endPosition, startPosition, AnnotateForInterchange,
- ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
- }
-}
-
void WebViewImpl::hidePopups() {
cancelPagePopup();
}

Powered by Google App Engine
This is Rietveld 408576698