Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (126840 => 126841)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-28 05:15:13 UTC (rev 126841)
@@ -1,3 +1,22 @@
+2012-08-27 Tien-Ren Chen <[email protected]>
+
+ [Chromium] Remove stub for WebView::getTouchHighlightQuads()
+ https://bugs.webkit.org/show_bug.cgi?id=95164
+
+ Reviewed by Adam Barth.
+
+ Reverts https://bugs.webkit.org/show_bug.cgi?id=92997
+ We're uploading a new implementation that no longer uses this API.
+ See https://bugs.webkit.org/show_bug.cgi?id=94182
+
+ * WebKit.gyp:
+ * public/WebTouchCandidatesInfo.h: Removed.
+ * public/WebView.h:
+ (WebKit):
+ * src/WebViewImpl.cpp:
+ * src/WebViewImpl.h:
+ (WebViewImpl):
+
2012-08-27 Ian Vollick <[email protected]>
[chromium] Should accelerate rotations of >= 180 degrees
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (126840 => 126841)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-28 05:15:13 UTC (rev 126841)
@@ -277,7 +277,6 @@
'public/WebTextInputType.h',
'public/WebTextRun.h',
'public/WebTimeRange.h',
- 'public/WebTouchCandidatesInfo.h',
'public/WebURLLoaderOptions.h',
'public/WebUserMediaClient.h',
'public/WebUserMediaRequest.h',
Deleted: trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h (126840 => 126841)
--- trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h 2012-08-28 05:15:13 UTC (rev 126841)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebTouchCandidatesInfo_h
-#define WebTouchCandidatesInfo_h
-
-#include "platform/WebRect.h"
-
-namespace WebKit {
-
-struct WebTouchCandidatesInfo {
- // The number of possible touch receivers from the last touch.
- int numberOfCandidates;
-
- // The bounds of the possible touch candidates. This will enclose the
- // rects of any possible touch candidates for a press.
- WebRect unitedBounds;
-
- // The smallest dimension (either width or height) of any of the
- // available touch targets.
- int smallestDimension;
-
- WebTouchCandidatesInfo()
- : numberOfCandidates(0)
- , smallestDimension(0)
- {
- }
-};
-
-} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit/chromium/public/WebView.h (126840 => 126841)
--- trunk/Source/WebKit/chromium/public/WebView.h 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/public/WebView.h 2012-08-28 05:15:13 UTC (rev 126841)
@@ -60,11 +60,9 @@
class WebTextFieldDecoratorClient;
class WebViewClient;
struct WebActiveWheelFlingParameters;
-struct WebFloatQuad;
struct WebMediaPlayerAction;
struct WebPluginAction;
struct WebPoint;
-struct WebTouchCandidatesInfo;
class WebView : public WebWidget {
public:
@@ -469,20 +467,6 @@
virtual WebViewBenchmarkSupport* benchmarkSupport() { return 0; }
-
- // Touch ----------------------------------------------------------------
-
- // Returns a list of layout bounding boxes of the event target node touched by
- // the input point with the padding. If no target node is found, an empty
- // list is returned. If the node is of an inline type, each line box is returned
- // separately. Otherwise, one bounding box is returned. Also returns information
- // about the found candidates and their dimension, and the highlight color to use.
- virtual WebVector<WebFloatQuad> getTouchHighlightQuads(const WebPoint&,
- int padding,
- WebTouchCandidatesInfo& outTouchInfo,
- WebColor& outTapHighlightColor) = 0;
-
-
// Visibility -----------------------------------------------------------
// Sets the visibility of the WebView.
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.cpp (126840 => 126841)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-28 05:15:13 UTC (rev 126841)
@@ -145,7 +145,6 @@
#include "WebRuntimeFeatures.h"
#include "WebSettingsImpl.h"
#include "WebTextInputInfo.h"
-#include "WebTouchCandidatesInfo.h"
#include "WebViewClient.h"
#include "WheelEvent.h"
#include "painting/GraphicsContextBuilder.h"
@@ -795,17 +794,6 @@
return &m_benchmarkSupport;
}
-WebVector<WebFloatQuad> WebViewImpl::getTouchHighlightQuads(const WebPoint& point,
- int padding,
- WebTouchCandidatesInfo& outTouchInfo,
- WebColor& outTapHighlightColor)
-{
- // FIXME: Upstream this function from the chromium-android branch.
- notImplemented();
-
- return WebVector<WebFloatQuad>();
-}
-
bool WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
{
ASSERT((event.type == WebInputEvent::RawKeyDown)
Modified: trunk/Source/WebKit/chromium/src/WebViewImpl.h (126840 => 126841)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-28 04:26:48 UTC (rev 126840)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.h 2012-08-28 05:15:13 UTC (rev 126841)
@@ -305,11 +305,6 @@
virtual void transferActiveWheelFlingAnimation(const WebActiveWheelFlingParameters&);
virtual WebViewBenchmarkSupport* benchmarkSupport();
- virtual WebVector<WebFloatQuad> getTouchHighlightQuads(const WebPoint&,
- int padding,
- WebTouchCandidatesInfo& outTouchInfo,
- WebColor& outTapHighlightColor);
-
// WebLayerTreeViewClient
virtual void willBeginFrame();
virtual void didBeginFrame();
