Diff
Modified: trunk/Source/Platform/ChangeLog (124812 => 124813)
--- trunk/Source/Platform/ChangeLog 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/Platform/ChangeLog 2012-08-06 23:33:11 UTC (rev 124813)
@@ -1,3 +1,17 @@
+2012-08-06 Adam Barth <[email protected]>
+
+ [Chromium] WebTouchCandidatesInfo should be part of the Client API
+ https://bugs.webkit.org/show_bug.cgi?id=93088
+
+ Reviewed by Eric Seidel.
+
+ All the input related interfaces are part of the client (rather than
+ the platform) part of the API. This patch moves WebTouchCandidatesInfo
+ to the client part of the API.
+
+ * Platform.gypi:
+ * chromium/public/WebTouchCandidatesInfo.h: Removed.
+
2012-08-03 Nico Weber <[email protected]>
[chromium] Add API to make it possible to request all variants of a WebImage
Modified: trunk/Source/Platform/Platform.gypi (124812 => 124813)
--- trunk/Source/Platform/Platform.gypi 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/Platform/Platform.gypi 2012-08-06 23:33:11 UTC (rev 124813)
@@ -119,7 +119,6 @@
'chromium/public/WebString.h',
'chromium/public/WebThread.h',
'chromium/public/WebThreadSafeData.h',
- 'chromium/public/WebTouchCandidatesInfo.h',
'chromium/public/WebTransformationMatrix.h',
'chromium/public/WebTransformAnimationCurve.h',
'chromium/public/WebTransformKeyframe.h',
Deleted: trunk/Source/Platform/chromium/public/WebTouchCandidatesInfo.h (124812 => 124813)
--- trunk/Source/Platform/chromium/public/WebTouchCandidatesInfo.h 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/Platform/chromium/public/WebTouchCandidatesInfo.h 2012-08-06 23:33:11 UTC (rev 124813)
@@ -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 "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/ChangeLog (124812 => 124813)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-06 23:33:11 UTC (rev 124813)
@@ -1,3 +1,14 @@
+2012-08-06 Adam Barth <[email protected]>
+
+ [Chromium] WebTouchCandidatesInfo should be part of the Client API
+ https://bugs.webkit.org/show_bug.cgi?id=93088
+
+ Reviewed by Eric Seidel.
+
+ * WebKit.gyp:
+ * public/WebTouchCandidatesInfo.h: Copied from Source/Platform/chromium/public/WebTouchCandidatesInfo.h.
+ * src/WebViewImpl.cpp:
+
2012-08-06 Adrienne Walker <[email protected]>
[chromium] REGRESSION(r124714): webkit_unit_tests asserts in Debug
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (124812 => 124813)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-08-06 23:33:11 UTC (rev 124813)
@@ -275,6 +275,7 @@
'public/WebTextInputType.h',
'public/WebTextRun.h',
'public/WebTimeRange.h',
+ 'public/WebTouchCandidatesInfo.h',
'public/WebURLLoaderOptions.h',
'public/WebUserMediaClient.h',
'public/WebUserMediaRequest.h',
Copied: trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h (from rev 124811, trunk/Source/Platform/chromium/public/WebTouchCandidatesInfo.h) (0 => 124813)
--- trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebTouchCandidatesInfo.h 2012-08-06 23:33:11 UTC (rev 124813)
@@ -0,0 +1,54 @@
+/*
+ * 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/src/WebViewImpl.cpp (124812 => 124813)
--- trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-06 23:29:08 UTC (rev 124812)
+++ trunk/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-08-06 23:33:11 UTC (rev 124813)
@@ -145,6 +145,7 @@
#include "WebRuntimeFeatures.h"
#include "WebSettingsImpl.h"
#include "WebTextInputInfo.h"
+#include "WebTouchCandidatesInfo.h"
#include "WebViewClient.h"
#include "WheelEvent.h"
#include "cc/CCProxy.h"
@@ -162,7 +163,6 @@
#include <public/WebLayerTreeView.h>
#include <public/WebPoint.h>
#include <public/WebRect.h>
-#include <public/WebTouchCandidatesInfo.h>
#include <wtf/CurrentTime.h>
#include <wtf/MainThread.h>
#include <wtf/RefPtr.h>
