Title: [98520] trunk/Source/WebCore
- Revision
- 98520
- Author
- m...@apple.com
- Date
- 2011-10-26 14:41:01 -0700 (Wed, 26 Oct 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98519 => 98520)
--- trunk/Source/WebCore/ChangeLog 2011-10-26 21:33:04 UTC (rev 98519)
+++ trunk/Source/WebCore/ChangeLog 2011-10-26 21:41:01 UTC (rev 98520)
@@ -1,3 +1,17 @@
+2011-10-26 Dan Bernstein <m...@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 <crog...@google.com>
Add AudioSourceProviderClient and setFormat() method so we can know audio stream format
Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (98519 => 98520)
--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2011-10-26 21:33:04 UTC (rev 98519)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2011-10-26 21:41:01 UTC (rev 98520)
@@ -557,7 +557,8 @@
// Use a fake flipped view.
static NSView *flippedView = [[WebCoreFlippedView alloc] init];
-
+ [flippedView setFrameSize:scrollView->contentsSize()];
+
return flippedView;
}
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (98519 => 98520)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2011-10-26 21:33:04 UTC (rev 98519)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2011-10-26 21:41:01 UTC (rev 98520)
@@ -1394,20 +1394,7 @@
paintInfo.context->scale(FloatSize(zoomLevel, zoomLevel));
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];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
