Title: [131505] trunk/Source/WebCore
- Revision
- 131505
- Author
- scher...@chromium.org
- Date
- 2012-10-16 14:42:31 -0700 (Tue, 16 Oct 2012)
Log Message
Fix crash in WebCore::MediaControlPanelElement::makeTransparent()
https://bugs.webkit.org/show_bug.cgi?id=97951
Reviewed by Simon Fraser.
No new tests as it's a speculative fix based on crash dump analysis.
Despite MediaControlPanelElement checking for document()->page() nullity in other places, it forgot one check in makeTransparent().
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::makeTransparent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131504 => 131505)
--- trunk/Source/WebCore/ChangeLog 2012-10-16 21:37:48 UTC (rev 131504)
+++ trunk/Source/WebCore/ChangeLog 2012-10-16 21:42:31 UTC (rev 131505)
@@ -1,3 +1,17 @@
+2012-10-16 Andrew Scherkus <scher...@chromium.org>
+
+ Fix crash in WebCore::MediaControlPanelElement::makeTransparent()
+ https://bugs.webkit.org/show_bug.cgi?id=97951
+
+ Reviewed by Simon Fraser.
+
+ No new tests as it's a speculative fix based on crash dump analysis.
+
+ Despite MediaControlPanelElement checking for document()->page() nullity in other places, it forgot one check in makeTransparent().
+
+ * html/shadow/MediaControlElements.cpp:
+ (WebCore::MediaControlPanelElement::makeTransparent):
+
2012-10-16 Emil A Eklund <e...@chromium.org>
Remove special-case flooring of baselinePosition for replaced elements in InlineFlowBox::placeBoxesInBlockDirection
Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (131504 => 131505)
--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-10-16 21:37:48 UTC (rev 131504)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp 2012-10-16 21:42:31 UTC (rev 131505)
@@ -261,8 +261,10 @@
if (!m_opaque)
return;
+ double duration = document()->page() ? document()->page()->theme()->mediaControlsFadeOutDuration() : 0;
+
setInlineStyleProperty(CSSPropertyWebkitTransitionProperty, CSSPropertyOpacity);
- setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, document()->page()->theme()->mediaControlsFadeOutDuration(), CSSPrimitiveValue::CSS_S);
+ setInlineStyleProperty(CSSPropertyWebkitTransitionDuration, duration, CSSPrimitiveValue::CSS_S);
setInlineStyleProperty(CSSPropertyOpacity, 0.0, CSSPrimitiveValue::CSS_NUMBER);
m_opaque = false;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
