Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / dom / Element.cpp

diff --git a/src/third_party/WebKit/Source/core/dom/Element.cpp b/src/third_party/WebKit/Source/core/dom/Element.cpp
index ac3092d..04680e6 100644 (file)
--- a/src/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/src/third_party/WebKit/Source/core/dom/Element.cpp
@@ -1985,6 +1985,11 @@ PassRefPtr<Attr> Element::setAttributeNode(Attr* attrNode, ExceptionState& excep
     return oldAttrNode.release();
 }
 
+PassRefPtr<Attr> Element::setAttributeNodeNS(Attr* attr, ExceptionState& exceptionState)
+{
+    return setAttributeNode(attr, exceptionState);
+}
+
 PassRefPtr<Attr> Element::removeAttributeNode(Attr* attr, ExceptionState& exceptionState)
 {
     if (!attr) {
@@ -2176,7 +2181,8 @@ void Element::focus(bool restorePreviousSelection, FocusType type)
 void Element::updateFocusAppearance(bool /*restorePreviousSelection*/)
 {
     if (isRootEditableElement()) {
-        LocalFrame* frame = document().frame();
+        // Taking the ownership since setSelection() may release the last reference to |frame|.
+        RefPtr<LocalFrame> frame(document().frame());
         if (!frame)
             return;