Title: [176856] trunk/Source/WebKit/mac
- Revision
- 176856
- Author
- [email protected]
- Date
- 2014-12-05 11:28:43 -0800 (Fri, 05 Dec 2014)
Log Message
Legacy WebKit should set deviceScaleFactor in _commonInitializationWithFrameName, not _initWithFrame
https://bugs.webkit.org/show_bug.cgi?id=139306
<rdar://problem/19157955>
Reviewed by Beth Dakin.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView _initWithFrame:frameName:groupName:]):
Move setDeviceScaleFactor to the initialization path that is guaranteed to happen.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (176855 => 176856)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-05 19:21:26 UTC (rev 176855)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-05 19:28:43 UTC (rev 176856)
@@ -1,3 +1,16 @@
+2014-12-05 Tim Horton <[email protected]>
+
+ Legacy WebKit should set deviceScaleFactor in _commonInitializationWithFrameName, not _initWithFrame
+ https://bugs.webkit.org/show_bug.cgi?id=139306
+ <rdar://problem/19157955>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView _initWithFrame:frameName:groupName:]):
+ Move setDeviceScaleFactor to the initialization path that is guaranteed to happen.
+
2014-12-05 David Kilzer <[email protected]>
FeatureDefines.xcconfig: Workaround bug in Xcode 5.1.1 when defining ENABLE_WEB_REPLAY
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176855 => 176856)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-05 19:21:26 UTC (rev 176855)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-05 19:28:43 UTC (rev 176856)
@@ -1058,9 +1058,11 @@
SecurityPolicy::setLocalLoadPolicy(SecurityPolicy::AllowLocalLoadsForLocalAndSubstituteData);
}
-#if !PLATFORM(IOS)
+#if PLATFORM(MAC)
if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_CONTENT_SNIFFING_FOR_FILE_URLS))
ResourceHandle::forceContentSniffing();
+
+ _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
#endif
#if USE(GLIB)
@@ -1089,9 +1091,6 @@
_private = [[WebViewPrivate alloc] init];
[self _commonInitializationWithFrameName:frameName groupName:groupName];
[self setMaintainsBackForwardList: YES];
-#if !PLATFORM(IOS)
- _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
-#endif
return self;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
