Title: [151980] trunk/Source/WebCore
- Revision
- 151980
- Author
- [email protected]
- Date
- 2013-06-26 00:24:13 -0700 (Wed, 26 Jun 2013)
Log Message
Refactoring: Fold Document::focusedNodeRemoved into Document::removeFocusedNodeOfSubtree
https://bugs.webkit.org/show_bug.cgi?id=118036
Reviewed by Kent Tamura.
Merge https://chromium.googlesource.com/chromium/blink/+/3391beabe75548cc638a6c88982f913621a4410f.
* dom/Document.cpp:
(WebCore::Document::removeFocusedNodeOfSubtree):
* dom/Document.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151979 => 151980)
--- trunk/Source/WebCore/ChangeLog 2013-06-26 04:16:06 UTC (rev 151979)
+++ trunk/Source/WebCore/ChangeLog 2013-06-26 07:24:13 UTC (rev 151980)
@@ -1,3 +1,16 @@
+2013-06-26 Ryosuke Niwa <[email protected]>
+
+ Refactoring: Fold Document::focusedNodeRemoved into Document::removeFocusedNodeOfSubtree
+ https://bugs.webkit.org/show_bug.cgi?id=118036
+
+ Reviewed by Kent Tamura.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/3391beabe75548cc638a6c88982f913621a4410f.
+
+ * dom/Document.cpp:
+ (WebCore::Document::removeFocusedNodeOfSubtree):
+ * dom/Document.h:
+
2013-06-25 Ryosuke Niwa <[email protected]>
JSString should remember AtomicString
Modified: trunk/Source/WebCore/dom/Document.cpp (151979 => 151980)
--- trunk/Source/WebCore/dom/Document.cpp 2013-06-26 04:16:06 UTC (rev 151979)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-06-26 07:24:13 UTC (rev 151980)
@@ -3221,11 +3221,6 @@
m_activeElement = newActiveElement;
}
-void Document::focusedNodeRemoved()
-{
- setFocusedElement(0);
-}
-
void Document::removeFocusedNodeOfSubtree(Node* node, bool amongChildrenOnly)
{
if (!m_focusedElement || this->inPageCache()) // If the document is in the page cache, then we don't need to clear out the focused node.
@@ -3242,7 +3237,7 @@
nodeInSubtree = (focusedElement == node) || focusedElement->isDescendantOf(node);
if (nodeInSubtree)
- document()->focusedNodeRemoved();
+ setFocusedElement(0);
}
void Document::hoveredElementDidDetach(Element* element)
Modified: trunk/Source/WebCore/dom/Document.h (151979 => 151980)
--- trunk/Source/WebCore/dom/Document.h 2013-06-26 04:16:06 UTC (rev 151979)
+++ trunk/Source/WebCore/dom/Document.h 2013-06-26 07:24:13 UTC (rev 151980)
@@ -681,7 +681,6 @@
void setActiveElement(PassRefPtr<Element>);
Element* activeElement() const { return m_activeElement.get(); }
- void focusedNodeRemoved();
void removeFocusedNodeOfSubtree(Node*, bool amongChildrenOnly = false);
void hoveredElementDidDetach(Element*);
void elementInActiveChainDidDetach(Element*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
