Title: [229634] branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac
- Revision
- 229634
- Author
- [email protected]
- Date
- 2018-03-15 12:07:43 -0700 (Thu, 15 Mar 2018)
Log Message
Revert r224040. rdar://problem/38299225
Modified Paths
Diff
Modified: branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/ChangeLog (229633 => 229634)
--- branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/ChangeLog 2018-03-15 18:56:42 UTC (rev 229633)
+++ branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/ChangeLog 2018-03-15 19:07:43 UTC (rev 229634)
@@ -1,3 +1,7 @@
+2018-03-13 Jason Marcell <[email protected]>
+
+ Revert r224040. rdar://problem/38299225
+
2018-02-19 Jason Marcell <[email protected]>
Cherry-pick r228580. rdar://problem/37675341
Modified: branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (229633 => 229634)
--- branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-03-15 18:56:42 UTC (rev 229633)
+++ branches/safari-605.1.33.1-branch/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-03-15 19:07:43 UTC (rev 229634)
@@ -719,7 +719,7 @@
#if PLATFORM(MAC)
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
-- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
#else
- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView;
- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
@@ -1685,7 +1685,7 @@
// Don't let AppKit even draw subviews. We take care of that.
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
-- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
#else
- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
#endif
@@ -1698,7 +1698,7 @@
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
+ [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:ctx shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
#else
[super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:ctx topView:isTopView shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
