projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
core
/
accessibility
/
AXMediaControls.cpp
diff --git
a/src/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp
b/src/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp
index
e445b54
..
5901add
100644
(file)
--- a/
src/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp
+++ b/
src/third_party/WebKit/Source/core/accessibility/AXMediaControls.cpp
@@
-33,12
+33,11
@@
#include "core/html/HTMLMediaElement.h"
#include "platform/text/PlatformLocale.h"
#include "core/html/HTMLMediaElement.h"
#include "platform/text/PlatformLocale.h"
-namespace
WebCore
{
+namespace
blink
{
using blink::WebLocalizedString;
using namespace HTMLNames;
using blink::WebLocalizedString;
using namespace HTMLNames;
-
static inline String queryString(WebLocalizedString::Name name)
{
return Locale::defaultLocale().queryString(name);
static inline String queryString(WebLocalizedString::Name name)
{
return Locale::defaultLocale().queryString(name);
@@
-208,12
+207,11
@@
String AXMediaControlsContainer::helpText() const
bool AXMediaControlsContainer::controllingVideoElement() const
{
bool AXMediaControlsContainer::controllingVideoElement() const
{
- if (!m_renderer->node())
+ Node* node = m_renderer->node();
+ if (!node)
return true;
return true;
- MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDisplayElement*>(m_renderer->node());
-
- return isHTMLVideoElement(toParentMediaElement(element));
+ return isHTMLVideoElement(toParentMediaElement(node));
}
bool AXMediaControlsContainer::computeAccessibilityIsIgnored() const
}
bool AXMediaControlsContainer::computeAccessibilityIsIgnored() const
@@
-297,4
+295,4
@@
String AccessibilityMediaTimeDisplay::stringValue() const
return localizedMediaTimeDescription(fabsf(time));
}
return localizedMediaTimeDescription(fabsf(time));
}
-} // namespace
WebCore
+} // namespace
blink