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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1449353002: OOPIF: Set timer for per-frame UpdateState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3205 matching lines...) Expand 10 before | Expand all | Expand 10 after
3216 DocumentState::FromDataSource(frame->dataSource()); 3216 DocumentState::FromDataSource(frame->dataSource());
3217 UpdateNavigationState(document_state); 3217 UpdateNavigationState(document_state);
3218 static_cast<NavigationStateImpl*>(document_state->navigation_state()) 3218 static_cast<NavigationStateImpl*>(document_state->navigation_state())
3219 ->set_was_within_same_page(true); 3219 ->set_was_within_same_page(true);
3220 3220
3221 didCommitProvisionalLoad(frame, item, commit_type); 3221 didCommitProvisionalLoad(frame, item, commit_type);
3222 } 3222 }
3223 3223
3224 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) { 3224 void RenderFrameImpl::didUpdateCurrentHistoryItem(blink::WebLocalFrame* frame) {
3225 DCHECK(!frame_ || frame_ == frame); 3225 DCHECK(!frame_ || frame_ == frame);
3226 // TODO(nasko): Move implementation here. Needed methods: 3226 render_view_->StartNavStateSyncTimerIfNecessary(this);
3227 // * StartNavStateSyncTimerIfNecessary
3228 render_view_->didUpdateCurrentHistoryItem(frame);
3229 } 3227 }
3230 3228
3231 void RenderFrameImpl::didChangeThemeColor() { 3229 void RenderFrameImpl::didChangeThemeColor() {
3232 if (frame_->parent()) 3230 if (frame_->parent())
3233 return; 3231 return;
3234 3232
3235 Send(new FrameHostMsg_DidChangeThemeColor( 3233 Send(new FrameHostMsg_DidChangeThemeColor(
3236 routing_id_, frame_->document().themeColor())); 3234 routing_id_, frame_->document().themeColor()));
3237 } 3235 }
3238 3236
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
3693 int world_id) { 3691 int world_id) {
3694 DCHECK(!frame_ || frame_ == frame); 3692 DCHECK(!frame_ || frame_ == frame);
3695 3693
3696 FOR_EACH_OBSERVER(RenderFrameObserver, 3694 FOR_EACH_OBSERVER(RenderFrameObserver,
3697 observers_, 3695 observers_,
3698 WillReleaseScriptContext(context, world_id)); 3696 WillReleaseScriptContext(context, world_id));
3699 } 3697 }
3700 3698
3701 void RenderFrameImpl::didChangeScrollOffset(blink::WebLocalFrame* frame) { 3699 void RenderFrameImpl::didChangeScrollOffset(blink::WebLocalFrame* frame) {
3702 DCHECK(!frame_ || frame_ == frame); 3700 DCHECK(!frame_ || frame_ == frame);
3703 // TODO(nasko): Move implementation here. Needed methods: 3701 render_view_->StartNavStateSyncTimerIfNecessary(this);
3704 // * StartNavStateSyncTimerIfNecessary
3705 render_view_->didChangeScrollOffset(frame);
3706 3702
3707 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeScrollOffset()); 3703 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeScrollOffset());
3708 } 3704 }
3709 3705
3710 void RenderFrameImpl::willInsertBody(blink::WebLocalFrame* frame) { 3706 void RenderFrameImpl::willInsertBody(blink::WebLocalFrame* frame) {
3711 DCHECK(!frame_ || frame_ == frame); 3707 DCHECK(!frame_ || frame_ == frame);
3712 if (!frame->parent()) { 3708 if (!frame->parent()) {
3713 render_view_->Send(new ViewHostMsg_WillInsertBody( 3709 render_view_->Send(new ViewHostMsg_WillInsertBody(
3714 render_view_->GetRoutingID())); 3710 render_view_->GetRoutingID()));
3715 } 3711 }
(...skipping 1695 matching lines...) Expand 10 before | Expand all | Expand 10 after
5411 media::ConvertToSwitchOutputDeviceCB(web_callbacks); 5407 media::ConvertToSwitchOutputDeviceCB(web_callbacks);
5412 scoped_refptr<media::AudioOutputDevice> device = 5408 scoped_refptr<media::AudioOutputDevice> device =
5413 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(), 5409 AudioDeviceFactory::NewOutputDevice(routing_id_, 0, sink_id.utf8(),
5414 security_origin); 5410 security_origin);
5415 media::OutputDeviceStatus status = device->GetDeviceStatus(); 5411 media::OutputDeviceStatus status = device->GetDeviceStatus();
5416 device->Stop(); 5412 device->Stop();
5417 callback.Run(status); 5413 callback.Run(status);
5418 } 5414 }
5419 5415
5420 } // namespace content 5416 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698