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

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

Issue 9963064: Merge 112051 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 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
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 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 } 725 }
726 } 726 }
727 resourceLoadScheduler()->suspendPendingRequests(); 727 resourceLoadScheduler()->suspendPendingRequests();
728 } 728 }
729 ++s_attachDepth; 729 ++s_attachDepth;
730 } 730 }
731 731
732 void ContainerNode::resumePostAttachCallbacks() 732 void ContainerNode::resumePostAttachCallbacks()
733 { 733 {
734 if (s_attachDepth == 1) { 734 if (s_attachDepth == 1) {
735 RefPtr<ContainerNode> protect(this);
736
735 if (s_postAttachCallbackQueue) 737 if (s_postAttachCallbackQueue)
736 dispatchPostAttachCallbacks(); 738 dispatchPostAttachCallbacks();
737 if (s_shouldReEnableMemoryCacheCallsAfterAttach) { 739 if (s_shouldReEnableMemoryCacheCallsAfterAttach) {
738 s_shouldReEnableMemoryCacheCallsAfterAttach = false; 740 s_shouldReEnableMemoryCacheCallsAfterAttach = false;
739 if (Page* page = document()->page()) 741 if (Page* page = document()->page())
740 page->setMemoryCacheClientCallsEnabled(true); 742 page->setMemoryCacheClientCallsEnabled(true);
741 } 743 }
742 resourceLoadScheduler()->resumePendingRequests(); 744 resourceLoadScheduler()->resumePendingRequests();
743 } 745 }
744 --s_attachDepth; 746 --s_attachDepth;
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 if (!document()->hasListenerType(Document::BEFORELOAD_LISTENER)) 1190 if (!document()->hasListenerType(Document::BEFORELOAD_LISTENER))
1189 return true; 1191 return true;
1190 1192
1191 RefPtr<ContainerNode> protector(this); 1193 RefPtr<ContainerNode> protector(this);
1192 RefPtr<BeforeLoadEvent> beforeLoadEvent = BeforeLoadEvent::create(sourceURL) ; 1194 RefPtr<BeforeLoadEvent> beforeLoadEvent = BeforeLoadEvent::create(sourceURL) ;
1193 dispatchEvent(beforeLoadEvent.get()); 1195 dispatchEvent(beforeLoadEvent.get());
1194 return !beforeLoadEvent->defaultPrevented(); 1196 return !beforeLoadEvent->defaultPrevented();
1195 } 1197 }
1196 1198
1197 } // namespace WebCore 1199 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/plugins/object-onfocus-mutation-crash-expected.txt ('k') | Source/WebCore/html/HTMLPlugInImageElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698