Changeset 102198 in webkit

Timestamp:

Dec 6, 2011, 5:23:39 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r97191.

Location:

branches/safari-534.53-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)

branches/safari-534.53-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 97191
+
+    2011-10-11  Beth Dakin  <bdakin@apple.com>
+
+            https://bugs.webkit.org/show_bug.cgi?id=69874
+            WebKit2 snapshot APIs should take the device scale factor into account 
+            -and corresponding-
+            <rdar://problem/10269112>
+
+            Reviewed by Darin Adler.
+
+            Add the deviceScaleFactor as a scale on the snapshot's context to create a 
+            snapshot of the appropriate resolution. This matches the manner in which we scale 
+            the context in DrawingAreaImpl::display().
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::snapshotInViewCoordinates):
+            (WebKit::WebPage::scaledSnapshotInDocumentCoordinates):
+
 2011-12-06  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -871 +871 @@
         return 0;
 
-    RefPtr<WebImage> snapshot = WebImage::create(rect.size(), options);
+    IntSize bitmapSize = rect.size();
+    float deviceScaleFactor = corePage()->deviceScaleFactor();
+    bitmapSize.scale(deviceScaleFactor);
+
+    RefPtr<WebImage> snapshot = WebImage::create(bitmapSize, options);
     if (!snapshot->bitmap())
         return 0;
     
     OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
+    graphicsContext->scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
     graphicsContext->translate(-rect.x(), -rect.y());
 
@@ -894 +899 @@
         return 0;
 
-    IntSize size(ceil(rect.width() * scaleFactor), ceil(rect.height() * scaleFactor));
+    float combinedScaleFactor = scaleFactor * corePage()->deviceScaleFactor();
+    IntSize size(ceil(rect.width() * combinedScaleFactor), ceil(rect.height() * combinedScaleFactor));
     RefPtr<WebImage> snapshot = WebImage::create(size, options);
     if (!snapshot->bitmap())
@@ -900 +906 @@
 
     OwnPtr<WebCore::GraphicsContext> graphicsContext = snapshot->bitmap()->createGraphicsContext();
-    graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
+    graphicsContext->scale(FloatSize(combinedScaleFactor, combinedScaleFactor));
     graphicsContext->translate(-rect.x(), -rect.y());