Title: [224040] trunk/Source/WebKitLegacy/mac
- Revision
- 224040
- Author
- [email protected]
- Date
- 2017-10-26 13:13:47 -0700 (Thu, 26 Oct 2017)
Log Message
Fix issues with WebView subframe painting
https://bugs.webkit.org/show_bug.cgi?id=178842
rdar://problem/34072253
Reviewed by Daniel Bates.
WebHTMLView overrides some NSView internal methods to make sure that AppKit doesn't paint
subframes (WebKit controls subframe painting). The method signature of one of these changed in macOS
High Sierra, so match the new signature.
Also rename the 'rect' param to 'displayRect' to match AppKit code.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:shouldChangeFontReferenceColor:_recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):
(-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:shouldChangeFontReferenceColor:_recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (224039 => 224040)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-26 19:33:03 UTC (rev 224039)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-10-26 20:13:47 UTC (rev 224040)
@@ -1,3 +1,21 @@
+2017-10-26 Simon Fraser <[email protected]>
+
+ Fix issues with WebView subframe painting
+ https://bugs.webkit.org/show_bug.cgi?id=178842
+ rdar://problem/34072253
+
+ Reviewed by Daniel Bates.
+
+ WebHTMLView overrides some NSView internal methods to make sure that AppKit doesn't paint
+ subframes (WebKit controls subframe painting). The method signature of one of these changed in macOS
+ High Sierra, so match the new signature.
+
+ Also rename the 'rect' param to 'displayRect' to match AppKit code.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:shouldChangeFontReferenceColor:_recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):
+ (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:shouldChangeFontReferenceColor:_recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]): Deleted.
+
2017-10-25 Youenn Fablet <[email protected]>
Enable ServiceWorker to fetch resources
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (224039 => 224040)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-10-26 19:33:03 UTC (rev 224039)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2017-10-26 20:13:47 UTC (rev 224040)
@@ -713,7 +713,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 CGContext:(CGContextRef)ctx shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor;
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext 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;
@@ -1702,7 +1702,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 CGContext:(CGContextRef)ctx shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
#else
- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
#endif
@@ -1715,7 +1715,7 @@
}
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:ctx shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
+ [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext 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
