Title: [124525] branches/safari-536.26-branch/Source/WebCore
- Revision
- 124525
- Author
- [email protected]
- Date
- 2012-08-02 16:12:31 -0700 (Thu, 02 Aug 2012)
Log Message
Merged r120554. <rdar://problem/11968310>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/WebCore/ChangeLog (124524 => 124525)
--- branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-02 23:09:32 UTC (rev 124524)
+++ branches/safari-536.26-branch/Source/WebCore/ChangeLog 2012-08-02 23:12:31 UTC (rev 124525)
@@ -1,5 +1,20 @@
2012-08-02 Lucas Forschler <[email protected]>
+ Merge 120554
+
+ 2012-06-15 Darin Adler <[email protected]>
+
+ REGRESSION (r111041): Missing element type check in RenderThemeMac::paintMediaFullscreenButton
+ https://bugs.webkit.org/show_bug.cgi?id=89270
+
+ Reviewed by Oliver Hunt.
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMediaFullscreenButton): Use the proper idiom for getting
+ a media control element's type.
+
+2012-08-02 Lucas Forschler <[email protected]>
+
Merge 119914
2012-06-09 Florin Malita <[email protected]>
Modified: branches/safari-536.26-branch/Source/WebCore/rendering/RenderThemeMac.mm (124524 => 124525)
--- branches/safari-536.26-branch/Source/WebCore/rendering/RenderThemeMac.mm 2012-08-02 23:09:32 UTC (rev 124524)
+++ branches/safari-536.26-branch/Source/WebCore/rendering/RenderThemeMac.mm 2012-08-02 23:12:31 UTC (rev 124525)
@@ -1833,9 +1833,9 @@
if (!node)
return false;
- if (MediaControlFullscreenButtonElement* btn = static_cast<MediaControlFullscreenButtonElement*>(o->node())) {
+ if (node->isMediaControlElement()) {
LocalCurrentGraphicsContext localContext(paintInfo.context);
- wkDrawMediaUIPart(btn->displayType(), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
+ wkDrawMediaUIPart(mediaControlElementType(node), mediaControllerTheme(), localContext.cgContext(), r, getMediaUIPartStateFlags(node));
}
return false;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes