Diff
Modified: trunk/Source/WebCore/ChangeLog (151980 => 151981)
--- trunk/Source/WebCore/ChangeLog 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/ChangeLog 2013-06-26 07:44:01 UTC (rev 151981)
@@ -1,3 +1,32 @@
+2013-06-26 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLAudioElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117985
+
+ Reviewed by Jer Noble.
+
+ To enhance readibility, this patch adopts is/toHTMLAudioElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::isReachableFromDOM):
+ * css/CSSDefaultStyleSheets.cpp:
+ (WebCore::CSSDefaultStyleSheets::ensureDefaultStyleSheetsForElement):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::canShareStyleWithElement):
+ * html/HTMLAudioElement.h:
+ (WebCore::isHTMLAudioElement):
+ (WebCore::toHTMLAudioElement):
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::loadMediaPlayerProxyPlugin):
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::mediaElement):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForVideo):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMediaMuteButton):
+ (WebCore::RenderThemeMac::paintMediaPlayButton):
+
2013-06-26 Ryosuke Niwa <[email protected]>
Refactoring: Fold Document::focusedNodeRemoved into Document::removeFocusedNodeOfSubtree
Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp (151980 => 151981)
--- trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -110,8 +110,8 @@
return true;
}
#if ENABLE(VIDEO)
- else if (node->hasTagName(audioTag)) {
- if (!static_cast<HTMLAudioElement*>(node)->paused())
+ else if (isHTMLAudioElement(node)) {
+ if (!toHTMLAudioElement(node)->paused())
return true;
}
#endif
Modified: trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp (151980 => 151981)
--- trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/css/CSSDefaultStyleSheets.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -32,6 +32,7 @@
#include "Chrome.h"
#include "ChromeClient.h"
#include "HTMLAnchorElement.h"
+#include "HTMLAudioElement.h"
#include "MediaQueryEvaluator.h"
#include "Page.h"
#include "RenderTheme.h"
@@ -182,7 +183,7 @@
#endif
#if ENABLE(VIDEO)
- if (!mediaControlsStyleSheet && (element->hasTagName(videoTag) || element->hasTagName(audioTag))) {
+ if (!mediaControlsStyleSheet && (element->hasTagName(videoTag) || isHTMLAudioElement(element))) {
String mediaRules = String(mediaControlsUserAgentStyleSheet, sizeof(mediaControlsUserAgentStyleSheet)) + RenderTheme::themeForPage(element->document()->page())->extraMediaControlsStyleSheet();
mediaControlsStyleSheet = parseUASheet(mediaRules);
defaultStyle->addRulesFromSheet(mediaControlsStyleSheet, screenEval());
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (151980 => 151981)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -673,7 +673,7 @@
if (element->hasTagName(iframeTag) || element->hasTagName(frameTag) || element->hasTagName(embedTag) || element->hasTagName(objectTag) || element->hasTagName(appletTag) || element->hasTagName(canvasTag)
#if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
// With proxying, the media elements are backed by a RenderEmbeddedObject.
- || element->hasTagName(videoTag) || element->hasTagName(audioTag)
+ || element->hasTagName(videoTag) || isHTMLAudioElement(element)
#endif
)
return false;
Modified: trunk/Source/WebCore/html/HTMLAudioElement.h (151980 => 151981)
--- trunk/Source/WebCore/html/HTMLAudioElement.h 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/html/HTMLAudioElement.h 2013-06-26 07:44:01 UTC (rev 151981)
@@ -45,6 +45,17 @@
virtual bool isVideo() const { return false; }
};
+inline bool isHTMLAudioElement(Node* node)
+{
+ return node->hasTagName(HTMLNames::audioTag);
+}
+
+inline HTMLAudioElement* toHTMLAudioElement(Node* node)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLAudioElement(node));
+ return static_cast<HTMLAudioElement*>(node);
+}
+
} //namespace
#endif
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (151980 => 151981)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -247,7 +247,7 @@
PassRefPtr<Widget> SubframeLoader::loadMediaPlayerProxyPlugin(Node* node, const KURL& url,
const Vector<String>& paramNames, const Vector<String>& paramValues)
{
- ASSERT(node->hasTagName(videoTag) || node->hasTagName(audioTag));
+ ASSERT(node->hasTagName(videoTag) || isHTMLAudioElement(node));
KURL completedURL;
if (!url.isEmpty())
Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (151980 => 151981)
--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -29,6 +29,7 @@
#include "FrameSelection.h"
#include "FrameTree.h"
#include "HTMLAnchorElement.h"
+#include "HTMLAudioElement.h"
#include "HTMLImageElement.h"
#include "HTMLInputElement.h"
#include "HTMLMediaElement.h"
@@ -377,7 +378,7 @@
if (!(m_innerNonSharedNode->renderer() && m_innerNonSharedNode->renderer()->isMedia()))
return 0;
- if (m_innerNonSharedNode->hasTagName(HTMLNames::videoTag) || m_innerNonSharedNode->hasTagName(HTMLNames::audioTag))
+ if (m_innerNonSharedNode->hasTagName(HTMLNames::videoTag) || isHTMLAudioElement(m_innerNonSharedNode.get()))
return static_cast<HTMLMediaElement*>(m_innerNonSharedNode.get());
return 0;
}
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (151980 => 151981)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2013-06-26 07:44:01 UTC (rev 151981)
@@ -2067,7 +2067,7 @@
return false;
Node* node = renderer->node();
- if (!node || (!node->hasTagName(HTMLNames::videoTag) && !node->hasTagName(HTMLNames::audioTag)))
+ if (!node || (!node->hasTagName(HTMLNames::videoTag) && !isHTMLAudioElement(node)))
return false;
HTMLMediaElement* mediaElement = toMediaElement(node);
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (151980 => 151981)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-06-26 07:44:01 UTC (rev 151981)
@@ -30,6 +30,7 @@
#import "FileList.h"
#import "FrameView.h"
#import "GraphicsContextCG.h"
+#import "HTMLAudioElement.h"
#import "HTMLInputElement.h"
#import "HTMLMediaElement.h"
#import "HTMLNames.h"
@@ -289,7 +290,7 @@
{
Node* node = o->node();
Node* mediaNode = node ? node->shadowHost() : 0;
- if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
+ if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !isHTMLAudioElement(mediaNode)))
return false;
if (node->isMediaControlElement()) {
@@ -303,7 +304,7 @@
{
Node* node = o->node();
Node* mediaNode = node ? node->shadowHost() : 0;
- if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !mediaNode->hasTagName(audioTag)))
+ if (!mediaNode || (!mediaNode->hasTagName(videoTag) && !isHTMLAudioElement(mediaNode)))
return false;
if (node->isMediaControlElement()) {
Modified: trunk/Source/WebKit/mac/ChangeLog (151980 => 151981)
--- trunk/Source/WebKit/mac/ChangeLog 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-06-26 07:44:01 UTC (rev 151981)
@@ -1,3 +1,15 @@
+2013-06-26 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLAudioElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117985
+
+ Reviewed by Jer Noble.
+
+ To enhance readibility, this patch adopts is/toHTMLAudioElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * Plugins/WebPluginController.mm:
+
2013-06-24 Simon Fraser <[email protected]>
Move displayID stuff from Widget to Chrome
Modified: trunk/Source/WebKit/mac/Plugins/WebPluginController.mm (151980 => 151981)
--- trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2013-06-26 07:24:13 UTC (rev 151980)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginController.mm 2013-06-26 07:44:01 UTC (rev 151981)
@@ -499,7 +499,7 @@
}
Element* node = core(element);
- if (!node || (!node->hasTagName(HTMLNames::videoTag) && !node->hasTagName(HTMLNames::audioTag))) {
+ if (!node || (!node->hasTagName(HTMLNames::videoTag) && !isHTMLAudioElement(node))) {
LOG_ERROR("invalid media element passed");
return nil;
}
