Attachment 155924 Details for Bug 92921 – Patch

[patch] Patch

bug-92921-20120801165517.patch (text/plain), 3.79 KB, created by Adam Barth on 2012-08-01 16:55:36 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Barth

Created: 2012-08-01 16:55:36 PDT

Size: 3.79 KB

patch

obsolete

>Subversion Revision: 124385
>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index f51821d39ca082b942b7a7481e8f20ace5148568..327a2833609f9ae41f9f61a5a21be027bad4db89 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,21 @@
>+2012-08-01  Adam Barth  <abarth@webkit.org>
>+
>+        [Chromium] WebViewImpl::showTouchHighlightQuads isn't needed for Android
>+        https://bugs.webkit.org/show_bug.cgi?id=92921
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We originally added a stub implementation of this function to make
>+        merging detectContentOnTouch easier, but showTouchHighlightQuads is
>+        being removed from the chromium-android branch in favor of the code in
>+        https://bugs.webkit.org/show_bug.cgi?id=84487. This patch removes the
>+        stub.
>+
>+        * src/WebViewImpl.cpp:
>+        (WebKit::WebViewImpl::detectContentIntentOnTouch):
>+        * src/WebViewImpl.h:
>+        (WebViewImpl):
>+
> 2012-08-01  Antoine Labour  <piman@chromium.org>
> 
>         [chromium] Fix lost context handling on hud layer
>diff --git a/Source/WebKit/chromium/src/WebViewImpl.cpp b/Source/WebKit/chromium/src/WebViewImpl.cpp
>index d8750e38a287eb19073744cc039e2c4a24d4ec94..8f58ddb623535d9b5486a593824d5f2a5e5611eb 100644
>--- a/Source/WebKit/chromium/src/WebViewImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebViewImpl.cpp
>@@ -227,16 +227,6 @@ static Vector<PageGroupLoadDeferrer*>& pageGroupLoadDeferrerStack()
>     return deferrerStack;
> }
> 
>-#if ENABLE(TOUCH_EVENTS)
>-static Color tapHighlightColorForNode(const Node* node)
>-{
>-    Color tapHighlightColor = RenderStyle::initialTapHighlightColor().rgb();
>-    if (node && node->renderer())
>-        tapHighlightColor = node->renderer()->style()->tapHighlightColor().rgb();
>-    return tapHighlightColor;
>-}
>-#endif
>-
> // Ensure that the WebDragOperation enum values stay in sync with the original
> // DragOperation constants.
> #define COMPILE_ASSERT_MATCHING_ENUM(coreName) \
>@@ -3820,12 +3810,6 @@ WebGraphicsContext3D* WebViewImpl::sharedGraphicsContext3D()
>     return GraphicsContext3DPrivate::extractWebGraphicsContext3D(SharedGraphicsContext3D::get().get());
> }
> 
>-void WebViewImpl::showTouchHighlightQuads(const WebVector<WebFloatQuad>& highlight, WebColor highlightColor)
>-{
>-    // FIXME: Upstream this function from the chromium-android branch.
>-    notImplemented();
>-}
>-
> void WebViewImpl::selectAutofillSuggestionAtIndex(unsigned listIndex)
> {
>     if (m_autofillPopupClient && listIndex < m_autofillPopupClient->getSuggestionsCount())
>@@ -3856,11 +3840,6 @@ bool WebViewImpl::detectContentIntentOnTouch(const WebPoint& position, WebInputE
>         return true;
>     }
> 
>-    // Temporarily highlight the content as we do with links.
>-    Color tapHighlightColor = tapHighlightColorForNode(touchHit.innerNode());
>-    WebVector<WebFloatQuad> quads = content.range().textQuads();
>-    showTouchHighlightQuads(quads, tapHighlightColor.rgb());
>-
>     m_client->scheduleContentIntent(content.intent());
>     return true;
> }
>diff --git a/Source/WebKit/chromium/src/WebViewImpl.h b/Source/WebKit/chromium/src/WebViewImpl.h
>index 0b1da2a27d56913be62001aefb02059affcd0805..074a8369bd3f7dd8979a73447db0ba0b3ba56c49 100644
>--- a/Source/WebKit/chromium/src/WebViewImpl.h
>+++ b/Source/WebKit/chromium/src/WebViewImpl.h
>@@ -285,8 +285,6 @@ public:
>         const WebVector<int>& itemIDs,
>         int separatorIndex);
>     virtual void hidePopups();
>-    // FIXME: Expose showTouchHighlightQuads in the public WebView API when it does something.
>-    virtual void showTouchHighlightQuads(const WebVector<WebFloatQuad>& highlight, WebColor highlightColor);
>     virtual void selectAutofillSuggestionAtIndex(unsigned listIndex);
>     virtual void setScrollbarColors(unsigned inactiveColor,
>                                     unsigned activeColor,

Actions: View | Formatted Diff | Diff

Attachments on bug 92921: 155919 | 155924