Title: [153849] branches/safari-537-branch/Source/WebCore
- Revision
- 153849
- Author
- lforsch...@apple.com
- Date
- 2013-08-08 14:37:14 -0700 (Thu, 08 Aug 2013)
Log Message
Merged r153845. <rdar://problem/14688769>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153848 => 153849)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-08 21:33:37 UTC (rev 153848)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-08 21:37:14 UTC (rev 153849)
@@ -1,3 +1,20 @@
+2013-08-08 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r153845
+
+ 2013-08-08 Brent Fulgham <bfulg...@apple.com>
+
+ [Windows] Improper Caption Button Displayed to Users
+ https://bugs.webkit.org/show_bug.cgi?id=119593
+
+ Reviewed by Eric Carlson.
+
+ Remove the custom drawing code for the Windows port, and
+ have it render using the CSS/SVG markup like we do on OS X.
+
+ * rendering/RenderThemeWin.cpp: Remove drawing code.
+ * rendering/RenderThemeWin.h: Remove declaration.
+
2013-08-07 Lucas Forschler <lforsch...@apple.com>
Merge r153775
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.cpp (153848 => 153849)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-08 21:33:37 UTC (rev 153848)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.cpp 2013-08-08 21:37:14 UTC (rev 153849)
@@ -1138,11 +1138,6 @@
return RenderMediaControls::paintMediaControlsPart(MediaSliderThumb, o, paintInfo, r);
}
-bool RenderThemeWin::paintMediaToggleClosedCaptionsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
-{
- return RenderMediaControls::paintMediaControlsPart(MediaShowClosedCaptionsButton, o, paintInfo, r);
-}
-
bool RenderThemeWin::paintMediaControlsBackground(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
{
return RenderMediaControls::paintMediaControlsPart(MediaTimelineContainer, o, paintInfo, r);
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.h (153848 => 153849)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.h 2013-08-08 21:33:37 UTC (rev 153848)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderThemeWin.h 2013-08-08 21:37:14 UTC (rev 153849)
@@ -137,7 +137,6 @@
virtual bool paintMediaSeekForwardButton(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
- virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
