Changeset 102195 in webkit

Timestamp:

Dec 6, 2011, 5:03:17 PM (15 years ago)

Author:

Lucas Forschler

Message:

Merged r95697.

Location:

branches/safari-534.53-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/DeleteButtonController.cpp (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)
• page/Page.h (modified) (2 diffs)
• rendering/RenderBoxModelObject.cpp (modified) (2 diffs)
• rendering/RenderImage.cpp (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (1 diff)

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

@@ +1 @@
+2011-12-06  Lucas Forschler  <lforschler@apple.com>
+
+    Merge 95697
+
+    2011-09-21  Beth Dakin  <bdakin@apple.com>
+
+            https://bugs.webkit.org/show_bug.cgi?id=67415
+            Text drawn via -webkit-background-clip:text is blurry at device scale factors >1.0
+            -and corresponding-
+            <rdar://problem/10060379>
+
+            Reviewed by Darin Adler.
+
+            New helper function RenderBoxModelObject scales the mask image by the 
+            deviceScaleFactor to get an image of the appropriate resolution. It also scales 
+            the image's GraphicsContext so that the clip is set up on the same scale. Back in 
+            paintFillLayerExtended() we still clip the image to the original maskRect to get 
+            everything scaled back to the appropriate size.
+            * rendering/RenderBoxModelObject.cpp:
+            (WebCore::createDeviceScaledImageBuffer):
+            (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+
+            Make the deviceScaleFactor convenience function just a namespace-level function in 
+            Page rather than a static member or Page.
+            * page/Page.cpp:
+            (WebCore::deviceScaleFactor):
+            * page/Page.h:
+
+            Pre-existing callers of Page::deviceScaleFactor(Frame*) must now use 
+            WebCore::deviceScaleFactor(Frame*)
+            * editing/DeleteButtonController.cpp:
+            (WebCore::DeleteButtonController::createDeletionUI):
+            * rendering/RenderImage.cpp:
+            (WebCore::RenderImage::imageSizeForError):
+            (WebCore::RenderImage::paintReplaced):
+            * rendering/RenderLayer.cpp:
+            (WebCore::RenderLayer::drawPlatformResizerImage):
+
 2011-12-06  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-534.53-branch/Source/WebCore/editing/DeleteButtonController.cpp

@@ -256 +256 @@
     style->setProperty(CSSPropertyVisibility, CSSValueVisible);
 
-    float deviceScaleFactor = Page::deviceScaleFactor(m_frame);
+    float deviceScaleFactor = WebCore::deviceScaleFactor(m_frame);
     RefPtr<Image> buttonImage;
     if (deviceScaleFactor >= 2)

branches/safari-534.53-branch/Source/WebCore/page/Page.cpp

@@ -114 +114 @@
 }
 
+float deviceScaleFactor(Frame* frame)
+{
+    if (!frame)
+        return 1;
+    Page* page = frame->page();
+    if (!page)
+        return 1;
+    return page->deviceScaleFactor();
+}
+
 Page::Page(PageClients& pageClients)
     : m_chrome(adoptPtr(new Chrome(this, pageClients.chromeClient)))
@@ -614 +624 @@
 }
 
-float Page::deviceScaleFactor(Frame* frame)
-{
-    if (!frame)
-        return 1;
-    Page* page = frame->page();
-    if (!page)
-        return 1;
-    return page->deviceScaleFactor();
-}
-
 void Page::didMoveOnscreen()
 {

branches/safari-534.53-branch/Source/WebCore/page/Page.h

@@ -96 +96 @@
     enum FindDirection { FindDirectionForward, FindDirectionBackward };
 
+    float deviceScaleFactor(Frame*);
+
     class Page {
         WTF_MAKE_NONCOPYABLE(Page);
@@ -246 +248 @@
         float deviceScaleFactor() const { return m_deviceScaleFactor; }
         void setDeviceScaleFactor(float);
-        static float deviceScaleFactor(Frame*);
 
         // Notifications when the Page starts and stops being presented via a native window.

branches/safari-534.53-branch/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -586 +586 @@
     return adjustedRect;
 }
+    
+static PassOwnPtr<ImageBuffer> createDeviceScaledImageBuffer(IntSize imageSize, float deviceScaleFactor)
+{
+    // To create an image of the appropriate resolution, we need to scale imageRect's size
+    // by the device scale factor.
+    IntSize scaledImageSize = imageSize;
+    scaledImageSize.scale(deviceScaleFactor);
+
+    OwnPtr<ImageBuffer> scaledImageBuffer = ImageBuffer::create(scaledImageSize);
+    if (!scaledImageBuffer)
+        return nullptr;
+
+    // Scale the whole context by the device scale factor so that all of the clips set up at 
+    // the appropriate size.
+    scaledImageBuffer->context()->scale(FloatSize(deviceScaleFactor, deviceScaleFactor));
+    
+    return scaledImageBuffer.release();
+}
 
 void RenderBoxModelObject::paintFillLayerExtended(const PaintInfo& paintInfo, const Color& color, const FillLayer* bgLayer, const IntRect& rect,
@@ -680 +698 @@
         
         // Now create the mask.
-        OwnPtr<ImageBuffer> maskImage = ImageBuffer::create(maskRect.size());
+        OwnPtr<ImageBuffer> maskImage = createDeviceScaledImageBuffer(maskRect.size(), WebCore::deviceScaleFactor(frame()));        
         if (!maskImage)
             return;

branches/safari-534.53-branch/Source/WebCore/rendering/RenderImage.cpp

@@ -88 +88 @@
     IntSize imageSize;
     if (newImage->willPaintBrokenImage()) {
-        float deviceScaleFactor = Page::deviceScaleFactor(frame());
+        float deviceScaleFactor = WebCore::deviceScaleFactor(frame());
         pair<Image*, float> brokenImageAndImageScaleFactor = newImage->brokenImage(deviceScaleFactor);
         imageSize = brokenImageAndImageScaleFactor.first->size();
@@ -275 +275 @@
 
             if (m_imageResource->errorOccurred() && !image->isNull() && usableWidth >= image->width() && usableHeight >= image->height()) {
-                float deviceScaleFactor = Page::deviceScaleFactor(frame());
+                float deviceScaleFactor = WebCore::deviceScaleFactor(frame());
                 // Call brokenImage() explicitly to ensure we get the broken image icon at the appropriate resolution.
                 pair<Image*, float> brokenImageAndImageScaleFactor = m_imageResource->cachedImage()->brokenImage(deviceScaleFactor);

branches/safari-534.53-branch/Source/WebCore/rendering/RenderLayer.cpp

@@ -2366 +2366 @@
 void RenderLayer::drawPlatformResizerImage(GraphicsContext* context, IntRect resizerCornerRect)
 {
-    float deviceScaleFactor = Page::deviceScaleFactor(renderer()->frame());
+    float deviceScaleFactor = WebCore::deviceScaleFactor(renderer()->frame());
 
     RefPtr<Image> resizeCornerImage;