diff options
Diffstat (limited to 'Source/WebCore/dom/ContainerNode.cpp')
| -rw-r--r-- | Source/WebCore/dom/ContainerNode.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/Source/WebCore/dom/ContainerNode.cpp b/Source/WebCore/dom/ContainerNode.cpp index 06aae46e1..a605cd08e 100644 --- a/Source/WebCore/dom/ContainerNode.cpp +++ b/Source/WebCore/dom/ContainerNode.cpp @@ -35,15 +35,16 @@ #include "InlineTextBox.h" #include "InsertionPoint.h" #include "InspectorInstrumentation.h" +#include "LoaderStrategy.h" #include "MemoryCache.h" #include "MutationEvent.h" #include "ResourceLoadScheduler.h" #include "Page.h" +#include "PlatformStrategies.h" #include "RenderBox.h" #include "RenderTheme.h" #include "RenderWidget.h" #include "RootInlineBox.h" -#include "UndoManager.h" #include <wtf/CurrentTime.h> #include <wtf/Vector.h> @@ -343,10 +344,6 @@ static void willRemoveChild(Node* child) ChildListMutationScope(child->parentNode()).willRemoveChild(child); child->notifyMutationObserversNodeWillDetach(); #endif -#if ENABLE(UNDO_MANAGER) - if (UndoManager::isRecordingAutomaticTransaction(child->parentNode())) - UndoManager::addTransactionStep(NodeRemovingDOMTransactionStep::create(child->parentNode(), child)); -#endif dispatchChildRemovalEvents(child); child->document()->nodeWillBeRemoved(child); // e.g. mutation event listener can create a new range. @@ -371,10 +368,6 @@ static void willRemoveChildren(ContainerNode* container) mutation.willRemoveChild(child); child->notifyMutationObserversNodeWillDetach(); #endif -#if ENABLE(UNDO_MANAGER) - if (UndoManager::isRecordingAutomaticTransaction(container)) - UndoManager::addTransactionStep(NodeRemovingDOMTransactionStep::create(container, child)); -#endif // fire removed from document mutation events. dispatchChildRemovalEvents(child); @@ -641,7 +634,11 @@ void ContainerNode::suspendPostAttachCallbacks() s_shouldReEnableMemoryCacheCallsAfterAttach = true; } } +#if USE(PLATFORM_STRATEGIES) + platformStrategies()->loaderStrategy()->resourceLoadScheduler()->suspendPendingRequests(); +#else resourceLoadScheduler()->suspendPendingRequests(); +#endif } ++s_attachDepth; } @@ -658,7 +655,11 @@ void ContainerNode::resumePostAttachCallbacks() if (Page* page = document()->page()) page->setMemoryCacheClientCallsEnabled(true); } +#if USE(PLATFORM_STRATEGIES) + platformStrategies()->loaderStrategy()->resourceLoadScheduler()->resumePendingRequests(); +#else resourceLoadScheduler()->resumePendingRequests(); +#endif } --s_attachDepth; } @@ -1012,11 +1013,6 @@ static void updateTreeAfterInsertion(ContainerNode* parent, Node* child, bool sh ChildListMutationScope(parent).childAdded(child); #endif -#if ENABLE(UNDO_MANAGER) - if (UndoManager::isRecordingAutomaticTransaction(parent)) - UndoManager::addTransactionStep(NodeInsertingDOMTransactionStep::create(parent, child)); -#endif - parent->childrenChanged(false, child->previousSibling(), child->nextSibling(), 1); ChildNodeInsertionNotifier(parent).notify(child); |