Changeset 190623 in webkit

Timestamp:

Oct 6, 2015 10:28:02 AM (9 years ago)

Author:

Wenson Hsieh

Message:

Slider knobs should scale when rendering while zoomed
​https://bugs.webkit.org/show_bug.cgi?id=149835
<rdar://problem/22897080>

Reviewed by Darin Adler.

Make slider knobs follow suit with the rest of the unscaled form controls
by rendering to an offscreen buffer when the page is zoomed or scaled and
then rendering a scaled version of the offscreen buffer onto the page.

• platform/mac/ThemeMac.mm:

(WebCore::drawCellOrFocusRingIntoRectWithView): Helper function for drawing

cells and/or focus rings.

(WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext): Refactored to

handle drawing slider knobs as well.

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintSliderThumb): Use scaled rendering when necessary.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/ThemeMac.mm (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-05  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Slider knobs should scale when rendering while zoomed
+        https://bugs.webkit.org/show_bug.cgi?id=149835
+        <rdar://problem/22897080>
+
+        Reviewed by Darin Adler.
+
+        Make slider knobs follow suit with the rest of the unscaled form controls
+        by rendering to an offscreen buffer when the page is zoomed or scaled and
+        then rendering a scaled version of the offscreen buffer onto the page.
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::drawCellOrFocusRingIntoRectWithView): Helper function for drawing
+            cells and/or focus rings.
+        (WebCore::ThemeMac::drawCellOrFocusRingWithViewIntoContext): Refactored to
+            handle drawing slider knobs as well.
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSliderThumb): Use scaled rendering when necessary.
+
 2015-10-06  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mac/ThemeMac.mm

@@ -665 +665 @@
 const float buttonFocusRectOutlineWidth = 3.0f;
 
-bool ThemeMac::drawCellOrFocusRingWithViewIntoContext(NSCell* cell, GraphicsContext& context, const FloatRect& inflatedRect, NSView* view, bool drawButtonCell, bool drawFocusRing, bool useImageBuffer, float deviceScaleFactor)
+static inline bool drawCellOrFocusRingIntoRectWithView(NSCell *cell, NSRect rect, NSView *view, bool drawButtonCell, bool drawFocusRing)
+{
+    if (drawButtonCell) {
+        if ([cell isKindOfClass:[NSSliderCell class]]) {
+            // For slider cells, draw only the knob.
+            [(NSSliderCell *)cell drawKnob:rect];
+        } else
+            [cell drawWithFrame:rect inView:view];
+    }
+    if (drawFocusRing)
+        return drawCellFocusRing(cell, rect, view);
+
+    return false;
+}
+
+bool ThemeMac::drawCellOrFocusRingWithViewIntoContext(NSCell *cell, GraphicsContext& context, const FloatRect& rect, NSView *view, bool drawButtonCell, bool drawFocusRing, bool useImageBuffer, float deviceScaleFactor)
 {
     ASSERT(drawButtonCell || drawFocusRing);
     bool needsRepaint = false;
     if (useImageBuffer) {
-        NSRect imageBufferDrawRect = NSRect(FloatRect(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth, inflatedRect.width(), inflatedRect.height()));
-        std::unique_ptr<ImageBuffer> imageBuffer = ImageBuffer::createCompatibleBuffer(inflatedRect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, ColorSpaceSRGB, context, false);
+        NSRect imageBufferDrawRect = NSRect(FloatRect(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth, rect.width(), rect.height()));
+        auto imageBuffer = ImageBuffer::createCompatibleBuffer(rect.size() + 2 * FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth), deviceScaleFactor, ColorSpaceSRGB, context, false);
         {
             LocalCurrentGraphicsContext localContext(imageBuffer->context());
-            if (drawButtonCell)
-                [cell drawWithFrame:imageBufferDrawRect inView:view];
-            
-            if (drawFocusRing)
-                needsRepaint = drawCellFocusRing(cell, imageBufferDrawRect, view);
-        }
-        context.drawImageBuffer(imageBuffer.get(), ColorSpaceSRGB, inflatedRect.location() - FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth));
+            needsRepaint = drawCellOrFocusRingIntoRectWithView(cell, imageBufferDrawRect, view, drawButtonCell, drawFocusRing);
+        }
+        context.drawImageBuffer(imageBuffer.get(), ColorSpaceSRGB, rect.location() - FloatSize(buttonFocusRectOutlineWidth, buttonFocusRectOutlineWidth));
         return needsRepaint;
     }
     if (drawButtonCell)
-        [cell drawWithFrame:NSRect(inflatedRect) inView:view];
-    
-    if (drawFocusRing)
-        needsRepaint = drawCellFocusRing(cell, NSRect(inflatedRect), view);
+        needsRepaint = drawCellOrFocusRingIntoRectWithView(cell, NSRect(rect), view, drawButtonCell, drawFocusRing);
     
     return needsRepaint;

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1582 +1582 @@
     }
 
-    [sliderThumbCell drawKnob:unzoomedRect];
+    bool shouldDrawCell = true;
+    bool shouldDrawFocusRing = false;
+    float deviceScaleFactor = o.document().page()->deviceScaleFactor();
+    bool shouldUseImageBuffer = deviceScaleFactor != 1 || zoomLevel != 1;
+    ThemeMac::drawCellOrFocusRingWithViewIntoContext(sliderThumbCell, paintInfo.context(), unzoomedRect, view, shouldDrawCell, shouldDrawFocusRing, shouldUseImageBuffer, deviceScaleFactor);
     [sliderThumbCell setControlView:nil];