Changeset 187329 in webkit

Timestamp:

Jul 24, 2015, 12:54:56 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187274. rdar://problem/21905756

Location:

branches/safari-601.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameSnapshotting.cpp (modified) (2 diffs)
• page/TextIndicator.cpp (modified) (1 diff)
• platform/graphics/ImageBuffer.h (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

branches/safari-601.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187274. rdar://problem/21905756
+
+    2015-07-23  Timothy Horton  <timothy_horton@apple.com>
+
+            [iOS] Frame snapshots don't factor in page scale
+            https://bugs.webkit.org/show_bug.cgi?id=147239
+            <rdar://problem/21905756>
+
+            Reviewed by Simon Fraser.
+
+            * page/FrameSnapshotting.cpp:
+            (WebCore::snapshotFrameRect):
+            Apply page scale when determining the backing store size and setting up the context.
+
+            * page/TextIndicator.cpp:
+            (WebCore::TextIndicator::createWithSelectionInFrame):
+            Don't assume snapshotFrameRect gave us an image with scale=deviceScale, because it
+            will factor in the pageScale too.
+
+            * platform/graphics/ImageBuffer.h:
+            (WebCore::ImageBuffer::resolutionScale):
+            Expose resolutionScale.
+
+            * rendering/RenderLayerCompositor.cpp:
+            (WebCore::RenderLayerCompositor::addToOverlapMap):
+            This has been true for a long time.
+
 2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601.1-branch/Source/WebCore/page/FrameSnapshotting.cpp

@@ -40 +40 @@
 #include "Page.h"
 #include "RenderObject.h"
+#include "Settings.h"
 
 namespace WebCore {
@@ -94 +95 @@
     frame.view()->setPaintBehavior(paintBehavior);
 
-    std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(imageRect.size(), frame.page()->deviceScaleFactor(), ColorSpaceDeviceRGB);
+    float scaleFactor = frame.page()->deviceScaleFactor();
+
+    if (frame.settings().delegatesPageScaling())
+        scaleFactor *= frame.page()->pageScaleFactor();
+
+    std::unique_ptr<ImageBuffer> buffer = ImageBuffer::create(imageRect.size(), scaleFactor, ColorSpaceDeviceRGB);
     if (!buffer)
         return nullptr;

branches/safari-601.1-branch/Source/WebCore/page/TextIndicator.cpp

@@ -164 +164 @@
     data.textBoundingRectInRootViewCoordinates = textBoundingRectInRootViewCoordinates;
     data.textRectsInBoundingRectCoordinates = textRectsInBoundingRectCoordinates;
-    data.contentImageScaleFactor = frame.page()->deviceScaleFactor();
+    data.contentImageScaleFactor = indicatorBuffer->resolutionScale();
     data.contentImage = indicatorBitmap;
     data.contentImageWithHighlight = indicatorBitmapWithHighlight;

branches/safari-601.1-branch/Source/WebCore/platform/graphics/ImageBuffer.h

@@ -93 +93 @@
     const IntSize& logicalSize() const { return m_logicalSize; }
 
+    float resolutionScale() const { return m_resolutionScale; }
+
     WEBCORE_EXPORT GraphicsContext* context() const;
 

branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1234 +1234 @@
 
     // On iOS, pageScaleFactor() is not applied by RenderView, so we should not scale here.
-    // FIXME: Set Settings::delegatesPageScaling to true for iOS.
-#if !PLATFORM(IOS)
     const Settings& settings = m_renderView.frameView().frame().settings();
     if (!settings.delegatesPageScaling())
         clipRect.scale(pageScaleFactor());
-#endif
     clipRect.intersect(extent.bounds);
     overlapMap.add(clipRect);