Title: [102617] branches/safari-534.53-branch/Source/WebKit/mac
- Revision
- 102617
- Author
- [email protected]
- Date
- 2011-12-12 13:41:51 -0800 (Mon, 12 Dec 2011)
Log Message
Merge 97407.
Modified Paths
Diff
Modified: branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog (102616 => 102617)
--- branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog 2011-12-12 21:41:34 UTC (rev 102616)
+++ branches/safari-534.53-branch/Source/WebKit/mac/ChangeLog 2011-12-12 21:41:51 UTC (rev 102617)
@@ -1,3 +1,21 @@
+2011-12-12 Lucas Forschler <[email protected]>
+
+ Merge 97407
+
+ 2011-10-13 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=70050
+ DRT and WRT should have HiDPI testing capabilities
+
+ Reviewed by Darin Adler.
+
+ New method _backingScaleFactor matches SPI of a similar name that I added
+ recently to WKPage in WebKit2. Equivalent functionality is needed for
+ DumpRenderTree's HiDPI support.
+ * WebView/WebView.mm:
+ (-[WebView _backingScaleFactor]):
+ * WebView/WebViewPrivate.h:
+
2011-12-07 Lucas Forschler <[email protected]>
Merge 99617
Modified: branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm (102616 => 102617)
--- branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm 2011-12-12 21:41:34 UTC (rev 102616)
+++ branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebView.mm 2011-12-12 21:41:51 UTC (rev 102617)
@@ -2837,6 +2837,11 @@
return view->fixedLayoutSize();
}
+- (CGFloat)_backingScaleFactor
+{
+ return [self _deviceScaleFactor];
+}
+
- (void)_setCustomBackingScaleFactor:(CGFloat)customScaleFactor
{
float oldScaleFactor = [self _deviceScaleFactor];
Modified: branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebViewPrivate.h (102616 => 102617)
--- branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-12-12 21:41:34 UTC (rev 102616)
+++ branches/safari-534.53-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2011-12-12 21:41:51 UTC (rev 102617)
@@ -561,6 +561,7 @@
- (NSSize)_fixedLayoutSize;
- (void)_setCustomBackingScaleFactor:(CGFloat)overrideScaleFactor;
+- (CGFloat)_backingScaleFactor;
// Deprecated. Use the methods in pending public above instead.
- (WebNSUInteger)markAllMatchesForText:(NSString *)string caseSensitive:(BOOL)caseFlag highlight:(BOOL)highlight limit:(WebNSUInteger)limit;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
