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

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

Issue 12340046: Merge 143363 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
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 | « no previous file | Source/WebCore/page/FeatureObserver.h » ('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 3249 matching lines...) Expand 10 before | Expand all | Expand 10 after
3260 return; 3260 return;
3261 3261
3262 m_client->dispatchDidCommitLoad(); 3262 m_client->dispatchDidCommitLoad();
3263 3263
3264 if (isLoadingMainFrame()) { 3264 if (isLoadingMainFrame()) {
3265 m_frame->page()->resetSeenPlugins(); 3265 m_frame->page()->resetSeenPlugins();
3266 m_frame->page()->resetSeenMediaEngines(); 3266 m_frame->page()->resetSeenMediaEngines();
3267 } 3267 }
3268 3268
3269 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get()); 3269 InspectorInstrumentation::didCommitLoad(m_frame, m_documentLoader.get());
3270
3271 if (m_frame->page()->mainFrame() == m_frame)
3272 m_frame->page()->featureObserver()->didCommitLoad();
3273
3270 } 3274 }
3271 3275
3272 void FrameLoader::tellClientAboutPastMemoryCacheLoads() 3276 void FrameLoader::tellClientAboutPastMemoryCacheLoads()
3273 { 3277 {
3274 ASSERT(m_frame->page()); 3278 ASSERT(m_frame->page());
3275 ASSERT(m_frame->page()->areMemoryCacheClientCallsEnabled()); 3279 ASSERT(m_frame->page()->areMemoryCacheClientCallsEnabled());
3276 3280
3277 if (!m_documentLoader) 3281 if (!m_documentLoader)
3278 return; 3282 return;
3279 3283
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
3398 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); 3402 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
3399 3403
3400 page->chrome()->setWindowRect(newWindowRect); 3404 page->chrome()->setWindowRect(newWindowRect);
3401 page->chrome()->show(); 3405 page->chrome()->show();
3402 3406
3403 created = true; 3407 created = true;
3404 return frame; 3408 return frame;
3405 } 3409 }
3406 3410
3407 } // namespace WebCore 3411 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/page/FeatureObserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698