Attachment 339517 Details for Bug 185290 – Cleanup

[patch] Cleanup

bug-185290-20180503205237.patch (text/plain), 11.61 KB, created by Ryosuke Niwa on 2018-05-03 20:52:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2018-05-03 20:52:38 PDT

Size: 11.61 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 231344)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,26 @@
>+2018-05-03  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Rename DocumentOrderedMap to TreeScopeOrderedMap
>+        https://bugs.webkit.org/show_bug.cgi?id=185290
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Renamed the class since it's almost always a mistake to use this class as a member variable of Document.
>+
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * dom/MouseRelatedEvent.cpp: Include the forgotten DOMWindow.h. Unified build files bit us here.
>+        * dom/TreeScope.cpp:
>+        (WebCore::TreeScope::addElementById):
>+        (WebCore::TreeScope::addElementByName):
>+        (WebCore::TreeScope::addImageMap):
>+        (WebCore::TreeScope::addImageElementByUsemap):
>+        (WebCore::TreeScope::labelElementForId):
>+        * dom/TreeScope.h:
>+        * dom/TreeScopeOrderedMap.cpp: Renamed from DocumentOrderedMap.cpp
>+        * dom/TreeScopeOrderedMap.h: Renamed from DocumentOrderedMap.h
>+        * html/HTMLDocument.h:
>+
> 2018-05-03  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         Unreviewed, attempt to fix WinCairo build failure
>Index: Source/WebCore/Sources.txt
>===================================================================
>--- Source/WebCore/Sources.txt	(revision 231344)
>+++ Source/WebCore/Sources.txt	(working copy)
>@@ -729,7 +729,6 @@ dom/Document.cpp
> dom/DocumentEventQueue.cpp
> dom/DocumentFragment.cpp
> dom/DocumentMarkerController.cpp
>-dom/DocumentOrderedMap.cpp
> dom/DocumentParser.cpp
> dom/DocumentSharedObjectPool.cpp
> dom/DocumentTouch.cpp @no-unify
>@@ -826,6 +825,7 @@ dom/TransformSourceLibxslt.cpp
> dom/TransitionEvent.cpp
> dom/Traversal.cpp
> dom/TreeScope.cpp
>+dom/TreeScopeOrderedMap.cpp
> dom/TreeWalker.cpp
> dom/UIEvent.cpp
> dom/UIEventWithKeyState.cpp
>Index: Source/WebCore/WebCore.xcodeproj/project.pbxproj
>===================================================================
>--- Source/WebCore/WebCore.xcodeproj/project.pbxproj	(revision 231344)
>+++ Source/WebCore/WebCore.xcodeproj/project.pbxproj	(working copy)
>@@ -432,7 +432,7 @@
> 		1479FAF0109AE37500DED655 /* RenderRubyBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1479FAE8109AE37500DED655 /* RenderRubyBase.h */; };
> 		1479FAF2109AE37500DED655 /* RenderRubyRun.h in Headers */ = {isa = PBXBuildFile; fileRef = 1479FAEA109AE37500DED655 /* RenderRubyRun.h */; };
> 		1479FAF4109AE37500DED655 /* RenderRubyText.h in Headers */ = {isa = PBXBuildFile; fileRef = 1479FAEC109AE37500DED655 /* RenderRubyText.h */; };
>-		14947FFE12F80CD200A0F631 /* DocumentOrderedMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		14947FFE12F80CD200A0F631 /* TreeScopeOrderedMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 14947FFC12F80CD200A0F631 /* TreeScopeOrderedMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14993BE60B2F2B1C0050497F /* FocusController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14993BE40B2F2B1C0050497F /* FocusController.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14CF7B3409F6ECD700EB3665 /* JSCSSRule.h in Headers */ = {isa = PBXBuildFile; fileRef = 14CF7B3209F6ECD700EB3665 /* JSCSSRule.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D64B5B134A5B6B00E58FDA /* TreeScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -5821,8 +5821,8 @@
> 		14813BF309EDF88E00F757E1 /* IDLParser.pm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = IDLParser.pm; path = scripts/IDLParser.pm; sourceTree = "<group>"; };
> 		148B4FFF1B6904C500C954E4 /* CountQueuingStrategy.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CountQueuingStrategy.idl; sourceTree = "<group>"; };
> 		148B4FFF1B6904C500C954E5 /* ByteLengthQueuingStrategy.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ByteLengthQueuingStrategy.idl; sourceTree = "<group>"; };
>-		14947FFB12F80CD200A0F631 /* DocumentOrderedMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentOrderedMap.cpp; sourceTree = "<group>"; };
>-		14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentOrderedMap.h; sourceTree = "<group>"; };
>+		14947FFB12F80CD200A0F631 /* TreeScopeOrderedMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TreeScopeOrderedMap.cpp; sourceTree = "<group>"; };
>+		14947FFC12F80CD200A0F631 /* TreeScopeOrderedMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeScopeOrderedMap.h; sourceTree = "<group>"; };
> 		14993BE30B2F2B1C0050497F /* FocusController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FocusController.cpp; sourceTree = "<group>"; };
> 		14993BE40B2F2B1C0050497F /* FocusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FocusController.h; sourceTree = "<group>"; };
> 		14A98E05136386A200C9FED2 /* Blob.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Blob.idl; sourceTree = "<group>"; };
>@@ -26074,8 +26074,6 @@
> 				ED2BA83B09A24B91006C0AC4 /* DocumentMarker.h */,
> 				CE057FA31220731100A476D5 /* DocumentMarkerController.cpp */,
> 				CE057FA41220731100A476D5 /* DocumentMarkerController.h */,
>-				14947FFB12F80CD200A0F631 /* DocumentOrderedMap.cpp */,
>-				14947FFC12F80CD200A0F631 /* DocumentOrderedMap.h */,
> 				9B0FE8731D9E02DF004A8ACB /* DocumentOrShadowRoot.idl */,
> 				A8C2280D11D4A59700D5A7D3 /* DocumentParser.cpp */,
> 				BCCFBAE70B5152ED0001F1D7 /* DocumentParser.h */,
>@@ -26399,6 +26397,8 @@
> 				37FD4297118368460093C029 /* TreeDepthLimit.h */,
> 				14D64B5A134A5B6B00E58FDA /* TreeScope.cpp */,
> 				14D64B5B134A5B6B00E58FDA /* TreeScope.h */,
>+				14947FFB12F80CD200A0F631 /* TreeScopeOrderedMap.cpp */,
>+				14947FFC12F80CD200A0F631 /* TreeScopeOrderedMap.h */,
> 				854FE72E0A2297BE0058D7AD /* TreeWalker.cpp */,
> 				854FE72F0A2297BE0058D7AD /* TreeWalker.h */,
> 				1A750D3C0A90DE35000FF215 /* TreeWalker.idl */,
>@@ -27601,7 +27601,6 @@
> 				656D37360ADBA5DE00A4554D /* DocumentLoader.h in Headers */,
> 				ED2BA83C09A24B91006C0AC4 /* DocumentMarker.h in Headers */,
> 				CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */,
>-				14947FFE12F80CD200A0F631 /* DocumentOrderedMap.h in Headers */,
> 				BCCFBAE80B5152ED0001F1D7 /* DocumentParser.h in Headers */,
> 				4A4F48AA16B0DFC000EDBB29 /* DocumentRuleSets.h in Headers */,
> 				AD6E71AD1668899D00320C13 /* DocumentSharedObjectPool.h in Headers */,
>@@ -30578,6 +30577,7 @@
> 				854FE7370A2297BE0058D7AD /* Traversal.h in Headers */,
> 				37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */,
> 				14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */,
>+				14947FFE12F80CD200A0F631 /* TreeScopeOrderedMap.h in Headers */,
> 				854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
> 				C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
> 				E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */,
>Index: Source/WebCore/dom/MouseRelatedEvent.cpp
>===================================================================
>--- Source/WebCore/dom/MouseRelatedEvent.cpp	(revision 231344)
>+++ Source/WebCore/dom/MouseRelatedEvent.cpp	(working copy)
>@@ -23,6 +23,7 @@
> #include "config.h"
> #include "MouseRelatedEvent.h"
> 
>+#include "DOMWindow.h"
> #include "Document.h"
> #include "Frame.h"
> #include "FrameView.h"
>Index: Source/WebCore/dom/TreeScope.cpp
>===================================================================
>--- Source/WebCore/dom/TreeScope.cpp	(revision 231344)
>+++ Source/WebCore/dom/TreeScope.cpp	(working copy)
>@@ -141,7 +141,7 @@ const Vector<Element*>* TreeScope::getAl
> void TreeScope::addElementById(const AtomicStringImpl& elementId, Element& element, bool notifyObservers)
> {
>     if (!m_elementsById)
>-        m_elementsById = std::make_unique<DocumentOrderedMap>();
>+        m_elementsById = std::make_unique<TreeScopeOrderedMap>();
>     m_elementsById->add(elementId, element, *this);
>     if (notifyObservers)
>         m_idTargetObserverRegistry->notifyObservers(elementId);
>@@ -168,7 +168,7 @@ Element* TreeScope::getElementByName(con
> void TreeScope::addElementByName(const AtomicStringImpl& name, Element& element)
> {
>     if (!m_elementsByName)
>-        m_elementsByName = std::make_unique<DocumentOrderedMap>();
>+        m_elementsByName = std::make_unique<TreeScopeOrderedMap>();
>     m_elementsByName->add(name, element, *this);
> }
> 
>@@ -239,7 +239,7 @@ void TreeScope::addImageMap(HTMLMapEleme
>     if (!name)
>         return;
>     if (!m_imageMapsByName)
>-        m_imageMapsByName = std::make_unique<DocumentOrderedMap>();
>+        m_imageMapsByName = std::make_unique<TreeScopeOrderedMap>();
>     m_imageMapsByName->add(*name, imageMap, *this);
> }
> 
>@@ -263,7 +263,7 @@ HTMLMapElement* TreeScope::getImageMap(c
> void TreeScope::addImageElementByUsemap(const AtomicStringImpl& name, HTMLImageElement& element)
> {
>     if (!m_imagesByUsemap)
>-        m_imagesByUsemap = std::make_unique<DocumentOrderedMap>();
>+        m_imagesByUsemap = std::make_unique<TreeScopeOrderedMap>();
>     return m_imagesByUsemap->add(name, element, *this);
> }
> 
>@@ -300,7 +300,7 @@ HTMLLabelElement* TreeScope::labelElemen
> 
>     if (!m_labelsByForAttribute) {
>         // Populate the map on first access.
>-        m_labelsByForAttribute = std::make_unique<DocumentOrderedMap>();
>+        m_labelsByForAttribute = std::make_unique<TreeScopeOrderedMap>();
> 
>         for (auto& label : descendantsOfType<HTMLLabelElement>(m_rootNode)) {
>             const AtomicString& forValue = label.attributeWithoutSynchronization(forAttr);
>Index: Source/WebCore/dom/TreeScope.h
>===================================================================
>--- Source/WebCore/dom/TreeScope.h	(revision 231344)
>+++ Source/WebCore/dom/TreeScope.h	(working copy)
>@@ -26,7 +26,7 @@
> 
> #pragma once
> 
>-#include "DocumentOrderedMap.h"
>+#include "TreeScopeOrderedMap.h"
> #include <memory>
> #include <wtf/Forward.h>
> #include <wtf/Vector.h>
>@@ -126,11 +126,11 @@ private:
>     std::reference_wrapper<Document> m_documentScope;
>     TreeScope* m_parentTreeScope;
> 
>-    std::unique_ptr<DocumentOrderedMap> m_elementsById;
>-    std::unique_ptr<DocumentOrderedMap> m_elementsByName;
>-    std::unique_ptr<DocumentOrderedMap> m_imageMapsByName;
>-    std::unique_ptr<DocumentOrderedMap> m_imagesByUsemap;
>-    std::unique_ptr<DocumentOrderedMap> m_labelsByForAttribute;
>+    std::unique_ptr<TreeScopeOrderedMap> m_elementsById;
>+    std::unique_ptr<TreeScopeOrderedMap> m_elementsByName;
>+    std::unique_ptr<TreeScopeOrderedMap> m_imageMapsByName;
>+    std::unique_ptr<TreeScopeOrderedMap> m_imagesByUsemap;
>+    std::unique_ptr<TreeScopeOrderedMap> m_labelsByForAttribute;
> 
>     std::unique_ptr<IdTargetObserverRegistry> m_idTargetObserverRegistry;
> };
>Index: Source/WebCore/html/HTMLDocument.h
>===================================================================
>--- Source/WebCore/html/HTMLDocument.h	(revision 231344)
>+++ Source/WebCore/html/HTMLDocument.h	(working copy)
>@@ -69,8 +69,8 @@ private:
>     Ref<DocumentParser> createParser() override;
>     Ref<Document> cloneDocumentWithoutChildren() const final;
> 
>-    DocumentOrderedMap m_documentNamedItem;
>-    DocumentOrderedMap m_windowNamedItem;
>+    TreeScopeOrderedMap m_documentNamedItem;
>+    TreeScopeOrderedMap m_windowNamedItem;
> };
> 
> } // namespace WebCore

Actions: View | Formatted Diff | Diff

Attachments on bug 185290: 339517 | 339595