Changeset 150194 in webkit

Timestamp:

May 16, 2013 11:40:16 AM (11 years ago)

Author:

Simon Fraser

Message:

Re-land r150168 with some OS version guards.

• WebView/WebFrameView.mm:

(-[WebFrameView drawRect:]):
(-[WebFrameView wantsUpdateLayer]):
(-[WebFrameView updateLayer]):

Location:

trunk/Source/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebFrameView.mm (modified) (3 diffs)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-05-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Re-land r150168 with some OS version guards.
+
+        * WebView/WebFrameView.mm:
+        (-[WebFrameView drawRect:]):
+        (-[WebFrameView wantsUpdateLayer]):
+        (-[WebFrameView updateLayer]):
+
 2013-05-16  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebFrameView.mm

@@ -80 +80 @@
 @end
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+@interface NSView (Details)
+- (void)setBackgroundColor:(NSColor *)color;
+@end
+#endif
+
 enum {
     SpaceKey = 0x0020
@@ -459 +465 @@
 - (void)drawRect:(NSRect)rect
 {
-    if ([self documentView] == nil) {
+    if (![self documentView]) {
         // Need to paint ourselves if there's no documentView to do it instead.
         if ([[self _webView] drawsBackground]) {
@@ -474 +480 @@
     }
 }
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+- (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]];
+}
+#endif
 
 - (NSRect)visibleRect