Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Side by Side Diff: Source/WebCore/dom/Node.cpp

Issue 12087060: Merge 139806 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/accessibility/crash-adopt-node-from-new-document-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 2081 matching lines...) Expand 10 before | Expand all | Expand 10 after
2092 2092
2093 ScriptExecutionContext* Node::scriptExecutionContext() const 2093 ScriptExecutionContext* Node::scriptExecutionContext() const
2094 { 2094 {
2095 return document(); 2095 return document();
2096 } 2096 }
2097 2097
2098 void Node::didMoveToNewDocument(Document* oldDocument) 2098 void Node::didMoveToNewDocument(Document* oldDocument)
2099 { 2099 {
2100 TreeScopeAdopter::ensureDidMoveToNewDocumentWasCalled(oldDocument); 2100 TreeScopeAdopter::ensureDidMoveToNewDocumentWasCalled(oldDocument);
2101 2101
2102 if (AXObjectCache::accessibilityEnabled() && oldDocument && oldDocument->axO bjectCacheExists())
2103 oldDocument->axObjectCache()->remove(this);
2104
2102 // FIXME: Event listener types for this node should be set on the new owner document here. 2105 // FIXME: Event listener types for this node should be set on the new owner document here.
2103 2106
2104 const EventListenerVector& wheelListeners = getEventListeners(eventNames().m ousewheelEvent); 2107 const EventListenerVector& wheelListeners = getEventListeners(eventNames().m ousewheelEvent);
2105 for (size_t i = 0; i < wheelListeners.size(); ++i) { 2108 for (size_t i = 0; i < wheelListeners.size(); ++i) {
2106 oldDocument->didRemoveWheelEventHandler(); 2109 oldDocument->didRemoveWheelEventHandler();
2107 document()->didAddWheelEventHandler(); 2110 document()->didAddWheelEventHandler();
2108 } 2111 }
2109 2112
2110 Vector<AtomicString> touchEventNames = eventNames().touchEventNames(); 2113 Vector<AtomicString> touchEventNames = eventNames().touchEventNames();
2111 for (size_t i = 0; i < touchEventNames.size(); ++i) { 2114 for (size_t i = 0; i < touchEventNames.size(); ++i) {
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
2678 node->showTreeForThis(); 2681 node->showTreeForThis();
2679 } 2682 }
2680 2683
2681 void showNodePath(const WebCore::Node* node) 2684 void showNodePath(const WebCore::Node* node)
2682 { 2685 {
2683 if (node) 2686 if (node)
2684 node->showNodePathForThis(); 2687 node->showNodePathForThis();
2685 } 2688 }
2686 2689
2687 #endif 2690 #endif
OLDNEW
« no previous file with comments | « LayoutTests/accessibility/crash-adopt-node-from-new-document-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698