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

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

Issue 2652643004: Make PageScaleFactor work for oopif subframes.
Patch Set: Fix patch gardening error: GesturePinch routing tests. Created 3 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
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4497 matching lines...) Expand 10 before | Expand all | Expand 10 after
4508 } 4508 }
4509 4509
4510 void RenderFrameImpl::didChangeScrollOffset(blink::WebLocalFrame* frame) { 4510 void RenderFrameImpl::didChangeScrollOffset(blink::WebLocalFrame* frame) {
4511 DCHECK_EQ(frame_, frame); 4511 DCHECK_EQ(frame_, frame);
4512 render_view_->StartNavStateSyncTimerIfNecessary(this); 4512 render_view_->StartNavStateSyncTimerIfNecessary(this);
4513 4513
4514 for (auto& observer : observers_) 4514 for (auto& observer : observers_)
4515 observer.DidChangeScrollOffset(); 4515 observer.DidChangeScrollOffset();
4516 } 4516 }
4517 4517
4518 void RenderFrameImpl::didRestorePageScaleFactorOnLoad(float page_scale) {
4519 // Notify the web contents so it can update cross-process frames.
4520 Send(new FrameHostMsg_RestorePageScaleFactorOnLoad(routing_id_, page_scale));
4521 }
4522
4518 void RenderFrameImpl::willInsertBody(blink::WebLocalFrame* frame) { 4523 void RenderFrameImpl::willInsertBody(blink::WebLocalFrame* frame) {
4519 DCHECK(!frame_ || frame_ == frame); 4524 DCHECK(!frame_ || frame_ == frame);
4520 if (!frame->parent()) { 4525 if (!frame->parent()) {
4521 render_view_->Send(new ViewHostMsg_WillInsertBody( 4526 render_view_->Send(new ViewHostMsg_WillInsertBody(
4522 render_view_->GetRoutingID())); 4527 render_view_->GetRoutingID()));
4523 } 4528 }
4524 } 4529 }
4525 4530
4526 void RenderFrameImpl::reportFindInPageMatchCount(int request_id, 4531 void RenderFrameImpl::reportFindInPageMatchCount(int request_id,
4527 int count, 4532 int count,
(...skipping 2351 matching lines...) Expand 10 before | Expand all | Expand 10 after
6879 // event target. Potentially a Pepper plugin will receive the event. 6884 // event target. Potentially a Pepper plugin will receive the event.
6880 // In order to tell whether a plugin gets the last mouse event and which it 6885 // In order to tell whether a plugin gets the last mouse event and which it
6881 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6886 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6882 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6887 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6883 // |pepper_last_mouse_event_target_|. 6888 // |pepper_last_mouse_event_target_|.
6884 pepper_last_mouse_event_target_ = nullptr; 6889 pepper_last_mouse_event_target_ = nullptr;
6885 #endif 6890 #endif
6886 } 6891 }
6887 6892
6888 } // namespace content 6893 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698