Title: [150202] tags/Safari-537.42/Source/WebKit/mac
Diff
Modified: tags/Safari-537.42/Source/WebKit/mac/ChangeLog (150201 => 150202)
--- tags/Safari-537.42/Source/WebKit/mac/ChangeLog 2013-05-16 19:19:25 UTC (rev 150201)
+++ tags/Safari-537.42/Source/WebKit/mac/ChangeLog 2013-05-16 19:33:28 UTC (rev 150202)
@@ -1,3 +1,19 @@
+2013-05-16 Lucas Forschler <[email protected]>
+
+ Merge r150180
+
+ 2013-05-16 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r150168.
+ http://trac.webkit.org/changeset/150168
+ https://bugs.webkit.org/show_bug.cgi?id=116214
+
+ broke the world on Mountain Lion (Requested by thorton on
+ #webkit).
+
+ * WebView/WebFrameView.mm:
+ (-[WebFrameView drawRect:]):
+
2013-05-15 Simon Fraser <[email protected]>
Avoid backing store for the WebFrameView's layer when the WebView is layer-backed
Modified: tags/Safari-537.42/Source/WebKit/mac/WebView/WebFrameView.mm (150201 => 150202)
--- tags/Safari-537.42/Source/WebKit/mac/WebView/WebFrameView.mm 2013-05-16 19:19:25 UTC (rev 150201)
+++ tags/Safari-537.42/Source/WebKit/mac/WebView/WebFrameView.mm 2013-05-16 19:33:28 UTC (rev 150202)
@@ -79,10 +79,6 @@
- (BOOL)_scrollTo:(const NSPoint *)newOrigin animate:(BOOL)animate; // need the boolean result from this method
@end
-@interface NSView (Details)
-- (void)setBackgroundColor:(NSColor *)color;
-@end
-
enum {
SpaceKey = 0x0020
};
@@ -462,7 +458,7 @@
- (void)drawRect:(NSRect)rect
{
- if (![self documentView]) {
+ if ([self documentView] == nil) {
// Need to paint ourselves if there's no documentView to do it instead.
if ([[self _webView] drawsBackground]) {
[[[self _webView] backgroundColor] set];
@@ -478,32 +474,6 @@
}
}
-- (BOOL)wantsUpdateLayer
-{
- return YES;
-}
-
-- (void)updateLayer
-{
- // Do what -drawRect: does but by setting a backgroundColor on the view. This avoids
- // backing store for this view when the WebView is layer-backed.
- if (![self documentView]) {
- if ([[self _webView] drawsBackground]) {
- [self setBackgroundColor:[[self _webView] backgroundColor]];
- return;
- }
- } else {
-#ifndef NDEBUG
- if ([[self _scrollView] drawsBackground]) {
- [self setBackgroundColor:[NSColor cyanColor]];
- return;
- }
-#endif
- }
-
- [self setBackgroundColor:[NSColor clearColor]];
-}
-
- (NSRect)visibleRect
{
// This method can be called beneath -[NSView dealloc] after we have cleared _private.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
