Attachment #155924 for bug #92921

View Details Raw Unified Return to Bug 92921

| Differences between



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



    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) \

    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())

        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;
}



        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,

Return to Bug 92921

Lines 227-242 static Vector<PageGroupLoadDeferrer*>& pageGroupLoadDeferrerStack() a/Source/WebKit/chromium/src/WebViewImpl.cpp_sec1
- a/Source/WebKit/chromium/src/WebViewImpl.cpp -21 lines
227	return deferrerStack;	227	return deferrerStack;
228	}	228	}
229		229
230	#if ENABLE(TOUCH_EVENTS)
231	static Color tapHighlightColorForNode(const Node* node)
232	{
233	Color tapHighlightColor = RenderStyle::initialTapHighlightColor().rgb();
234	if (node && node->renderer())
235	tapHighlightColor = node->renderer()->style()->tapHighlightColor().rgb();
236	return tapHighlightColor;
237	}
238	#endif
239
240	// Ensure that the WebDragOperation enum values stay in sync with the original	230	// Ensure that the WebDragOperation enum values stay in sync with the original
241	// DragOperation constants.	231	// DragOperation constants.
242	#define COMPILE_ASSERT_MATCHING_ENUM(coreName) \	232	#define COMPILE_ASSERT_MATCHING_ENUM(coreName) \
Lines 3820-3831 WebGraphicsContext3D* WebViewImpl::sharedGraphicsContext3D() a/Source/WebKit/chromium/src/WebViewImpl.cpp_sec2
3820	return GraphicsContext3DPrivate::extractWebGraphicsContext3D(SharedGraphicsContext3D::get().get());	3810	return GraphicsContext3DPrivate::extractWebGraphicsContext3D(SharedGraphicsContext3D::get().get());
3821	}	3811	}
3822		3812
3823	void WebViewImpl::showTouchHighlightQuads(const WebVector<WebFloatQuad>& highlight, WebColor highlightColor)
3824	{
3825	// FIXME: Upstream this function from the chromium-android branch.
3826	notImplemented();
3827	}
3828
3829	void WebViewImpl::selectAutofillSuggestionAtIndex(unsigned listIndex)	3813	void WebViewImpl::selectAutofillSuggestionAtIndex(unsigned listIndex)
3830	{	3814	{
3831	if (m_autofillPopupClient && listIndex < m_autofillPopupClient->getSuggestionsCount())	3815	if (m_autofillPopupClient && listIndex < m_autofillPopupClient->getSuggestionsCount())
Lines 3856-3866 bool WebViewImpl::detectContentIntentOnTouch(const WebPoint& position, WebInputE a/Source/WebKit/chromium/src/WebViewImpl.cpp_sec3
3856	return true;	3840	return true;
3857	}	3841	}
3858		3842
3859	// Temporarily highlight the content as we do with links.
3860	Color tapHighlightColor = tapHighlightColorForNode(touchHit.innerNode());
3861	WebVector<WebFloatQuad> quads = content.range().textQuads();
3862	showTouchHighlightQuads(quads, tapHighlightColor.rgb());
3863
3864	m_client->scheduleContentIntent(content.intent());	3843	m_client->scheduleContentIntent(content.intent());
3865	return true;	3844	return true;
3866	}	3845	}

Lines 1-3 a/Source/WebKit/chromium/ChangeLog_sec1
- a/Source/WebKit/chromium/ChangeLog +18 lines
		1	2012-08-01 Adam Barth <abarth@webkit.org>
		2
		3	[Chromium] WebViewImpl::showTouchHighlightQuads isn't needed for Android
		4	https://bugs.webkit.org/show_bug.cgi?id=92921
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	We originally added a stub implementation of this function to make
		9	merging detectContentOnTouch easier, but showTouchHighlightQuads is
		10	being removed from the chromium-android branch in favor of the code in
		11	https://bugs.webkit.org/show_bug.cgi?id=84487. This patch removes the
		12	stub.
		13
		14	* src/WebViewImpl.cpp:
		15	(WebKit::WebViewImpl::detectContentIntentOnTouch):
		16	* src/WebViewImpl.h:
		17	(WebViewImpl):
		18
1	2012-08-01 Antoine Labour <piman@chromium.org>	19	2012-08-01 Antoine Labour <piman@chromium.org>
2		20
3	[chromium] Fix lost context handling on hud layer	21	[chromium] Fix lost context handling on hud layer

Lines 285-292 public: a/Source/WebKit/chromium/src/WebViewImpl.h_sec1
- a/Source/WebKit/chromium/src/WebViewImpl.h -2 lines
285	const WebVector<int>& itemIDs,	285	const WebVector<int>& itemIDs,
286	int separatorIndex);	286	int separatorIndex);
287	virtual void hidePopups();	287	virtual void hidePopups();
288	// FIXME: Expose showTouchHighlightQuads in the public WebView API when it does something.
289	virtual void showTouchHighlightQuads(const WebVector<WebFloatQuad>& highlight, WebColor highlightColor);
290	virtual void selectAutofillSuggestionAtIndex(unsigned listIndex);	288	virtual void selectAutofillSuggestionAtIndex(unsigned listIndex);
291	virtual void setScrollbarColors(unsigned inactiveColor,	289	virtual void setScrollbarColors(unsigned inactiveColor,
292	unsigned activeColor,	290	unsigned activeColor,