Title: [154190] branches/safari-537-branch/Source/WebKit/mac
- Revision
- 154190
- Author
- [email protected]
- Date
- 2013-08-16 10:48:42 -0700 (Fri, 16 Aug 2013)
Log Message
Merged r154114. <rdar://problem/14698870>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit/mac/ChangeLog (154189 => 154190)
--- branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-08-16 17:47:22 UTC (rev 154189)
+++ branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-08-16 17:48:42 UTC (rev 154190)
@@ -1,3 +1,19 @@
+2013-08-16 Lucas Forschler <[email protected]>
+
+ Merge r154114
+
+ 2013-08-15 Anders Carlsson <[email protected]>
+
+ <https://webkit.org/b/119854> REGRESSION (r153379): Serious drawing issues with WebViews
+ <rdar://problem/14698870>
+
+ Reviewed by Simon Fraser.
+
+ Don't set aside subviews if they have already been set aside.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _recursive:displayRectIgnoringOpacity:inGraphicsContext:CGContext:topView:shouldChangeFontReferenceColor:]):
+
2013-08-07 Lucas Forschler <[email protected]>
Merge r153775
Modified: branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm (154189 => 154190)
--- branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-08-16 17:47:22 UTC (rev 154189)
+++ branches/safari-537-branch/Source/WebKit/mac/WebView/WebHTMLView.mm 2013-08-16 17:48:42 UTC (rev 154190)
@@ -1366,9 +1366,17 @@
// 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];
+ BOOL didSetAsideSubviews = NO;
+
+ if (!_private->subviewsSetAside) {
+ [self _setAsideSubviews];
+ didSetAsideSubviews = YES;
+ }
+
[super _recursive:recurseX displayRectIgnoringOpacity:displayRect inGraphicsContext:graphicsContext CGContext:ctx topView:isTopView shouldChangeFontReferenceColor:shouldChangeFontReferenceColor];
- [self _restoreSubviews];
+
+ if (didSetAsideSubviews)
+ [self _restoreSubviews];
}
- (BOOL)_insideAnotherHTMLView
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
