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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 1596573002: Remove extra calls of didMeaningfulLayout() during the same navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests Created 4 years, 11 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 } 474 }
475 475
476 void FrameLoaderClientImpl::dispatchDidChangeIcons(IconType type) 476 void FrameLoaderClientImpl::dispatchDidChangeIcons(IconType type)
477 { 477 {
478 if (m_webFrame->client()) 478 if (m_webFrame->client())
479 m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL:: Type>(type)); 479 m_webFrame->client()->didChangeIcon(m_webFrame, static_cast<WebIconURL:: Type>(type));
480 } 480 }
481 481
482 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm itType commitType) 482 void FrameLoaderClientImpl::dispatchDidCommitLoad(HistoryItem* item, HistoryComm itType commitType)
483 { 483 {
484 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, false); 484 if (!m_webFrame->parent()) {
485 m_webFrame->viewImpl()->didCommitLoad(commitType == StandardCommit, fals e);
486 }
485 487
486 // Save some histogram data so we can compute the average memory used per 488 // Save some histogram data so we can compute the average memory used per
487 // page load of the glyphs. 489 // page load of the glyphs.
488 // TODO(esprehn): Is this ancient uma actually useful? 490 // TODO(esprehn): Is this ancient uma actually useful?
489 Platform::current()->histogramCustomCounts("Memory.GlyphPagesPerLoad", Glyph PageTreeNode::treeGlyphPageCount(), 1, 10000, 50); 491 Platform::current()->histogramCustomCounts("Memory.GlyphPagesPerLoad", Glyph PageTreeNode::treeGlyphPageCount(), 1, 10000, 50);
490 492
491 if (m_webFrame->client()) 493 if (m_webFrame->client())
492 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte m(item), static_cast<WebHistoryCommitType>(commitType)); 494 m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, WebHistoryIte m(item), static_cast<WebHistoryCommitType>(commitType));
493 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram e->frame()->localFrameRoot())->devToolsAgentImpl(); 495 WebDevToolsAgentImpl* devToolsAgent = WebLocalFrameImpl::fromFrame(m_webFram e->frame()->localFrameRoot())->devToolsAgentImpl();
494 if (devToolsAgent) 496 if (devToolsAgent)
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 1003
1002 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 1004 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
1003 { 1005 {
1004 if (m_webFrame->client()) { 1006 if (m_webFrame->client()) {
1005 m_webFrame->client()->suddenTerminationDisablerChanged( 1007 m_webFrame->client()->suddenTerminationDisablerChanged(
1006 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 1008 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
1007 } 1009 }
1008 } 1010 }
1009 1011
1010 } // namespace blink 1012 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698