Title: [124471] trunk/Source/WebKit/chromium
- Revision
- 124471
- Author
- [email protected]
- Date
- 2012-08-02 09:48:33 -0700 (Thu, 02 Aug 2012)
Log Message
[Chromium] WebViewImpl::showTouchHighlightQuads isn't needed for Android
https://bugs.webkit.org/show_bug.cgi?id=92921
Reviewed by Nate Chapin.
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (124470 => 124471)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 16:42:13 UTC (rev 124470)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-02 16:48:33 UTC (rev 124471)
@@ -1,3 +1,21 @@
+2012-08-02 Adam Barth <[email protected]>
+
+ [Chromium] WebViewImpl::showTouchHighlightQuads isn't needed for Android
+ https://bugs.webkit.org/show_bug.cgi?id=92921
+
+ Reviewed by Nate Chapin.
+
+ 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-02 Peter Beverloo <[email protected]>
[Chromium] Toggle the type of ant compile for webkit_unit_tests and TestWebKitAPI
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (124470 => 124471)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-02 16:42:13 UTC (rev 124470)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-02 16:48:33 UTC (rev 124471)
@@ -228,16 +228,6 @@
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) \
@@ -3830,12 +3820,6 @@
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())
@@ -3866,11 +3850,6 @@
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;
}
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (124470 => 124471)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-02 16:42:13 UTC (rev 124470)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-02 16:48:33 UTC (rev 124471)
@@ -285,8 +285,6 @@
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,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
