Title: [176897] trunk/Tools
- Revision
- 176897
- Author
- [email protected]
- Date
- 2014-12-05 17:09:52 -0800 (Fri, 05 Dec 2014)
Log Message
[iOS] Query -[WAKWindow screenScale] instead of using WKGetScreenScaleFactor()
https://bugs.webkit.org/show_bug.cgi?id=139326
Reviewed by Anders Carlsson.
Ask the window for its screen scale factor instead of calling WKGetScreenScaleFactor()
to query the OS for it. This approach will ensure DumpRenderTree takes the snapshot
using the same scale factor as used in WebKit.
* DumpRenderTree/ios/PixelDumpSupportIOS.mm:
(createBitmapContextFromWebView):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (176896 => 176897)
--- trunk/Tools/ChangeLog 2014-12-06 01:09:33 UTC (rev 176896)
+++ trunk/Tools/ChangeLog 2014-12-06 01:09:52 UTC (rev 176897)
@@ -1,3 +1,17 @@
+2014-12-05 Daniel Bates <[email protected]>
+
+ [iOS] Query -[WAKWindow screenScale] instead of using WKGetScreenScaleFactor()
+ https://bugs.webkit.org/show_bug.cgi?id=139326
+
+ Reviewed by Anders Carlsson.
+
+ Ask the window for its screen scale factor instead of calling WKGetScreenScaleFactor()
+ to query the OS for it. This approach will ensure DumpRenderTree takes the snapshot
+ using the same scale factor as used in WebKit.
+
+ * DumpRenderTree/ios/PixelDumpSupportIOS.mm:
+ (createBitmapContextFromWebView):
+
2014-12-05 Anders Carlsson <[email protected]>
REGRESSION (r176677): All tests crash on Windows
Modified: trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm (176896 => 176897)
--- trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-06 01:09:33 UTC (rev 176896)
+++ trunk/Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm 2014-12-06 01:09:52 UTC (rev 176897)
@@ -30,6 +30,7 @@
#import "PixelDumpSupport.h"
#import "DumpRenderTree.h"
+#import "DumpRenderTreeWindow.h"
#define COMMON_DIGEST_FOR_OPENSSL
#import <CommonCrypto/CommonDigest.h>
@@ -39,11 +40,11 @@
#import <UIKit/UIView_Private.h>
#import <UIKit/UIWebBrowserView.h>
#import <WebKit/WebCoreThread.h>
-#import <WebKitSystemInterface.h>
#import <wtf/RefCounted.h>
#import <wtf/RefPtr.h>
#import <wtf/RetainPtr.h>
+extern DumpRenderTreeWindow *gDrtWindow;
extern UIWebBrowserView *gWebBrowserView;
class BitmapContext : public RefCounted<BitmapContext> {
@@ -85,7 +86,7 @@
[gWebBrowserView layoutIfNeeded]; // Re-enables tile painting, which was disabled when committing the frame load.
[gWebBrowserView setNeedsDisplay];
- UIGraphicsBeginImageContextWithOptions([[mainFrame webView] frame].size, YES /* opaque */, WKGetScreenScaleFactor());
+ UIGraphicsBeginImageContextWithOptions([[mainFrame webView] frame].size, YES /* opaque */, [gDrtWindow screenScale]);
[[gWebBrowserView layer] renderInContext:UIGraphicsGetCurrentContext()];
RefPtr<BitmapContext> context = BitmapContext::createFromUIImage(UIGraphicsGetImageFromCurrentImageContext());
UIGraphicsEndImageContext();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
