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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 161113002: Fix pushState causing stop/reload button and favicon to flicker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/metrics/user_metrics_action.h" 9 #include "base/metrics/user_metrics_action.h"
10 #include "content/browser/frame_host/cross_process_frame_connector.h" 10 #include "content/browser/frame_host/cross_process_frame_connector.h"
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 void RenderFrameHostImpl::SwapOut() { 308 void RenderFrameHostImpl::SwapOut() {
309 if (render_view_host_->IsRenderViewLive()) { 309 if (render_view_host_->IsRenderViewLive()) {
310 Send(new FrameMsg_SwapOut(routing_id_)); 310 Send(new FrameMsg_SwapOut(routing_id_));
311 } else { 311 } else {
312 // Our RenderViewHost doesn't have a live renderer, so just skip the unload 312 // Our RenderViewHost doesn't have a live renderer, so just skip the unload
313 // event. 313 // event.
314 OnSwappedOut(true); 314 OnSwappedOut(true);
315 } 315 }
316 } 316 }
317 317
318 void RenderFrameHostImpl::OnDidStartLoading() { 318 void RenderFrameHostImpl::OnDidStartLoading(bool to_different_document) {
319 delegate_->DidStartLoading(this); 319 delegate_->DidStartLoading(this, to_different_document);
320 } 320 }
321 321
322 void RenderFrameHostImpl::OnDidStopLoading() { 322 void RenderFrameHostImpl::OnDidStopLoading() {
323 delegate_->DidStopLoading(this); 323 delegate_->DidStopLoading(this);
324 } 324 }
325 325
326 void RenderFrameHostImpl::OnSwapOutACK() { 326 void RenderFrameHostImpl::OnSwapOutACK() {
327 OnSwappedOut(false); 327 OnSwappedOut(false);
328 } 328 }
329 329
(...skipping 24 matching lines...) Expand all
354 bool RenderFrameHostImpl::CanCommitURL(const GURL& url) { 354 bool RenderFrameHostImpl::CanCommitURL(const GURL& url) {
355 // TODO(creis): We should also check for WebUI pages here. Also, when the 355 // TODO(creis): We should also check for WebUI pages here. Also, when the
356 // out-of-process iframes implementation is ready, we should check for 356 // out-of-process iframes implementation is ready, we should check for
357 // cross-site URLs that are not allowed to commit in this process. 357 // cross-site URLs that are not allowed to commit in this process.
358 358
359 // Give the client a chance to disallow URLs from committing. 359 // Give the client a chance to disallow URLs from committing.
360 return GetContentClient()->browser()->CanCommitURL(GetProcess(), url); 360 return GetContentClient()->browser()->CanCommitURL(GetProcess(), url);
361 } 361 }
362 362
363 } // namespace content 363 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698