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
/
html
/
HTMLEmbedElement.cpp
diff --git
a/src/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
b/src/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
index
99e3467
..
a7fc050
100644
(file)
--- a/
src/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
+++ b/
src/third_party/WebKit/Source/core/html/HTMLEmbedElement.cpp
@@
-27,6
+27,7
@@
#include "core/CSSPropertyNames.h"
#include "core/HTMLNames.h"
#include "core/dom/Attribute.h"
#include "core/CSSPropertyNames.h"
#include "core/HTMLNames.h"
#include "core/dom/Attribute.h"
+#include "core/dom/ElementTraversal.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/html/HTMLImageLoader.h"
#include "core/html/HTMLObjectElement.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/html/HTMLImageLoader.h"
#include "core/html/HTMLObjectElement.h"
@@
-35,7
+36,7
@@
#include "core/rendering/RenderEmbeddedObject.h"
#include "core/rendering/RenderWidget.h"
#include "core/rendering/RenderEmbeddedObject.h"
#include "core/rendering/RenderWidget.h"
-namespace
WebCore
{
+namespace
blink
{
using namespace HTMLNames;
using namespace HTMLNames;
@@
-103,7
+104,7
@@
void HTMLEmbedElement::parseAttribute(const QualifiedName& name, const AtomicStr
if (renderer() && isImageType()) {
if (!m_imageLoader)
m_imageLoader = HTMLImageLoader::create(this);
if (renderer() && isImageType()) {
if (!m_imageLoader)
m_imageLoader = HTMLImageLoader::create(this);
- m_imageLoader->updateFromElement
IgnoringPreviousError(
);
+ m_imageLoader->updateFromElement
(ImageLoader::UpdateIgnorePreviousError
);
}
} else {
HTMLPlugInElement::parseAttribute(name, value);
}
} else {
HTMLPlugInElement::parseAttribute(name, value);
@@
-112,12
+113,9
@@
void HTMLEmbedElement::parseAttribute(const QualifiedName& name, const AtomicStr
void HTMLEmbedElement::parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues)
{
void HTMLEmbedElement::parametersForPlugin(Vector<String>& paramNames, Vector<String>& paramValues)
{
- if (!hasAttributes())
- return;
-
AttributeCollection attributes = this->attributes();
AttributeCollection attributes = this->attributes();
- AttributeCollection::
const_
iterator end = attributes.end();
- for (AttributeCollection::
const_
iterator it = attributes.begin(); it != end; ++it) {
+ AttributeCollection::iterator end = attributes.end();
+ for (AttributeCollection::iterator it = attributes.begin(); it != end; ++it) {
paramNames.append(it->localName().string());
paramValues.append(it->value().string());
}
paramNames.append(it->localName().string());
paramValues.append(it->value().string());
}
@@
-185,11
+183,6
@@
const QualifiedName& HTMLEmbedElement::subResourceAttributeName() const
return srcAttr;
}
return srcAttr;
}
-const AtomicString HTMLEmbedElement::imageSourceURL() const
-{
- return getAttribute(srcAttr);
-}
-
bool HTMLEmbedElement::isInteractiveContent() const
{
return true;
bool HTMLEmbedElement::isInteractiveContent() const
{
return true;