Changeset 98520 in webkit

Timestamp:

Oct 26, 2011, 2:41:01 PM (13 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/10350775> REGRESSION (r97032): Slider thumb is not drawn
​https://bugs.webkit.org/show_bug.cgi?id=70891

Reviewed by Anders Carlsson.

• platform/mac/ThemeMac.mm:

(WebCore::ThemeMac::ensuredView): Set the WebCoreFlippedView’s size, because NSSliderCell
always shrinks the slider thumb to fit in the control view’s bounds.

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::paintSliderThumb): Removed workaround code no longer needed after
r97032.

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 @@
+2011-10-26  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/10350775> REGRESSION (r97032): Slider thumb is not drawn
+        https://bugs.webkit.org/show_bug.cgi?id=70891
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac/ThemeMac.mm:
+        (WebCore::ThemeMac::ensuredView): Set the WebCoreFlippedView’s size, because NSSliderCell
+        always shrinks the slider thumb to fit in the control view’s bounds.
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintSliderThumb): Removed workaround code no longer needed after
+        r97032.
+
 2011-10-26  Chris Rogers  <crogers@google.com>
 

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

@@ -558 +558 @@
     // Use a fake flipped view.
     static NSView *flippedView = [[WebCoreFlippedView alloc] init];
-    
+    [flippedView setFrameSize:scrollView->contentsSize()];
+
     return flippedView;
 }

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -1395 +1395 @@
         paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y());
     }
-    
-#if PLATFORM(MAC)
-    // Workaround for <rdar://problem/9421781>.
-    if (!o->view()->frameView()->documentView()) {
-        paintInfo.context->translate(0, unzoomedRect.y());
-        paintInfo.context->scale(FloatSize(1, -1));
-        paintInfo.context->translate(0, -(unzoomedRect.y() + unzoomedRect.height()));
-    }
-#elif PLATFORM(CHROMIUM)
-    paintInfo.context->translate(0, unzoomedRect.y());
-    paintInfo.context->scale(FloatSize(1, -1));
-    paintInfo.context->translate(0, -(unzoomedRect.y() + unzoomedRect.height()));
-#endif
-    
+
     [sliderThumbCell drawInteriorWithFrame:unzoomedRect inView:documentViewFor(o)];
     [sliderThumbCell setControlView:nil];