Modified: branches/chromium/1410/Source/WebKit/chromium/ChangeLog (143776 => 143777)
--- branches/chromium/1410/Source/WebKit/chromium/ChangeLog 2013-02-22 20:34:40 UTC (rev 143776)
+++ branches/chromium/1410/Source/WebKit/chromium/ChangeLog 2013-02-22 20:35:40 UTC (rev 143777)
@@ -1,3 +1,104 @@
+2013-02-15 Alexandre Elias <ael...@chromium.org>
+
+ [chromium] WebInputEventBuilders should not reverse page scale
+ https://bugs.webkit.org/show_bug.cgi?id=109901
+
+ Reviewed by James Robinson.
+
+ Though in theory logical that if WebInputEvent -> PlatformEvent
+ conversions divide by page scale, then the reverse builders should
+ multiply, in reality the only user of the reverse builders is
+ plugins which expect the same coordinate space as WebCore.
+
+ * src/WebInputEventConversion.cpp:
+ (WebKit::updateWebMouseEventFromWebCoreMouseEvent):
+ (WebKit::WebMouseEventBuilder::WebMouseEventBuilder):
+ (WebKit::addTouchPoints):
+ (WebKit::WebGestureEventBuilder::WebGestureEventBuilder):
+ * tests/WebInputEventConversionTest.cpp:
+ (WebCore::TEST):
+
+2013-02-15 Anders Carlsson <ander...@apple.com>
+
+ Remove const from a bunch of StorageArea member functions
+ https://bugs.webkit.org/show_bug.cgi?id=109957
+
+ Reviewed by Beth Dakin.
+
+ Update for WebCore changes.
+
+ * src/StorageAreaProxy.cpp:
+ (WebCore::StorageAreaProxy::length):
+ (WebCore::StorageAreaProxy::key):
+ (WebCore::StorageAreaProxy::getItem):
+ (WebCore::StorageAreaProxy::contains):
+ (WebCore::StorageAreaProxy::canAccessStorage):
+ (WebCore::StorageAreaProxy::memoryBytesUsedByCache):
+ * src/StorageAreaProxy.h:
+ (StorageAreaProxy):
+
+2013-02-15 Keishi Hattori <kei...@webkit.org>
+
+ PagePopupController.formatMonth should support short month format
+ https://bugs.webkit.org/show_bug.cgi?id=109530
+
+ Reviewed by Kent Tamura.
+
+ * tests/LocaleMacTest.cpp:
+ (LocaleMacTest::formatMonth):
+ (TEST_F):
+
+2013-02-15 Keishi Hattori <kei...@webkit.org>
+
+ Add setValue and closePopup methods to PagePopupController
+ https://bugs.webkit.org/show_bug.cgi?id=109897
+
+ Reviewed by Kent Tamura.
+
+ * src/ColorChooserPopupUIController.cpp:
+ (WebKit::ColorChooserPopupUIController::setValue):
+ (WebKit):
+ * src/ColorChooserPopupUIController.h:
+ (ColorChooserPopupUIController):
+ * src/DateTimeChooserImpl.cpp:
+ (WebKit::DateTimeChooserImpl::setValueAndClosePopup): Use setValue and closePopup.
+ (WebKit):
+ (WebKit::DateTimeChooserImpl::setValue):
+ (WebKit::DateTimeChooserImpl::closePopup):
+ * src/DateTimeChooserImpl.h:
+ (DateTimeChooserImpl):
+
+2013-02-15 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ Simplify hitTestResultAtPoint and nodesFromRect APIs
+ https://bugs.webkit.org/show_bug.cgi?id=95720
+
+ Reviewed by Julien Chaffraix.
+
+ Update calls to new API.
+
+ * src/ContextMenuClientImpl.cpp:
+ (WebKit::selectMisspelledWord):
+ * src/FrameLoaderClientImpl.cpp:
+ (WebKit::FrameLoaderClientImpl::dispatchDecidePolicyForNavigationAction):
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::characterIndexForPoint):
+ * src/WebPluginContainerImpl.cpp:
+ (WebKit::WebPluginContainerImpl::isRectTopmost):
+ * src/WebViewImpl.cpp:
+ (WebKit::WebViewImpl::handleMouseDown):
+ (WebKit::WebViewImpl::computeBlockBounds):
+ (WebKit::WebViewImpl::bestTouchLinkNode):
+ (WebKit::WebViewImpl::hitTestResultForWindowPos):
+
+2013-02-14 Vsevolod Vlasov <vse...@chromium.org>
+
+ Unreviewed chromium test fix: incorrect field was used for UISourceCode url.
+
+ * src/js/Tests.js:
+ (.TestSuite.prototype.testNoScriptDuplicatesOnPanelSwitch.checkNoDuplicates):
+ (.TestSuite.prototype.uiSourceCodesToString_):
+
2013-02-14 David Trainor <dtrai...@chromium.org>
[chromium] No triggering autofill on unfocus
Modified: branches/chromium/1410/Source/WebKit/chromium/src/WebInputEventConversion.cpp (143776 => 143777)
--- branches/chromium/1410/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2013-02-22 20:34:40 UTC (rev 143776)
+++ branches/chromium/1410/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2013-02-22 20:35:40 UTC (rev 143777)
@@ -430,7 +430,6 @@
static void updateWebMouseEventFromWebCoreMouseEvent(const MouseRelatedEvent& event, const Widget& widget, const WebCore::RenderObject& renderObject, WebMouseEvent& webEvent)
{
- float scale = widgetScaleFactor(&widget);
webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
webEvent.modifiers = getWebInputModifiers(event);
@@ -438,11 +437,11 @@
IntPoint windowPoint = view->contentsToWindow(IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y()));
webEvent.globalX = event.screenX();
webEvent.globalY = event.screenY();
- webEvent.windowX = windowPoint.x() * scale;
- webEvent.windowY = windowPoint.y() * scale;
+ webEvent.windowX = windowPoint.x();
+ webEvent.windowY = windowPoint.y();
IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), renderObject);
- webEvent.x = localPoint.x() * scale;
- webEvent.y = localPoint.y() * scale;
+ webEvent.x = localPoint.x();
+ webEvent.y = localPoint.y();
}
WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const MouseEvent& event)
@@ -489,16 +488,14 @@
}
}
#if ENABLE(POINTER_LOCK)
- float scale = widgetScaleFactor(widget);
- movementX = event.webkitMovementX() * scale;
- movementY = event.webkitMovementY() * scale;
+ movementX = event.webkitMovementX();
+ movementY = event.webkitMovementY();
#endif
clickCount = event.detail();
}
WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const TouchEvent& event)
{
- float scale = widgetScaleFactor(widget);
if (!event.touches())
return;
if (event.touches()->length() != 1) {
@@ -526,8 +523,8 @@
clickCount = (type == MouseDown || type == MouseUp);
IntPoint localPoint = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
- x = localPoint.x() * scale;
- y = localPoint.y() * scale;
+ x = localPoint.x();
+ y = localPoint.y();
}
WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const WheelEvent& event)
@@ -583,7 +580,6 @@
static void addTouchPoints(const Widget* widget, const AtomicString& touchType, TouchList* touches, WebTouchPoint* touchPoints, unsigned* touchPointsLength, const WebCore::RenderObject* renderObject)
{
- float scale = widgetScaleFactor(widget);
unsigned numberOfTouches = std::min(touches->length(), static_cast<unsigned>(WebTouchEvent::touchesLengthCap));
for (unsigned i = 0; i < numberOfTouches; ++i) {
const Touch* touch = touches->item(i);
@@ -592,10 +588,8 @@
point.id = touch->identifier();
point.screenPosition = WebPoint(touch->screenX(), touch->screenY());
point.position = convertAbsoluteLocationForRenderObject(touch->absoluteLocation(), *renderObject);
- point.position.x *= scale;
- point.position.y *= scale;
- point.radiusX = touch->webkitRadiusX() * scale;
- point.radiusY = touch->webkitRadiusY() * scale;
+ point.radiusX = touch->webkitRadiusX();
+ point.radiusY = touch->webkitRadiusY();
point.rotationAngle = touch->webkitRotationAngle();
point.force = touch->webkitForce();
point.state = toWebTouchPointState(touchType);
@@ -634,7 +628,6 @@
#if ENABLE(GESTURE_EVENTS)
WebGestureEventBuilder::WebGestureEventBuilder(const Widget* widget, const WebCore::RenderObject* renderObject, const GestureEvent& event)
{
- float scale = widgetScaleFactor(widget);
if (event.type() == eventNames().gesturetapEvent)
type = GestureTap;
else if (event.type() == eventNames().gesturetapdownEvent)
@@ -645,8 +638,8 @@
type = GestureScrollEnd;
else if (event.type() == eventNames().gesturescrollupdateEvent) {
type = GestureScrollUpdate;
- data.scrollUpdate.deltaX = event.deltaX() * scale;
- data.scrollUpdate.deltaY = event.deltaY() * scale;
+ data.scrollUpdate.deltaX = event.deltaX();
+ data.scrollUpdate.deltaY = event.deltaY();
}
timeStampSeconds = event.timeStamp() / millisPerSecond;
@@ -655,8 +648,8 @@
globalX = event.screenX();
globalY = event.screenY();
IntPoint localPoint = convertAbsoluteLocationForRenderObject(event.absoluteLocation(), *renderObject);
- x = localPoint.x() * scale;
- y = localPoint.y() * scale;
+ x = localPoint.x();
+ y = localPoint.y();
}
#endif // ENABLE(GESTURE_EVENTS)
Modified: branches/chromium/1410/Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp (143776 => 143777)
--- branches/chromium/1410/Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp 2013-02-22 20:34:40 UTC (rev 143776)
+++ branches/chromium/1410/Source/WebKit/chromium/tests/WebInputEventConversionTest.cpp 2013-02-22 20:35:40 UTC (rev 143777)
@@ -218,17 +218,19 @@
EXPECT_EQ(5, platformTouchBuilder.touchPoints()[0].radiusY());
}
+ // Reverse builders should *not* go back to physical pixels, as they are used for plugins
+ // which expect CSS pixel coordinates.
{
PlatformMouseEvent platformMouseEvent(IntPoint(10, 10), IntPoint(10, 10), LeftButton, PlatformEvent::MouseMoved, 1, false, false, false, false, 0);
RefPtr<MouseEvent> mouseEvent = MouseEvent::create(WebCore::eventNames().mousemoveEvent, domWindow, platformMouseEvent, 0, document);
WebMouseEventBuilder webMouseBuilder(view, docRenderer, *mouseEvent);
- EXPECT_EQ(20, webMouseBuilder.x);
- EXPECT_EQ(20, webMouseBuilder.y);
+ EXPECT_EQ(10, webMouseBuilder.x);
+ EXPECT_EQ(10, webMouseBuilder.y);
EXPECT_EQ(10, webMouseBuilder.globalX);
EXPECT_EQ(10, webMouseBuilder.globalY);
- EXPECT_EQ(20, webMouseBuilder.windowX);
- EXPECT_EQ(20, webMouseBuilder.windowY);
+ EXPECT_EQ(10, webMouseBuilder.windowX);
+ EXPECT_EQ(10, webMouseBuilder.windowY);
}
{
@@ -236,12 +238,12 @@
RefPtr<GestureEvent> gestureEvent = GestureEvent::create(domWindow, platformGestureEvent);
WebGestureEventBuilder webGestureBuilder(view, docRenderer, *gestureEvent);
- EXPECT_EQ(20, webGestureBuilder.x);
- EXPECT_EQ(20, webGestureBuilder.y);
+ EXPECT_EQ(10, webGestureBuilder.x);
+ EXPECT_EQ(10, webGestureBuilder.y);
EXPECT_EQ(10, webGestureBuilder.globalX);
EXPECT_EQ(10, webGestureBuilder.globalY);
- EXPECT_EQ(20, webGestureBuilder.data.scrollUpdate.deltaX);
- EXPECT_EQ(20, webGestureBuilder.data.scrollUpdate.deltaY);
+ EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaX);
+ EXPECT_EQ(10, webGestureBuilder.data.scrollUpdate.deltaY);
}
{
@@ -254,10 +256,10 @@
ASSERT_EQ(1u, webTouchBuilder.touchesLength);
EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.x);
EXPECT_EQ(10, webTouchBuilder.touches[0].screenPosition.y);
- EXPECT_EQ(20, webTouchBuilder.touches[0].position.x);
- EXPECT_EQ(20, webTouchBuilder.touches[0].position.y);
- EXPECT_EQ(20, webTouchBuilder.touches[0].radiusX);
- EXPECT_EQ(20, webTouchBuilder.touches[0].radiusY);
+ EXPECT_EQ(10, webTouchBuilder.touches[0].position.x);
+ EXPECT_EQ(10, webTouchBuilder.touches[0].position.y);
+ EXPECT_EQ(10, webTouchBuilder.touches[0].radiusX);
+ EXPECT_EQ(10, webTouchBuilder.touches[0].radiusY);
}
webViewImpl->close();
