Title: [200846] releases/WebKitGTK/webkit-2.12
- Revision
- 200846
- Author
- [email protected]
- Date
- 2016-05-13 05:18:51 -0700 (Fri, 13 May 2016)
Log Message
Merge r200247 - Wheel Event Not Fired For `body,html { height:100% }`
https://bugs.webkit.org/show_bug.cgi?id=148450
Reviewed by Brent Fulgham.
Source/WebCore:
EventHandler::handleWheelEvent() didn't pass the Active flag in the HitTestRequest,
which causes code in RenderLayer::hitTest() to fail to fall back to returning the
root layer if no other element is hit. "Active" is in the default flags,
so just create the HitTestRequest with the default flags.
Test: fast/events/wheel-event-outside-body.html
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEvent):
LayoutTests:
Testcase, skipped on iOS which doesn't support wheel events.
* fast/events/wheel-event-outside-body-expected.txt: Added.
* fast/events/wheel-event-outside-body.html: Added.
* platform/ios-simulator/TestExpectations:
Modified Paths
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (200845 => 200846)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 12:14:22 UTC (rev 200845)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 12:18:51 UTC (rev 200846)
@@ -1,3 +1,16 @@
+2016-04-29 Simon Fraser <[email protected]>
+
+ Wheel Event Not Fired For `body,html { height:100% }`
+ https://bugs.webkit.org/show_bug.cgi?id=148450
+
+ Reviewed by Brent Fulgham.
+
+ Testcase, skipped on iOS which doesn't support wheel events.
+
+ * fast/events/wheel-event-outside-body-expected.txt: Added.
+ * fast/events/wheel-event-outside-body.html: Added.
+ * platform/ios-simulator/TestExpectations:
+
2016-04-28 Zalan Bujtas <[email protected]>
Content disappears on mouse over.
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body-expected.txt (0 => 200846)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body-expected.txt 2016-05-13 12:18:51 UTC (rev 200846)
@@ -0,0 +1 @@
+PASS: received mousewheel event
Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body.html (0 => 200846)
--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/events/wheel-event-outside-body.html 2016-05-13 12:18:51 UTC (rev 200846)
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ background-color: white;
+ }
+ body {
+ background-color: silver;
+ height: 400px;
+ margin: 0;
+ }
+
+ .tall {
+ position: absolute;
+ top: 0;
+ background-color: gray;
+ height: 2000px;
+ width: 20px;
+ }
+
+ #results {
+ position: fixed;
+ margin-left: 25px;
+ }
+ </style>
+
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function setResult(s)
+ {
+ document.getElementById('results').innerText = s;
+ }
+
+ function runTest()
+ {
+ window.addEventListener('mousewheel', function(event) {
+ setResult('PASS: received mousewheel event');
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, false)
+ window.scrollTo(0, 800);
+
+ window.setTimeout(function() {
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(50, 100);
+ eventSender.mouseScrollBy(-1, -2);
+ }
+
+ // Watchdog timer in case of failure.
+ window.setTimeout(function() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 100);
+ }, 0);
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+</head>
+<body>
+<div id="results">
+ FAIL: did not receive mousewheel event.
+</div>
+<div class="tall"></div>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200845 => 200846)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 12:14:22 UTC (rev 200845)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 12:18:51 UTC (rev 200846)
@@ -1,3 +1,20 @@
+2016-04-29 Simon Fraser <[email protected]>
+
+ Wheel Event Not Fired For `body,html { height:100% }`
+ https://bugs.webkit.org/show_bug.cgi?id=148450
+
+ Reviewed by Brent Fulgham.
+
+ EventHandler::handleWheelEvent() didn't pass the Active flag in the HitTestRequest,
+ which causes code in RenderLayer::hitTest() to fail to fall back to returning the
+ root layer if no other element is hit. "Active" is in the default flags,
+ so just create the HitTestRequest with the default flags.
+
+ Test: fast/events/wheel-event-outside-body.html
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleWheelEvent):
+
2016-04-28 Zalan Bujtas <[email protected]>
Content disappears on mouse over.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp (200845 => 200846)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp 2016-05-13 12:14:22 UTC (rev 200845)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/EventHandler.cpp 2016-05-13 12:18:51 UTC (rev 200846)
@@ -2601,7 +2601,7 @@
m_isHandlingWheelEvent = true;
setFrameWasScrolledByUser();
- HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::DisallowShadowContent);
+ HitTestRequest request;
HitTestResult result(view->windowToContents(event.position()));
renderView->hitTest(request, result);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
