From 5c32f23e365ccfc0588951b32bad5d52d4dfbb76 Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Wed, 26 Oct 2011 21:41:01 +0000 Subject: [PATCH] REGRESSION (r97032): Slider thumb is not drawn https://bugs.webkit.org/show_bug.cgi?id=70891 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@98520 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 14 ++++++++++++++ Source/WebCore/platform/mac/ThemeMac.mm | 3 ++- Source/WebCore/rendering/RenderThemeMac.mm | 15 +-------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index b7f5b42a7985..42c302cf02b1 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,17 @@ +2011-10-26 Dan Bernstein + + 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 Add AudioSourceProviderClient and setFormat() method so we can know audio stream format diff --git a/Source/WebCore/platform/mac/ThemeMac.mm b/Source/WebCore/platform/mac/ThemeMac.mm index 480354df91a8..e765d260920e 100644 --- a/Source/WebCore/platform/mac/ThemeMac.mm +++ b/Source/WebCore/platform/mac/ThemeMac.mm @@ -557,7 +557,8 @@ NSView *ThemeMac::ensuredView(ScrollView* scrollView) // Use a fake flipped view. static NSView *flippedView = [[WebCoreFlippedView alloc] init]; - + [flippedView setFrameSize:scrollView->contentsSize()]; + return flippedView; } diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm index 445f02d3b273..6999a3a10b67 100644 --- a/Source/WebCore/rendering/RenderThemeMac.mm +++ b/Source/WebCore/rendering/RenderThemeMac.mm @@ -1394,20 +1394,7 @@ bool RenderThemeMac::paintSliderThumb(RenderObject* o, const PaintInfo& paintInf paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel)); paintInfo.context->translate(-unzoomedRect.x(), -unzoomedRect.y()); } - -#if PLATFORM(MAC) - // Workaround for . - 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]; -- 2.36.0