Title: [172082] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172082
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:33:24 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171952. <rdar://problem/17850323>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172081 => 172082)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:31:37 UTC (rev 172081)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:33:24 UTC (rev 172082)
@@ -1,5 +1,23 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171952
+
+ 2014-08-01 Beth Dakin <bda...@apple.com>
+
+ Inspector highlights clipped at the bottom on the page in WK1 views with
+ contentInsets
+ https://bugs.webkit.org/show_bug.cgi?id=135480
+ -and corresponding-
+ <rdar://problem/17850323>
+
+ Forgot to commit this one very critical part with
+ http://trac.webkit.org/changeset/171951
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::unscaledVisibleContentSizeIncludingObscuredArea):
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171951
2014-08-01 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/ScrollView.cpp (172081 => 172082)
--- branches/safari-600.1-branch/Source/WebCore/platform/ScrollView.cpp 2014-08-05 21:31:37 UTC (rev 172081)
+++ branches/safari-600.1-branch/Source/WebCore/platform/ScrollView.cpp 2014-08-05 21:33:24 UTC (rev 172082)
@@ -269,7 +269,7 @@
IntSize ScrollView::unscaledVisibleContentSizeIncludingObscuredArea(VisibleContentRectIncludesScrollbars scrollbarInclusion) const
{
if (platformWidget())
- return platformVisibleContentSize(scrollbarInclusion == IncludeScrollbars);
+ return platformVisibleContentSizeIncludingObscuredArea(scrollbarInclusion == IncludeScrollbars);
#if USE(TILED_BACKING_STORE)
if (!m_fixedVisibleContentRect.isEmpty())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
