Title: [153395] branches/safari-537-branch/Source/WebKit/mac
- Revision
- 153395
- Author
- [email protected]
- Date
- 2013-07-26 17:24:08 -0700 (Fri, 26 Jul 2013)
Log Message
Merged r153379. <rdar://problem/14554723>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit/mac/ChangeLog (153394 => 153395)
--- branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-07-27 00:22:23 UTC (rev 153394)
+++ branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-07-27 00:24:08 UTC (rev 153395)
@@ -1,3 +1,19 @@
+2013-07-26 Lucas Forschler <[email protected]>
+
+ Merge r153379
+
+ 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-22 Lucas Forschler <[email protected]>
Rollout r152701
Modified: branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (153394 => 153395)
--- branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-07-27 00:22:23 UTC (rev 153394)
+++ branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-07-27 00:24:08 UTC (rev 153395)
@@ -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
