Title: [231718] trunk/Source/WebKitLegacy/mac
- Revision
- 231718
- Author
- [email protected]
- Date
- 2018-05-11 13:59:54 -0700 (Fri, 11 May 2018)
Log Message
WebHTMLView is not setting aside subviews when drawing.
https://bugs.webkit.org/show_bug.cgi?id=185561
rdar://problem/40172894
Reviewed by Simon Fraser.
Use the new method signature for _recursive:displayRectIgnoringOpacity:shouldChangeFontReferenceColor:.
* WebView/WebHTMLView.mm:
(-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:shouldChangeFontReferenceColor:stopAtLayerBackedViews:]): Added.
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (231717 => 231718)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-11 20:39:30 UTC (rev 231717)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2018-05-11 20:59:54 UTC (rev 231718)
@@ -1,3 +1,17 @@
+2018-05-11 Timothy Hatcher <[email protected]>
+
+ WebHTMLView is not setting aside subviews when drawing.
+
+ https://bugs.webkit.org/show_bug.cgi?id=185561
+ rdar://problem/40172894
+
+ Reviewed by Simon Fraser.
+
+ Use the new method signature for _recursive:displayRectIgnoringOpacity:shouldChangeFontReferenceColor:.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:shouldChangeFontReferenceColor:stopAtLayerBackedViews:]): Added.
+
2018-05-07 Daniel Bates <[email protected]>
Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm (231717 => 231718)
--- trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-05-11 20:39:30 UTC (rev 231717)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm 2018-05-11 20:59:54 UTC (rev 231718)
@@ -715,7 +715,9 @@
- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
- (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
#if PLATFORM(MAC)
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+- (void)_recursive:(BOOL)recursive displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)graphicsContext shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor stopAtLayerBackedViews:(BOOL)stopAtLayerBackedViews;
+#elif __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;
#else
@@ -1666,7 +1668,9 @@
}
// Don't let AppKit even draw subviews. We take care of that.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+- (void)_recursive:(BOOL)recursive displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)graphicsContext shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor stopAtLayerBackedViews:(BOOL)stopAtLayerBackedViews
+#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
#else
- (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView
@@ -1673,7 +1677,9 @@
#endif
{
[self _setAsideSubviews];
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+ [super _recursive:recursive displayRectIgnoringOpacity:displayRect inContext:graphicsContext shouldChangeFontReferenceColor:shouldChangeFontReferenceColor stopAtLayerBackedViews:stopAtLayerBackedViews];
+#elif __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
[super _recursive:recurse displayRectIgnoringOpacity:displayRect inContext:context shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
#else
[super _recursive:recurse displayRectIgnoringOpacity:displayRect inContext:context topView:topView];
@@ -1681,6 +1687,7 @@
[self _restoreSubviews];
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101400
// 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
@@ -1694,7 +1701,7 @@
[self _setAsideSubviews];
didSetAsideSubviews = YES;
}
-
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
[super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
#else
@@ -1704,6 +1711,7 @@
if (didSetAsideSubviews)
[self _restoreSubviews];
}
+#endif
static BOOL isQuickLookEvent(NSEvent *event)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
