Changeset 115271 in webkit

Timestamp:

Apr 25, 2012 6:11:42 PM (12 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=84913
WebKit 1: Initialize deviceScaleFactor on creation of the WebView
-and corresponding-
<rdar://problem/11322716>

Reviewed by Darin Adler.

Before this patch, we weren't setting the deviceScaleFactor until
viewDidMoveToWindow which is quite late for background tabs. setHostWindow will
happen early on though. For applications that don't use host windows, also set it
from _initWithFrame.

• WebView/WebView.mm:

(-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]):
(-[WebView setHostWindow:]):
(-[WebView _deviceScaleFactor]):

Location:

trunk/Source/WebKit/mac

Files:

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

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-04-25  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=84913
+        WebKit 1: Initialize deviceScaleFactor on creation of the WebView
+        -and corresponding-
+        <rdar://problem/11322716>
+
+        Reviewed by Darin Adler.
+
+        Before this patch, we weren't setting the deviceScaleFactor until 
+        viewDidMoveToWindow which is quite late for background tabs. setHostWindow will 
+        happen early on though. For applications that don't use host windows, also set it 
+        from _initWithFrame.
+        * WebView/WebView.mm:
+        (-[WebView _initWithFrame:frameName:groupName:usesDocumentViews:]):
+        (-[WebView setHostWindow:]):
+        (-[WebView _deviceScaleFactor]):
+
 2012-04-24  Alexis Menard  <alexis.menard@openbossa.org>
 

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

@@ -847 +847 @@
     [self _commonInitializationWithFrameName:frameName groupName:groupName];
     [self setMaintainsBackForwardList: YES];
+    _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
     return self;
 }
@@ -3965 +3966 @@
     for (Frame* frame = coreFrame; frame; frame = frame->tree()->traverseNext(coreFrame))
         [[[kit(frame) frameView] documentView] viewDidMoveToHostWindow];
+    _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
 }
 
@@ -5665 +5667 @@
 
     NSWindow *window = [self window];
+    NSWindow *hostWindow = [self hostWindow];
 #if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
     if (window)
         return [window backingScaleFactor];
+    if (hostWindow)
+        return [hostWindow backingScaleFactor];
     return [[NSScreen mainScreen] backingScaleFactor];
 #else
     if (window)
         return [window userSpaceScaleFactor];
+    if (hostWindow)
+        return [hostWindow userSpaceScaleFactor];
     return [[NSScreen mainScreen] userSpaceScaleFactor];
 #endif