Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I4d7fff0910dbdca9c510f40786767881a9213d41
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 8ba2fda..1c0ca09 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -1166,7 +1166,6 @@
void Element::setPrefix(const AtomicString& prefix, ExceptionState& es)
{
- es.clearException();
checkSetPrefix(prefix, es);
if (es.hadException())
return;
@@ -1633,6 +1632,11 @@
return shadowRoot;
}
+bool Element::supportsShadowElementForUserAgentShadow() const
+{
+ return true;
+}
+
// FIXME: After replacing all internal shadowPseudoId with shadowPartId, remove this method.
const AtomicString& Element::shadowPseudoId() const
{
@@ -3086,7 +3090,7 @@
}
}
-InputMethodContext* Element::getInputContext()
+InputMethodContext* Element::inputMethodContext()
{
return ensureElementRareData()->ensureInputMethodContext(toHTMLElement(this));
}