Attachment 340217 Details for Bug 185561 – Patch

[patch] Patch

bug-185561-20180511133159.patch (text/plain), 5.01 KB, created by Timothy Hatcher on 2018-05-11 13:32:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Hatcher

Created: 2018-05-11 13:32:00 PDT

Size: 5.01 KB

patch

obsolete

>Subversion Revision: 231589
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 4483a51d790859d02ca834f7c239bd5814adcfd3..1cc4b8fb3c9e1176baaeaeb87319be7d26a8df24 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-11  Timothy Hatcher  <timothy@apple.com>
>+
>+        WebHTMLView is not setting aside subviews when drawing.
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=185561
>+        rdar://problem/40172894
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use the new method signature for _recursive:displayRectIgnoringOpacity:shouldChangeFontReferenceColor:.
>+
>+        * WebView/WebHTMLView.mm:
>+        (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:shouldChangeFontReferenceColor:stopAtLayerBackedViews:]): Added.
>+
> 2018-05-07  Daniel Bates  <dabates@apple.com>
> 
>         Substitute CrossOriginPreflightResultCache::clear() for CrossOriginPreflightResultCache::empty()
>diff --git a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>index 41b7bc7a5ce5777d61eda6c093a502fe0cdc0f9e..5975322ba3c4259b7472e5fddbf1ddce5d2ee95c 100644
>--- a/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>+++ b/Source/WebKitLegacy/mac/WebView/WebHTMLView.mm
>@@ -715,7 +715,9 @@ @interface NSView ()
> - (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,14 +1668,18 @@ - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSR
> }
> 
> // 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
> #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 @@ - (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect
>     [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 @@ - (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect
>         [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 @@ - (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect
>     if (didSetAsideSubviews)
>         [self _restoreSubviews];
> }
>+#endif
> 
> static BOOL isQuickLookEvent(NSEvent *event)
> {

Actions: View | Formatted Diff | Diff

Attachments on bug 185561: 340217