Skip to content

GitLab

T
tangled
Commit 1546ee1e authored by rob.buis@samsung.com's avatar rob.buis@samsung.com
Browse files
Options

Use ContainerNode more in DOMEditor 

Use ContainerNode more in DOMEditor, specifically
this allows us to call replaceChild/removeChild etc.
on ContainerNode directly, skipping the checks in
Node::replaceChild/removeChild.

Review URL: https://codereview.chromium.org/716603002

git-svn-id: svn://svn.chromium.org/blink/trunk@185126 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1ace5b9a
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
third_party/WebKit/Source/core/inspector/DOMEditor.cpp
View file @ 1546ee1e
...@@ -47,7 +47,7 @@ namespace blink { ...@@ -47,7 +47,7 @@ namespace blink {
class DOMEditor::RemoveChildAction final : public InspectorHistory::Action { class DOMEditor::RemoveChildAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(RemoveChildAction); WTF_MAKE_NONCOPYABLE(RemoveChildAction);
public: public:
RemoveChildAction(Node* parentNode, Node* node) RemoveChildAction(ContainerNode* parentNode, Node* node)
: InspectorHistory::Action("RemoveChild") : InspectorHistory::Action("RemoveChild")
, m_parentNode(parentNode) , m_parentNode(parentNode)
, m_node(node) , m_node(node)
...@@ -81,7 +81,7 @@ public: ...@@ -81,7 +81,7 @@ public:
} }
private: private:
RefPtrWillBeMember<Node> m_parentNode; RefPtrWillBeMember<ContainerNode> m_parentNode;
RefPtrWillBeMember<Node> m_node; RefPtrWillBeMember<Node> m_node;
RefPtrWillBeMember<Node> m_anchorNode; RefPtrWillBeMember<Node> m_anchorNode;
}; };
...@@ -89,7 +89,7 @@ private: ...@@ -89,7 +89,7 @@ private:
class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action { class DOMEditor::InsertBeforeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(InsertBeforeAction); WTF_MAKE_NONCOPYABLE(InsertBeforeAction);
public: public:
InsertBeforeAction(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode) InsertBeforeAction(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode)
: InspectorHistory::Action("InsertBefore") : InspectorHistory::Action("InsertBefore")
, m_parentNode(parentNode) , m_parentNode(parentNode)
, m_node(node) , m_node(node)
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
} }
private: private:
RefPtrWillBeMember<Node> m_parentNode; RefPtrWillBeMember<ContainerNode> m_parentNode;
RefPtrWillBeMember<Node> m_node; RefPtrWillBeMember<Node> m_node;
RefPtrWillBeMember<Node> m_anchorNode; RefPtrWillBeMember<Node> m_anchorNode;
RefPtrWillBeMember<RemoveChildAction> m_removeChildAction; RefPtrWillBeMember<RemoveChildAction> m_removeChildAction;
...@@ -333,7 +333,7 @@ private: ...@@ -333,7 +333,7 @@ private:
class DOMEditor::ReplaceChildNodeAction final : public InspectorHistory::Action { class DOMEditor::ReplaceChildNodeAction final : public InspectorHistory::Action {
WTF_MAKE_NONCOPYABLE(ReplaceChildNodeAction); WTF_MAKE_NONCOPYABLE(ReplaceChildNodeAction);
public: public:
ReplaceChildNodeAction(Node* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode) ReplaceChildNodeAction(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode)
: InspectorHistory::Action("ReplaceChildNode") : InspectorHistory::Action("ReplaceChildNode")
, m_parentNode(parentNode) , m_parentNode(parentNode)
, m_newNode(newNode) , m_newNode(newNode)
...@@ -367,7 +367,7 @@ public: ...@@ -367,7 +367,7 @@ public:
} }
private: private:
RefPtrWillBeMember<Node> m_parentNode; RefPtrWillBeMember<ContainerNode> m_parentNode;
RefPtrWillBeMember<Node> m_newNode; RefPtrWillBeMember<Node> m_newNode;
RefPtrWillBeMember<Node> m_oldNode; RefPtrWillBeMember<Node> m_oldNode;
}; };
...@@ -414,12 +414,12 @@ private: ...@@ -414,12 +414,12 @@ private:
DOMEditor::DOMEditor(InspectorHistory* history) : m_history(history) { } DOMEditor::DOMEditor(InspectorHistory* history) : m_history(history) { }
bool DOMEditor::insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode, ExceptionState& exceptionState) bool DOMEditor::insertBefore(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode, ExceptionState& exceptionState)
{ {
return m_history->perform(adoptRefWillBeNoop(new InsertBeforeAction(parentNode, node, anchorNode)), exceptionState); return m_history->perform(adoptRefWillBeNoop(new InsertBeforeAction(parentNode, node, anchorNode)), exceptionState);
} }
bool DOMEditor::removeChild(Node* parentNode, Node* node, ExceptionState& exceptionState) bool DOMEditor::removeChild(ContainerNode* parentNode, Node* node, ExceptionState& exceptionState)
{ {
return m_history->perform(adoptRefWillBeNoop(new RemoveChildAction(parentNode, node)), exceptionState); return m_history->perform(adoptRefWillBeNoop(new RemoveChildAction(parentNode, node)), exceptionState);
} }
...@@ -448,7 +448,7 @@ bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionSt ...@@ -448,7 +448,7 @@ bool DOMEditor::replaceWholeText(Text* textNode, const String& text, ExceptionSt
return m_history->perform(adoptRefWillBeNoop(new ReplaceWholeTextAction(textNode, text)), exceptionState); return m_history->perform(adoptRefWillBeNoop(new ReplaceWholeTextAction(textNode, text)), exceptionState);
} }
bool DOMEditor::replaceChild(Node* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode, ExceptionState& exceptionState) bool DOMEditor::replaceChild(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode, ExceptionState& exceptionState)
{ {
return m_history->perform(adoptRefWillBeNoop(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), exceptionState); return m_history->perform(adoptRefWillBeNoop(new ReplaceChildNodeAction(parentNode, newNode, oldNode)), exceptionState);
} }
...@@ -464,7 +464,7 @@ static void populateErrorString(ExceptionState& exceptionState, ErrorString* err ...@@ -464,7 +464,7 @@ static void populateErrorString(ExceptionState& exceptionState, ErrorString* err
*errorString = DOMException::getErrorName(exceptionState.code()); *errorString = DOMException::getErrorName(exceptionState.code());
} }
bool DOMEditor::insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode, ErrorString* errorString) bool DOMEditor::insertBefore(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> node, Node* anchorNode, ErrorString* errorString)
{ {
TrackExceptionState exceptionState; TrackExceptionState exceptionState;
bool result = insertBefore(parentNode, node, anchorNode, exceptionState); bool result = insertBefore(parentNode, node, anchorNode, exceptionState);
...@@ -472,7 +472,7 @@ bool DOMEditor::insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node ...@@ -472,7 +472,7 @@ bool DOMEditor::insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node> node
return result; return result;
} }
bool DOMEditor::removeChild(Node* parentNode, Node* node, ErrorString* errorString) bool DOMEditor::removeChild(ContainerNode* parentNode, Node* node, ErrorString* errorString)
{ {
TrackExceptionState exceptionState; TrackExceptionState exceptionState;
bool result = removeChild(parentNode, node, exceptionState); bool result = removeChild(parentNode, node, exceptionState);
......
third_party/WebKit/Source/core/inspector/DOMEditor.h
View file @ 1546ee1e
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
namespace blink { namespace blink {
class ContainerNode;
class Element; class Element;
class ExceptionState; class ExceptionState;
class InspectorHistory; class InspectorHistory;
...@@ -52,17 +53,17 @@ public: ...@@ -52,17 +53,17 @@ public:
void trace(Visitor*); void trace(Visitor*);
bool insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node>, Node* anchorNode, ExceptionState&); bool insertBefore(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node>, Node* anchorNode, ExceptionState&);
bool removeChild(Node* parentNode, Node*, ExceptionState&); bool removeChild(ContainerNode* parentNode, Node*, ExceptionState&);
bool setAttribute(Element*, const String& name, const String& value, ExceptionState&); bool setAttribute(Element*, const String& name, const String& value, ExceptionState&);
bool removeAttribute(Element*, const String& name, ExceptionState&); bool removeAttribute(Element*, const String& name, ExceptionState&);
bool setOuterHTML(Node*, const String& html, Node** newNode, ExceptionState&); bool setOuterHTML(Node*, const String& html, Node** newNode, ExceptionState&);
bool replaceWholeText(Text*, const String& text, ExceptionState&); bool replaceWholeText(Text*, const String& text, ExceptionState&);
bool replaceChild(Node* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode, ExceptionState&); bool replaceChild(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node> newNode, Node* oldNode, ExceptionState&);
bool setNodeValue(Node* parentNode, const String& value, ExceptionState&); bool setNodeValue(Node* parentNode, const String& value, ExceptionState&);
bool insertBefore(Node* parentNode, PassRefPtrWillBeRawPtr<Node>, Node* anchorNode, ErrorString*); bool insertBefore(ContainerNode* parentNode, PassRefPtrWillBeRawPtr<Node>, Node* anchorNode, ErrorString*);
bool removeChild(Node* parentNode, Node*, ErrorString*); bool removeChild(ContainerNode* parentNode, Node*, ErrorString*);
bool setAttribute(Element*, const String& name, const String& value, ErrorString*); bool setAttribute(Element*, const String& name, const String& value, ErrorString*);
bool removeAttribute(Element*, const String& name, ErrorString*); bool removeAttribute(Element*, const String& name, ErrorString*);
bool setOuterHTML(Node*, const String& html, Node** newNode, ErrorString*); bool setOuterHTML(Node*, const String& html, Node** newNode, ErrorString*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment