Unreviewed, rolling out r123184, r123195, and r123197.

http://trac.webkit.org/changeset/123184
http://trac.webkit.org/changeset/123195
http://trac.webkit.org/changeset/123197
https://bugs.webkit.org/show_bug.cgi?id=92049

pagecycler regression (Requested by morrita on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-07-23

.:

* Source/autotools/symbols.filter:

Source/WebCore:

* WebCore.exp.in:
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::~Document):
(WebCore::Document::suggestedMIMEType):
* dom/Document.h:
(WebCore):
(WebCore::Node::isDocumentNode):
(WebCore::Node::Node):
* dom/Node.cpp:
(WebCore::Node::~Node):
(WebCore::Node::setDocument):
(WebCore):
(WebCore::Node::setTreeScope):
(WebCore::Node::treeScope):
(WebCore::Node::isInShadowTree):
(WebCore::Node::reportMemoryUsage):
* dom/Node.h:
(Node):
(WebCore::Node::document):
(WebCore::Node::inDocument):
* dom/NodeRareData.h:
(WebCore::NodeRareData::NodeRareData):
(WebCore::NodeRareData::treeScope):
(WebCore::NodeRareData::setTreeScope):
(NodeRareData):
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::ShadowRoot):
* dom/TreeScope.cpp:
(WebCore::TreeScope::TreeScope):
(WebCore::TreeScope::setParentTreeScope):
* dom/TreeScope.h:
(WebCore):
(WebCore::TreeScope::idTargetObserverRegistry):
(TreeScope):
* dom/TreeScopeAdopter.cpp:
(WebCore::TreeScopeAdopter::moveTreeToNewScope):
(WebCore::TreeScopeAdopter::moveNodeToNewDocument):
* editing/MoveSelectionCommand.cpp:
* editing/RemoveNodeCommand.cpp:
* editing/RemoveNodePreservingChildrenCommand.cpp:
* inspector/PageConsoleAgent.cpp:

Source/WebKit2:

* win/WebKit2.def:
* win/WebKit2CFLite.def:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@123412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c9fa818..d734d64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-07-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r123184, r123195, and r123197.
+        http://trac.webkit.org/changeset/123184
+        http://trac.webkit.org/changeset/123195
+        http://trac.webkit.org/changeset/123197
+        https://bugs.webkit.org/show_bug.cgi?id=92049
+
+        pagecycler regression (Requested by morrita on #webkit).
+
+        * Source/autotools/symbols.filter:
+
 2012-07-23  Roger Fong  <roger_fong@apple.com>
 
         If select element in Windows is off screen horizontally, 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 761f9b8..99509f7 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,56 @@
+2012-07-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r123184, r123195, and r123197.
+        http://trac.webkit.org/changeset/123184
+        http://trac.webkit.org/changeset/123195
+        http://trac.webkit.org/changeset/123197
+        https://bugs.webkit.org/show_bug.cgi?id=92049
+
+        pagecycler regression (Requested by morrita on #webkit).
+
+        * WebCore.exp.in:
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::~Document):
+        (WebCore::Document::suggestedMIMEType):
+        * dom/Document.h:
+        (WebCore):
+        (WebCore::Node::isDocumentNode):
+        (WebCore::Node::Node):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        (WebCore::Node::setDocument):
+        (WebCore):
+        (WebCore::Node::setTreeScope):
+        (WebCore::Node::treeScope):
+        (WebCore::Node::isInShadowTree):
+        (WebCore::Node::reportMemoryUsage):
+        * dom/Node.h:
+        (Node):
+        (WebCore::Node::document):
+        (WebCore::Node::inDocument):
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::NodeRareData):
+        (WebCore::NodeRareData::treeScope):
+        (WebCore::NodeRareData::setTreeScope):
+        (NodeRareData):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::TreeScope):
+        (WebCore::TreeScope::setParentTreeScope):
+        * dom/TreeScope.h:
+        (WebCore):
+        (WebCore::TreeScope::idTargetObserverRegistry):
+        (TreeScope):
+        * dom/TreeScopeAdopter.cpp:
+        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
+        (WebCore::TreeScopeAdopter::moveNodeToNewDocument):
+        * editing/MoveSelectionCommand.cpp:
+        * editing/RemoveNodeCommand.cpp:
+        * editing/RemoveNodePreservingChildrenCommand.cpp:
+        * inspector/PageConsoleAgent.cpp:
+
 2012-07-23  Roger Fong  <roger_fong@apple.com>
 
         On Windows, if select element is off screen horizontally, 

diff --git a/Source/WebCore/WebCore.exp.in b/Source/WebCore/WebCore.exp.in
index 98843d6..9efb2c7 100644 (file)
--- a/Source/WebCore/WebCore.exp.in
+++ b/Source/WebCore/WebCore.exp.in
@@ -1029,7 +1029,6 @@ __ZN7WebCore9TimerBase4stopEv
 __ZN7WebCore9TimerBase5startEdd
 __ZN7WebCore9TimerBaseC2Ev
 __ZN7WebCore9TimerBaseD2Ev
-__ZN7WebCore9TreeScope12nullInstanceEv
 __ZN7WebCore9closeFileERi
 __ZN7WebCore9endOfWordERKNS_15VisiblePositionENS_9EWordSideE
 __ZN7WebCore9fontCacheEv
@@ -1274,6 +1273,7 @@ __ZNK7WebCore4Node20traversePreviousNodeEPKS0_
 __ZNK7WebCore4Node27traverseNextAncestorSiblingEv
 __ZNK7WebCore4Node31numberOfScopedHTMLStyleChildrenEv
 __ZNK7WebCore4Node9nodeIndexEv
+__ZNK7WebCore4Node9treeScopeEv
 __ZNK7WebCore4Page10pluginDataEv
 __ZNK7WebCore4Page14renderTreeSizeEv
 __ZNK7WebCore4Page15backForwardListEv

diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
index cdbf663..f0b0b65 100644 (file)
--- a/Source/WebCore/dom/Document.cpp
+++ b/Source/WebCore/dom/Document.cpp
@@ -421,7 +421,7 @@ uint64_t Document::s_globalTreeVersion = 0;
 
 Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
     : ContainerNode(0, CreateDocument)
-    , TreeScope(this, this)
+    , TreeScope(this)
     , m_guardRefCount(0)
     , m_contextFeatures(ContextFeatures::defaultSwitch())
     , m_compatibilityMode(NoQuirksMode)
@@ -495,7 +495,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
     , m_didDispatchViewportPropertiesChanged(false)
 #endif
 {
-    setTreeScope(this);
+    m_document = this;
 
     m_pageGroupUserSheetCacheValid = false;
 
@@ -678,7 +678,7 @@ Document::~Document()
     for (unsigned i = 0; i < WTF_ARRAY_LENGTH(m_collections); i++)
         ASSERT(!m_collections[i]);
 
-    setTreeScope(0);
+    m_document = 0;
 
     InspectorCounters::decrementCounter(InspectorCounters::DocumentCounter);
 }
@@ -1352,14 +1352,13 @@ void Document::setContent(const String& content)
 
 String Document::suggestedMIMEType() const
 {
-    Document* doc = document();
-    if (doc->isXHTMLDocument())
+    if (m_document->isXHTMLDocument())
         return "application/xhtml+xml";
-    if (doc->isSVGDocument())
+    if (m_document->isSVGDocument())
         return "image/svg+xml";
-    if (doc->xmlStandalone())
+    if (m_document->xmlStandalone())
         return "text/xml";
-    if (doc->isHTMLDocument())
+    if (m_document->isHTMLDocument())
         return "text/html";
 
     if (DocumentLoader* documentLoader = loader())

diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h
index 8e0843e..d9eb670 100644 (file)
--- a/Source/WebCore/dom/Document.h
+++ b/Source/WebCore/dom/Document.h
@@ -1546,48 +1546,20 @@ private:
 
 // Put these methods here, because they require the Document definition, but we really want to inline them.
 
-inline TreeScope* Node::treeScope() const
-{
-    return m_treeScope == TreeScope::nullInstance() ? 0 : m_treeScope;
-}
-
-inline void Node::setTreeScope(TreeScope* scope)
-{
-    m_treeScope = scope ? scope : TreeScope::nullInstance();
-    setFlag(!m_treeScope->isDocumentScope(), InShadowTree);
-}
-
-inline Document* Node::documentInternal() const
-{
-    if (getFlag(InShadowTree))
-        return m_treeScope->rootDocument();
-    return static_cast<Document*>(m_treeScope);
-}
-
-inline Document* Node::document() const
-{
-    Document* document = documentInternal();
-    // FIXME: below ASSERT is useful, but prevents the use of document() in the constructor or destructor
-    // due to the virtual function call to nodeType().
-    ASSERT(document || (nodeType() == DOCUMENT_TYPE_NODE && !inDocument()));
-    return document;
-}
-
 inline bool Node::isDocumentNode() const
 {
-    return this == documentInternal();
+    return this == m_document;
 }
 
 inline Node::Node(Document* document, ConstructionType type)
     : m_nodeFlags(type)
-    , m_treeScope(0)
+    , m_document(document)
     , m_previous(0)
     , m_next(0)
     , m_renderer(0)
 {
     if (document)
         document->guardRef();
-    setTreeScope(document);
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();
 #endif

diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index 6b622c7..bbe8fc2 100644 (file)
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -406,7 +406,7 @@ Node::~Node()
     if (renderer())
         detach();
 
-    Document* doc = documentInternal();
+    Document* doc = m_document;
     if (AXObjectCache::accessibilityEnabled() && doc && doc->axObjectCacheExists())
         doc->axObjectCache()->removeNodeForUse(this);
     
@@ -421,6 +421,41 @@ Node::~Node()
     InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
 }
 
+void Node::setDocument(Document* document)
+{
+    ASSERT(!inDocument() || m_document == document);
+    if (inDocument() || m_document == document)
+        return;
+
+    m_document = document;
+}
+
+NodeRareData* Node::setTreeScope(TreeScope* scope)
+{
+    if (!scope) {
+        if (hasRareData()) {
+            NodeRareData* data = rareData();
+            data->setTreeScope(0);
+            return data;
+        }
+
+        return 0;
+    }
+
+    NodeRareData* data = ensureRareData();
+    data->setTreeScope(scope);
+    return data;
+}
+
+TreeScope* Node::treeScope() const
+{
+    // FIXME: Using m_document directly is not good -> see comment with document() in the header file.
+    if (!hasRareData())
+        return m_document;
+    TreeScope* scope = rareData()->treeScope();
+    return scope ? scope : m_document;
+}
+
 NodeRareData* Node::rareData() const
 {
     ASSERT(hasRareData());
@@ -1440,6 +1475,11 @@ ContainerNode* Node::nonShadowBoundaryParentNode() const
     return parent && !parent->isShadowRoot() ? parent : 0;
 }
 
+bool Node::isInShadowTree() const
+{
+    return treeScope() != document();
+}
+
 Element* Node::parentOrHostElement() const
 {
     ContainerNode* parent = parentOrHostNode();
@@ -2756,7 +2796,7 @@ void Node::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
     MemoryClassInfo<Node> info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
     info.visitBaseClass<TreeShared<Node, ContainerNode> >(this);
     info.visitBaseClass<ScriptWrappable>(this);
-    info.addInstrumentedMember(document());
+    info.addInstrumentedMember(m_document);
     info.addInstrumentedMember(m_next);
     info.addInstrumentedMember(m_previous);
 }

diff --git a/Source/WebCore/dom/Node.h b/Source/WebCore/dom/Node.h
index 6252273..7c48512 100644 (file)
--- a/Source/WebCore/dom/Node.h
+++ b/Source/WebCore/dom/Node.h
@@ -233,8 +233,7 @@ public:
 
     // Returns 0, a child of ShadowRoot, or a legacy shadow root.
     Node* nonBoundaryShadowTreeRootNode();
-    bool isInShadowTree() const { return getFlag(InShadowTree); }
-
+    bool isInShadowTree() const;
     // Node's parent, shadow tree host.
     ContainerNode* parentOrHostNode() const;
     Element* parentOrHostElement() const;
@@ -412,7 +411,14 @@ public:
 
     // Returns the document associated with this node. This method never returns NULL, except in the case 
     // of a DocumentType node that is not used with any Document yet. A Document node returns itself.
-    Document* document() const;
+    Document* document() const
+    {
+        ASSERT(this);
+        // FIXME: below ASSERT is useful, but prevents the use of document() in the constructor or destructor
+        // due to the virtual function call to nodeType().
+        ASSERT(m_document || (nodeType() == DOCUMENT_TYPE_NODE && !inDocument()));
+        return m_document;
+    }
 
     TreeScope* treeScope() const;
 
@@ -420,7 +426,7 @@ public:
     // node tree, false otherwise.
     bool inDocument() const 
     { 
-        ASSERT(treeScope() || !getFlag(InDocumentFlag));
+        ASSERT(m_document || !getFlag(InDocumentFlag));
         return getFlag(InDocumentFlag);
     }
 
@@ -690,12 +696,10 @@ private:
 #endif
         InNamedFlowFlag = 1 << 26,
         HasAttrListFlag = 1 << 27,
-        HasCustomCallbacksFlag = 1 << 28,
-        InShadowTree = 1 << 29
-
+        HasCustomCallbacksFlag = 1 << 28
     };
 
-    // 3 bits remaining
+    // 4 bits remaining
 
     bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; }
     void setFlag(bool f, NodeFlags mask) const { m_nodeFlags = (m_nodeFlags & ~mask) | (-(int32_t)f & mask); } 
@@ -731,14 +735,16 @@ protected:
 
     void setHasCustomCallbacks() { setFlag(true, HasCustomCallbacksFlag); }
 
-    void setTreeScope(TreeScope*);
-    Document* documentInternal() const;
-
 private:
     friend class TreeShared<Node, ContainerNode>;
 
     void removedLastRef();
 
+    // These API should be only used for a tree scope migration.
+    // setTreeScope() returns NodeRareData to save extra nodeRareData() invocations on the caller site.
+    NodeRareData* setTreeScope(TreeScope*);
+    void setDocument(Document*);
+
     enum EditableLevel { Editable, RichlyEditable };
     bool rendererIsEditable(EditableLevel) const;
     bool isEditableToAccessibility(EditableLevel) const;
@@ -781,7 +787,7 @@ private:
 #endif
 
     mutable uint32_t m_nodeFlags;
-    TreeScope* m_treeScope;
+    Document* m_document;
     Node* m_previous;
     Node* m_next;
     RenderObject* m_renderer;

diff --git a/Source/WebCore/dom/NodeRareData.h b/Source/WebCore/dom/NodeRareData.h
index b84a4b0..0bdc3e8 100644 (file)
--- a/Source/WebCore/dom/NodeRareData.h
+++ b/Source/WebCore/dom/NodeRareData.h
@@ -184,7 +184,8 @@ class NodeRareData {
     WTF_MAKE_NONCOPYABLE(NodeRareData); WTF_MAKE_FAST_ALLOCATED;
 public:    
     NodeRareData()
-        : m_childNodeList(0)
+        : m_treeScope(0)
+        , m_childNodeList(0)
         , m_tabIndex(0)
         , m_tabIndexWasSetExplicitly(false)
         , m_isFocused(false)
@@ -212,6 +213,9 @@ public:
         return rareDataMap().get(node);
     }
 
+    TreeScope* treeScope() const { return m_treeScope; }
+    void setTreeScope(TreeScope* treeScope) { m_treeScope = treeScope; }
+    
     void clearNodeLists() { m_nodeLists.clear(); }
     void setNodeLists(PassOwnPtr<NodeListsNodeData> lists) { m_nodeLists = lists; }
     NodeListsNodeData* nodeLists() const { return m_nodeLists.get(); }
@@ -345,6 +349,7 @@ protected:
 
 private:
 
+    TreeScope* m_treeScope;
     OwnPtr<NodeListsNodeData> m_nodeLists;
     ChildNodeList* m_childNodeList;
     OwnPtr<EventTargetData> m_eventTargetData;

diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp
index b586687..67bb861 100644 (file)
--- a/Source/WebCore/dom/ShadowRoot.cpp
+++ b/Source/WebCore/dom/ShadowRoot.cpp
@@ -46,7 +46,7 @@ namespace WebCore {
 
 ShadowRoot::ShadowRoot(Document* document)
     : DocumentFragment(document, CreateShadowRoot)
-    , TreeScope(this, document)
+    , TreeScope(this)
     , m_prev(0)
     , m_next(0)
     , m_applyAuthorStyles(false)
@@ -55,9 +55,11 @@ ShadowRoot::ShadowRoot(Document* document)
 {
     ASSERT(document);
     
+    // Assume document as parent scope.
+    setParentTreeScope(document);
     // Shadow tree scopes have the scope pointer point to themselves.
     // This way, direct children will receive the correct scope pointer.
-    setTreeScope(this);
+    ensureRareData()->setTreeScope(this);
 }
 
 ShadowRoot::~ShadowRoot()

diff --git a/Source/WebCore/dom/TreeScope.cpp b/Source/WebCore/dom/TreeScope.cpp
index 3ec5e3c..d3774ae 100644 (file)
--- a/Source/WebCore/dom/TreeScope.cpp
+++ b/Source/WebCore/dom/TreeScope.cpp
@@ -52,22 +52,14 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
-TreeScope::TreeScope(ContainerNode* rootNode, Document* rootDocument)
+TreeScope::TreeScope(ContainerNode* rootNode)
     : m_rootNode(rootNode)
-    , m_rootDocument(rootDocument)
-    , m_parentTreeScope(rootNode == rootDocument ? 0 : rootDocument)
+    , m_parentTreeScope(0)
     , m_idTargetObserverRegistry(IdTargetObserverRegistry::create())
 {
     ASSERT(rootNode);
 }
 
-TreeScope::TreeScope()
-    : m_rootNode(0)
-    , m_rootDocument(0)
-    , m_parentTreeScope(0)
-{
-}
-
 TreeScope::~TreeScope()
 {
     if (m_selection) {
@@ -90,7 +82,6 @@ void TreeScope::setParentTreeScope(TreeScope* newParentScope)
     ASSERT(newParentScope);
 
     m_parentTreeScope = newParentScope;
-    m_rootDocument = newParentScope->rootDocument();
 }
 
 Element* TreeScope::getElementById(const AtomicString& elementId) const
@@ -257,11 +248,6 @@ Node* TreeScope::focusedNode()
     return 0;
 }
 
-bool TreeScope::isDocumentScope() const
-{
-    return this == m_rootDocument;
-}
-
 static void listTreeScopes(Node* node, Vector<TreeScope*, 5>& treeScopes)
 {
     while (true) {
@@ -295,11 +281,5 @@ TreeScope* commonTreeScope(Node* nodeA, Node* nodeB)
     return treeScopesA[indexA] == treeScopesB[indexB] ? treeScopesA[indexA] : 0;
 }
 
-TreeScope* TreeScope::nullInstance()
-{
-    DEFINE_STATIC_LOCAL(TreeScope, instance, ());
-    return &instance;
-}
-
 } // namespace WebCore
 

diff --git a/Source/WebCore/dom/TreeScope.h b/Source/WebCore/dom/TreeScope.h
index f933c6f..841bbb6 100644 (file)
--- a/Source/WebCore/dom/TreeScope.h
+++ b/Source/WebCore/dom/TreeScope.h
@@ -34,7 +34,6 @@ namespace WebCore {
 
 class ContainerNode;
 class DOMSelection;
-class Document;
 class Element;
 class HTMLMapElement;
 class IdTargetObserverRegistry;
@@ -79,23 +78,17 @@ public:
     void adoptIfNeeded(Node*);
 
     ContainerNode* rootNode() const { return m_rootNode; }
-    Document* rootDocument() const { return m_rootDocument; }
-    bool isDocumentScope() const;
-    IdTargetObserverRegistry& idTargetObserverRegistry() const { return *m_idTargetObserverRegistry.get(); }
 
-    static TreeScope* nullInstance();
+    IdTargetObserverRegistry& idTargetObserverRegistry() const { return *m_idTargetObserverRegistry.get(); }
 
 protected:
-    TreeScope(ContainerNode*, Document*);
+    TreeScope(ContainerNode*);
     virtual ~TreeScope();
 
     void destroyTreeScopeData();
 
 private:
-    TreeScope();
-
     ContainerNode* m_rootNode;
-    Document* m_rootDocument;
     TreeScope* m_parentTreeScope;
 
     DocumentOrderedMap m_elementsById;

diff --git a/Source/WebCore/dom/TreeScopeAdopter.cpp b/Source/WebCore/dom/TreeScopeAdopter.cpp
index 1dfb5ce..3601e08 100644 (file)
--- a/Source/WebCore/dom/TreeScopeAdopter.cpp
+++ b/Source/WebCore/dom/TreeScopeAdopter.cpp
@@ -49,9 +49,7 @@ void TreeScopeAdopter::moveTreeToNewScope(Node* root) const
         oldDocument->incDOMTreeVersion();
 
     for (Node* node = root; node; node = node->traverseNextNode(root)) {
-        node->setTreeScope(m_newScope);
-        if (node->hasRareData()) {
-            NodeRareData* rareData = node->rareData();
+        if (NodeRareData* rareData = node->setTreeScope(newDocument == m_newScope ? 0 : m_newScope)) {
             if (rareData->nodeLists())
                 rareData->nodeLists()->adoptTreeScope(oldDocument, newDocument);
             if (node->isElementNode())
@@ -98,6 +96,8 @@ inline void TreeScopeAdopter::moveNodeToNewDocument(Node* node, Document* oldDoc
     if (oldDocument)
         oldDocument->moveNodeIteratorsToNewDocument(node, newDocument);
 
+    node->setDocument(newDocument);
+
 #ifndef NDEBUG
     didMoveToNewDocumentWasCalled = false;
     oldDocumentDidMoveToNewDocumentWasCalledWith = oldDocument;

diff --git a/Source/WebCore/editing/MoveSelectionCommand.cpp b/Source/WebCore/editing/MoveSelectionCommand.cpp
index 5bf5454..5a2143c 100644 (file)
--- a/Source/WebCore/editing/MoveSelectionCommand.cpp
+++ b/Source/WebCore/editing/MoveSelectionCommand.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "MoveSelectionCommand.h"
 
-#include "Document.h"
 #include "DocumentFragment.h"
 #include "ReplaceSelectionCommand.h"
 

diff --git a/Source/WebCore/editing/RemoveNodeCommand.cpp b/Source/WebCore/editing/RemoveNodeCommand.cpp
index 8be2070..19657ac 100644 (file)
--- a/Source/WebCore/editing/RemoveNodeCommand.cpp
+++ b/Source/WebCore/editing/RemoveNodeCommand.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "RemoveNodeCommand.h"
 
-#include "Document.h"
 #include "Node.h"
 #include <wtf/Assertions.h>
 

diff --git a/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp b/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp
index 281fdbd..1452f88 100644 (file)
--- a/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp
+++ b/Source/WebCore/editing/RemoveNodePreservingChildrenCommand.cpp
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "RemoveNodePreservingChildrenCommand.h"
 
-#include "Document.h"
 #include "Node.h"
 #include <wtf/Assertions.h>
 

diff --git a/Source/WebCore/inspector/PageConsoleAgent.cpp b/Source/WebCore/inspector/PageConsoleAgent.cpp
index b0d5275..f55dda5 100644 (file)
--- a/Source/WebCore/inspector/PageConsoleAgent.cpp
+++ b/Source/WebCore/inspector/PageConsoleAgent.cpp
@@ -35,7 +35,6 @@
 #include "PageConsoleAgent.h"
 
 #include "DOMWindow.h"
-#include "Document.h"
 #include "InjectedScriptHost.h"
 #include "InjectedScriptManager.h"
 #include "InspectorAgent.h"

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 56109ef..0e24cd5 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2012-07-23  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r123184, r123195, and r123197.
+        http://trac.webkit.org/changeset/123184
+        http://trac.webkit.org/changeset/123195
+        http://trac.webkit.org/changeset/123197
+        https://bugs.webkit.org/show_bug.cgi?id=92049
+
+        pagecycler regression (Requested by morrita on #webkit).
+
+        * win/WebKit2.def:
+        * win/WebKit2CFLite.def:
+
 2012-07-23  Simon Fraser  <simon.fraser@apple.com>
 
         Part 2 of: Implement sticky positioning

diff --git a/Source/WebKit2/win/WebKit2.def b/Source/WebKit2/win/WebKit2.def
index d8e0a6f..5637580 100644 (file)
--- a/Source/WebKit2/win/WebKit2.def
+++ b/Source/WebKit2/win/WebKit2.def
@@ -253,7 +253,6 @@ EXPORTS
         ??1ContextDestructionObserver@WebCore@@MAE@XZ
         ?contextDestroyed@ContextDestructionObserver@WebCore@@UAEXXZ
         ??0ContextDestructionObserver@WebCore@@QAE@PAVScriptExecutionContext@1@@Z
-        ?nullInstance@TreeScope@WebCore@@SAPAV12@XZ
         ?nodesFromRect@Document@WebCore@@QBE?AV?$PassRefPtr@VNodeList@WebCore@@@WTF@@HHIIII_N0@Z
         ?selectionStartHasMarkerFor@Editor@WebCore@@QBE_NW4MarkerType@DocumentMarker@2@HH@Z
         ?webkitWillEnterFullScreenForElement@Document@WebCore@@QAEXPAVElement@2@@Z

diff --git a/Source/WebKit2/win/WebKit2CFLite.def b/Source/WebKit2/win/WebKit2CFLite.def
index 32f4e87..0e5d1b2 100644 (file)
--- a/Source/WebKit2/win/WebKit2CFLite.def
+++ b/Source/WebKit2/win/WebKit2CFLite.def
@@ -246,7 +246,6 @@ EXPORTS
         ?userPreferredLanguages@WebCore@@YA?AV?$Vector@VString@WTF@@$0A@@WTF@@XZ
         ?utf8@String@WTF@@QBE?AVCString@2@_N@Z
         ?view@Document@WebCore@@QBEPAVFrameView@2@XZ
-        ?nullInstance@TreeScope@WebCore@@SAPAV12@XZ
         ?nodesFromRect@Document@WebCore@@QBE?AV?$PassRefPtr@VNodeList@WebCore@@@WTF@@HHIIII_N0@Z
         ?selectionStartHasMarkerFor@Editor@WebCore@@QBE_NW4MarkerType@DocumentMarker@2@HH@Z
         ?restrictScaleFactorToInitialScaleIfNotUserScalable@WebCore@@YAXAAUViewportAttributes@1@@Z

diff --git a/Source/autotools/symbols.filter b/Source/autotools/symbols.filter
index 08b2664..5def474 100644 (file)
--- a/Source/autotools/symbols.filter
+++ b/Source/autotools/symbols.filter
@@ -167,7 +167,6 @@ _ZNK7WebCore14InsertionPoint8isActiveEv;
 _ZN7WebCore26ContextDestructionObserverD2Ev;
 _ZN7WebCore26ContextDestructionObserverC2EPNS_22ScriptExecutionContextE;
 _ZN7WebCore26ContextDestructionObserver16contextDestroyedEv;
-_ZN7WebCore9TreeScope12nullInstanceEv;
 local:
 _Z*;
 cti*;