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

Side by Side Diff: Source/WebCore/loader/FrameLoader.cpp

Issue 12703031: Revert 146726 "AXObjectCache gets recreated during document tear..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 years, 9 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 | « Source/WebCore/html/RangeInputType.cpp ('k') | Source/WebCore/page/FocusController.cpp » ('j') | 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) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com>
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
8 * Copyright (C) 2011 Google Inc. All rights reserved. 8 * Copyright (C) 2011 Google Inc. All rights reserved.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoa d); 1113 stateMachine()->advanceTo(FrameLoaderStateMachine::CommittedFirstRealLoa d);
1114 } 1114 }
1115 } 1115 }
1116 1116
1117 void FrameLoader::prepareForLoadStart() 1117 void FrameLoader::prepareForLoadStart()
1118 { 1118 {
1119 m_progressTracker->progressStarted(); 1119 m_progressTracker->progressStarted();
1120 m_client->dispatchDidStartProvisionalLoad(); 1120 m_client->dispatchDidStartProvisionalLoad();
1121 1121
1122 // Notify accessibility. 1122 // Notify accessibility.
1123 if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) { 1123 if (AXObjectCache::accessibilityEnabled()) {
1124 AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadType Reload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted; 1124 AXObjectCache::AXLoadingEvent loadingEvent = loadType() == FrameLoadType Reload ? AXObjectCache::AXLoadingReloaded : AXObjectCache::AXLoadingStarted;
1125 cache->frameLoadingEventNotification(m_frame, loadingEvent); 1125 m_frame->document()->axObjectCache()->frameLoadingEventNotification(m_fr ame, loadingEvent);
1126 } 1126 }
1127 } 1127 }
1128 1128
1129 void FrameLoader::setupForReplace() 1129 void FrameLoader::setupForReplace()
1130 { 1130 {
1131 m_client->revertToProvisionalState(m_documentLoader.get()); 1131 m_client->revertToProvisionalState(m_documentLoader.get());
1132 setState(FrameStateProvisional); 1132 setState(FrameStateProvisional);
1133 m_provisionalDocumentLoader = m_documentLoader; 1133 m_provisionalDocumentLoader = m_documentLoader;
1134 m_documentLoader = 0; 1134 m_documentLoader = 0;
1135 detachChildren(); 1135 detachChildren();
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
2202 2202
2203 if (settings->needsDidFinishLoadOrderQuirk()) { 2203 if (settings->needsDidFinishLoadOrderQuirk()) {
2204 m_progressTracker->progressCompleted(); 2204 m_progressTracker->progressCompleted();
2205 if (Page* page = m_frame->page()) { 2205 if (Page* page = m_frame->page()) {
2206 if (m_frame == page->mainFrame()) 2206 if (m_frame == page->mainFrame())
2207 page->resetRelevantPaintedObjectCounter(); 2207 page->resetRelevantPaintedObjectCounter();
2208 } 2208 }
2209 } 2209 }
2210 2210
2211 // Notify accessibility. 2211 // Notify accessibility.
2212 if (AXObjectCache* cache = m_frame->document()->existingAXObjectCach e()) 2212 if (AXObjectCache::accessibilityEnabled())
2213 cache->frameLoadingEventNotification(m_frame, loadingEvent); 2213 m_frame->document()->axObjectCache()->frameLoadingEventNotificat ion(m_frame, loadingEvent);
2214 2214
2215 return; 2215 return;
2216 } 2216 }
2217 2217
2218 case FrameStateComplete: 2218 case FrameStateComplete:
2219 m_loadType = FrameLoadTypeStandard; 2219 m_loadType = FrameLoadTypeStandard;
2220 frameLoadCompleted(); 2220 frameLoadCompleted();
2221 return; 2221 return;
2222 } 2222 }
2223 2223
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
3433 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3433 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3434 3434
3435 page->chrome()->setWindowRect(newWindowRect); 3435 page->chrome()->setWindowRect(newWindowRect);
3436 page->chrome()->show(); 3436 page->chrome()->show();
3437 3437
3438 created = true; 3438 created = true;
3439 return frame; 3439 return frame;
3440 } 3440 }
3441 3441
3442 } // namespace WebCore 3442 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/html/RangeInputType.cpp ('k') | Source/WebCore/page/FocusController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698