Title: [185218] trunk
- Revision
- 185218
- Author
- commit-qu...@webkit.org
- Date
- 2015-06-04 14:12:34 -0700 (Thu, 04 Jun 2015)
Log Message
Unreviewed, rolling out r185208.
https://bugs.webkit.org/show_bug.cgi?id=145655
platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-
latched-select.html (Requested by shallawa on #webkit).
Reverted changeset:
"Latching algorithm in findEnclosingOverflowScroll is broken"
https://bugs.webkit.org/show_bug.cgi?id=145642
http://trac.webkit.org/changeset/185208
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (185217 => 185218)
--- trunk/LayoutTests/ChangeLog 2015-06-04 21:08:25 UTC (rev 185217)
+++ trunk/LayoutTests/ChangeLog 2015-06-04 21:12:34 UTC (rev 185218)
@@ -1,3 +1,17 @@
+2015-06-04 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r185208.
+ https://bugs.webkit.org/show_bug.cgi?id=145655
+
+ platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-
+ latched-select.html (Requested by shallawa on #webkit).
+
+ Reverted changeset:
+
+ "Latching algorithm in findEnclosingOverflowScroll is broken"
+ https://bugs.webkit.org/show_bug.cgi?id=145642
+ http://trac.webkit.org/changeset/185208
+
2015-06-03 Filip Pizlo <fpi...@apple.com>
Simplify unboxing of double JSValues known to be not NaN and not Int32
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html (185217 => 185218)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html 2015-06-04 21:08:25 UTC (rev 185217)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html 2015-06-04 21:12:34 UTC (rev 185218)
@@ -3,6 +3,12 @@
<head>
<title>Inner iFrame Example</title>
<meta charset="utf-8">
+ <style>
+ img {
+ display:block;
+ max-width:100%;
+ }
+ </style>
</head>
<body style="position: relative; min-height: 100%; top: 0px;">
<div style="overflow:auto;">
Modified: trunk/Source/WebCore/ChangeLog (185217 => 185218)
--- trunk/Source/WebCore/ChangeLog 2015-06-04 21:08:25 UTC (rev 185217)
+++ trunk/Source/WebCore/ChangeLog 2015-06-04 21:12:34 UTC (rev 185218)
@@ -1,3 +1,17 @@
+2015-06-04 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r185208.
+ https://bugs.webkit.org/show_bug.cgi?id=145655
+
+ platform/mac-wk2/tiled-drawing/scrolling/fast-scroll-iframe-
+ latched-select.html (Requested by shallawa on #webkit).
+
+ Reverted changeset:
+
+ "Latching algorithm in findEnclosingOverflowScroll is broken"
+ https://bugs.webkit.org/show_bug.cgi?id=145642
+ http://trac.webkit.org/changeset/185208
+
2015-06-04 Myles C. Maxfield <mmaxfi...@apple.com>
[Cocoa] Remove unnecessary code from FontPlatformData::ctFont()
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (185217 => 185218)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-06-04 21:08:25 UTC (rev 185217)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-06-04 21:12:34 UTC (rev 185218)
@@ -771,7 +771,7 @@
return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
}
-static ContainerNode* findEnclosingOverflowScrollForDominantDirection(ContainerNode* node, float deltaX, float deltaY)
+static ContainerNode* findEnclosingOverflowScroll(ContainerNode* node)
{
// Find the first node with a valid scrollable area starting with the current
// node and traversing its parents (or shadow hosts).
@@ -783,10 +783,8 @@
return nullptr;
RenderBox* box = candidate->renderBox();
- if (box && box->canBeScrolledAndHasScrollableArea()) {
- if ((deltaY && box->hasScrollableOverflowY()) || (deltaX && box->hasScrollableOverflowX()))
- return candidate;
- }
+ if (box && box->canBeScrolledAndHasScrollableArea())
+ return candidate;
}
return nullptr;
@@ -918,7 +916,7 @@
scrollableContainer = wheelEventTarget;
scrollableArea = scrollViewForEventTarget(wheelEventTarget.get());
} else {
- scrollableContainer = findEnclosingOverflowScrollForDominantDirection(wheelEventTarget.get(), wheelEvent.deltaX(), wheelEvent.deltaY());
+ scrollableContainer = findEnclosingOverflowScroll(wheelEventTarget.get());
if (scrollableContainer)
scrollableArea = scrollableAreaForContainerNode(*scrollableContainer);
else {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
