Title: [207260] branches/safari-602.2.14.0-branch/Source/WebKit/mac
- Revision
- 207260
- Author
- matthew_han...@apple.com
- Date
- 2016-10-12 16:02:21 -0700 (Wed, 12 Oct 2016)
Log Message
Merge r207246. rdar://problem/28732731
Modified Paths
Diff
Modified: branches/safari-602.2.14.0-branch/Source/WebKit/mac/Carbon/CarbonWindowFrame.m (207259 => 207260)
--- branches/safari-602.2.14.0-branch/Source/WebKit/mac/Carbon/CarbonWindowFrame.m 2016-10-12 23:02:19 UTC (rev 207259)
+++ branches/safari-602.2.14.0-branch/Source/WebKit/mac/Carbon/CarbonWindowFrame.m 2016-10-12 23:02:21 UTC (rev 207260)
@@ -282,6 +282,10 @@
- (void)_resetDragMargins {
}
+- (NSColor *)contentFill
+{
+ return [NSColor clearColor];
+}
@end // implementation NSCarbonWindowFrame
Modified: branches/safari-602.2.14.0-branch/Source/WebKit/mac/ChangeLog (207259 => 207260)
--- branches/safari-602.2.14.0-branch/Source/WebKit/mac/ChangeLog 2016-10-12 23:02:19 UTC (rev 207259)
+++ branches/safari-602.2.14.0-branch/Source/WebKit/mac/ChangeLog 2016-10-12 23:02:21 UTC (rev 207260)
@@ -1,3 +1,19 @@
+2016-10-12 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r207246. rdar://problem/28732731
+
+ 2016-10-12 Beth Dakin <bda...@apple.com>
+
+ Adobe Contribute CS 6.5 Trial crashes on launch
+ https://bugs.webkit.org/show_bug.cgi?id=163365
+ -and corresponding-
+ <rdar://problem/28732731>
+
+ Reviewed by Tim Horton.
+
+ * Carbon/CarbonWindowFrame.m:
+ (-[CarbonWindowFrame contentFill]):
+
2016-09-26 Babak Shafiei <bshaf...@apple.com>
Merge r206238. rdar://problem/28450514
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
