Title: [172066] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172066
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 13:52:24 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171905. <rdar://problem/17850323>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172065 => 172066)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 20:50:48 UTC (rev 172065)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 20:52:24 UTC (rev 172066)
@@ -1,5 +1,15 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171905
+
+ 2014-07-31 Timothy Horton <timothy_hor...@apple.com>
+
+ Build fix for platforms where we should have automaticallyAdjustsContentInsets but it isn't public yet
+
+ * platform/mac/ScrollViewMac.mm:
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171891
2014-07-31 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/mac/ScrollViewMac.mm (172065 => 172066)
--- branches/safari-600.1-branch/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-08-05 20:50:48 UTC (rev 172065)
+++ branches/safari-600.1-branch/Source/WebCore/platform/mac/ScrollViewMac.mm 2014-08-05 20:52:24 UTC (rev 172066)
@@ -36,6 +36,7 @@
@interface NSScrollView (Details)
- (NSEdgeInsets)contentInsets;
+@property BOOL automaticallyAdjustsContentInsets;
@end
@interface NSWindow (WebWindowDetails)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
