Title: [153379] trunk/Source/WebKit/mac
Revision
153379
Author
[email protected]
Date
2013-07-26 13:39:57 -0700 (Fri, 26 Jul 2013)

Log Message

Add another method that we need to set aside subviews for
https://bugs.webkit.org/show_bug.cgi?id=119157
<rdar://problem/14554723>

Reviewed by Beth Dakin.

* WebView/WebHTMLView.mm:
(-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
(-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (153378 => 153379)


--- trunk/Source/WebKit/mac/ChangeLog	2013-07-26 20:09:25 UTC (rev 153378)
+++ trunk/Source/WebKit/mac/ChangeLog	2013-07-26 20:39:57 UTC (rev 153379)
@@ -1,3 +1,15 @@
+2013-07-26  Anders Carlsson  <[email protected]>
+
+        Add another method that we need to set aside subviews for
+        https://bugs.webkit.org/show_bug.cgi?id=119157
+        <rdar://problem/14554723>
+
+        Reviewed by Beth Dakin.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inContext:topView:]):
+        (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):
+
 2013-07-25  Andreas Kling  <[email protected]>
 
         ChromeClient::focusedNodeChanged() should be focusedElementChanged().

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (153378 => 153379)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2013-07-26 20:09:25 UTC (rev 153378)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2013-07-26 20:39:57 UTC (rev 153379)
@@ -282,6 +282,7 @@
 - (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
 - (void)_recursiveDisplayAllDirtyWithLockFocus:(BOOL)needsLockFocus visRect:(NSRect)visRect;
 - (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;
 - (NSRect)_dirtyRect;
 - (void)_setDrawsOwnDescendants:(BOOL)drawsOwnDescendants;
 - (BOOL)_drawnByAncestor;
@@ -1357,12 +1358,19 @@
 // Don't let AppKit even draw subviews. We take care of that.
 - (void)_recursive:(BOOL)recurse displayRectIgnoringOpacity:(NSRect)displayRect inContext:(NSGraphicsContext *)context topView:(BOOL)topView
 {
-
     [self _setAsideSubviews];
     [super _recursive:recurse displayRectIgnoringOpacity:displayRect inContext:context topView:topView];
     [self _restoreSubviews];
 }
 
+// Don't let AppKit even draw subviews. We take care of that.
+- (void)_recursive:(BOOL)recurseX displayRectIgnoringOpacity:(NSRect)displayRect inGraphicsContext:(NSGraphicsContext *)graphicsContext CGContext:(CGContextRef)ctx topView:(BOOL)isTopView shouldChangeFontReferenceColor:(BOOL)shouldChangeFontReferenceColor
+{
+    [self _setAsideSubviews];
+    [super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:ctx topView:isTopView shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
+    [self _restoreSubviews];
+}
+
 - (BOOL)_insideAnotherHTMLView
 {
     return self != [self _topHTMLView];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to