Title: [188971] trunk
- Revision
- 188971
- Author
- timothy_hor...@apple.com
- Date
- 2015-08-26 11:18:14 -0700 (Wed, 26 Aug 2015)
Log Message
Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=148409
Reviewed by Beth Dakin.
* WebView/WebDynamicScrollBarsView.mm:
(-[WebDynamicScrollBarsView setContentInsets:]):
Explicitly force our NSScrollView to lay out after updating
content insets. We depend on this happening synchronously (specifically,
we need our frame/bounds change callbacks to fire), because the layout
which will happen subsequently needs up-to-date information in order to
correctly a) enable scrollbars and then b) update the scroll position.
* platform/mac/fast/events/resources/iframe-to-hit-test.html:
Adjust the test so that it logs something useful if it fails
instead of complaining about not being run in WKTR/DRT.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (188970 => 188971)
--- trunk/LayoutTests/ChangeLog 2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/LayoutTests/ChangeLog 2015-08-26 18:18:14 UTC (rev 188971)
@@ -1,3 +1,14 @@
+2015-08-26 Tim Horton <timothy_hor...@apple.com>
+
+ Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148409
+
+ Reviewed by Beth Dakin.
+
+ * platform/mac/fast/events/resources/iframe-to-hit-test.html:
+ Adjust the test so that it logs something useful if it fails
+ instead of complaining about not being run in WKTR/DRT.
+
2015-08-26 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r188960.
Modified: trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html (188970 => 188971)
--- trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html 2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/LayoutTests/platform/mac/fast/events/resources/iframe-to-hit-test.html 2015-08-26 18:18:14 UTC (rev 188971)
@@ -8,13 +8,24 @@
}
</style>
<script>
- function clicked() {
+ function clicked(e) {
var result = parent.document.getElementById("result");
result.innerHTML = "Pass!";
+ e.stopPropagation();
}
+
+ function bodyClicked() {
+ var result = parent.document.getElementById("result");
+ result.innerHTML = "Failed! Hit the body.";
+ }
+
+ window._onload_ = function () {
+ document.getElementById("target").addEventListener("click", clicked);
+ document.body.addEventListener("click", bodyClicked);
+ }
</script>
</head>
<body>
- <div id="target" _onclick_="clicked()"></div>
+ <div id="target"></div>
</body>
</html>
Modified: trunk/Source/WebKit/mac/ChangeLog (188970 => 188971)
--- trunk/Source/WebKit/mac/ChangeLog 2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-08-26 18:18:14 UTC (rev 188971)
@@ -1,3 +1,18 @@
+2015-08-26 Tim Horton <timothy_hor...@apple.com>
+
+ Layout Test platform/mac/fast/events/content-inset-hit-testing-in-frame.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148409
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebDynamicScrollBarsView.mm:
+ (-[WebDynamicScrollBarsView setContentInsets:]):
+ Explicitly force our NSScrollView to lay out after updating
+ content insets. We depend on this happening synchronously (specifically,
+ we need our frame/bounds change callbacks to fire), because the layout
+ which will happen subsequently needs up-to-date information in order to
+ correctly a) enable scrollbars and then b) update the scroll position.
+
2015-08-23 Andy Estes <aes...@apple.com>
[Content Filtering] REGRESSION (r182356): Provisional URL is incorrect in didReceiveServerRedirectForProvisionalLoadForFrame when Content Filtering is enabled
Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm (188970 => 188971)
--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-08-26 17:54:28 UTC (rev 188970)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm 2015-08-26 18:18:14 UTC (rev 188971)
@@ -624,4 +624,12 @@
return _private->inProgrammaticScroll;
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+- (void)setContentInsets:(NSEdgeInsets)edgeInsets
+{
+ [super setContentInsets:edgeInsets];
+ [self tile];
+}
+#endif
+
@end
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
