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

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

Issue 2896563002: Update WebLocalFrameImpl with WebLocalFrameBase to break dependencies. (Closed)
Patch Set: Rebase Created 3 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be found 2 // Use of this source code is governed by a BSD-style license that can be found
3 // in the LICENSE file. 3 // in the LICENSE file.
4 4
5 #include "web/WebViewFrameWidget.h" 5 #include "web/WebViewFrameWidget.h"
6 6
7 #include "core/exported/WebViewBase.h" 7 #include "core/exported/WebViewBase.h"
8 #include "core/frame/WebLocalFrameBase.h"
8 #include "core/layout/HitTestResult.h" 9 #include "core/layout/HitTestResult.h"
9 #include "web/WebInputMethodControllerImpl.h" 10 #include "web/WebInputMethodControllerImpl.h"
10 #include "web/WebLocalFrameImpl.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 WebViewFrameWidget::WebViewFrameWidget(WebWidgetClient& client, 14 WebViewFrameWidget::WebViewFrameWidget(WebWidgetClient& client,
15 WebViewBase& web_view, 15 WebViewBase& web_view,
16 WebLocalFrameImpl& main_frame) 16 WebLocalFrameBase& main_frame)
17 : client_(&client), web_view_(&web_view), main_frame_(&main_frame) { 17 : client_(&client), web_view_(&web_view), main_frame_(&main_frame) {
18 main_frame_->SetFrameWidget(this); 18 main_frame_->SetFrameWidget(this);
19 web_view_->SetCompositorVisibility(true); 19 web_view_->SetCompositorVisibility(true);
20 } 20 }
21 21
22 WebViewFrameWidget::~WebViewFrameWidget() {} 22 WebViewFrameWidget::~WebViewFrameWidget() {}
23 23
24 void WebViewFrameWidget::Close() { 24 void WebViewFrameWidget::Close() {
25 // Note: it's important to use the captured main frame pointer here. During 25 // Note: it's important to use the captured main frame pointer here. During
26 // a frame swap, the swapped frame is detached *after* the frame tree is 26 // a frame swap, the swapped frame is detached *after* the frame tree is
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 } 200 }
201 201
202 void WebViewFrameWidget::ClearBaseBackgroundColorOverride() { 202 void WebViewFrameWidget::ClearBaseBackgroundColorOverride() {
203 return web_view_->ClearBaseBackgroundColorOverride(); 203 return web_view_->ClearBaseBackgroundColorOverride();
204 } 204 }
205 205
206 void WebViewFrameWidget::SetBaseBackgroundColor(WebColor color) { 206 void WebViewFrameWidget::SetBaseBackgroundColor(WebColor color) {
207 web_view_->SetBaseBackgroundColor(color); 207 web_view_->SetBaseBackgroundColor(color);
208 } 208 }
209 209
210 WebLocalFrameImpl* WebViewFrameWidget::LocalRoot() const { 210 WebLocalFrameBase* WebViewFrameWidget::LocalRoot() const {
211 return web_view_->MainFrameImpl(); 211 return web_view_->MainFrameImpl();
212 } 212 }
213 213
214 WebInputMethodControllerImpl* 214 WebInputMethodControllerImpl*
215 WebViewFrameWidget::GetActiveWebInputMethodController() const { 215 WebViewFrameWidget::GetActiveWebInputMethodController() const {
216 return web_view_->GetActiveWebInputMethodController(); 216 return web_view_->GetActiveWebInputMethodController();
217 } 217 }
218 218
219 void WebViewFrameWidget::ScheduleAnimation() { 219 void WebViewFrameWidget::ScheduleAnimation() {
220 web_view_->ScheduleAnimationForWidget(); 220 web_view_->ScheduleAnimationForWidget();
(...skipping 23 matching lines...) Expand all
244 244
245 CompositorAnimationHost* WebViewFrameWidget::AnimationHost() const { 245 CompositorAnimationHost* WebViewFrameWidget::AnimationHost() const {
246 return web_view_->AnimationHost(); 246 return web_view_->AnimationHost();
247 } 247 }
248 248
249 HitTestResult WebViewFrameWidget::CoreHitTestResultAt(const WebPoint& point) { 249 HitTestResult WebViewFrameWidget::CoreHitTestResultAt(const WebPoint& point) {
250 return web_view_->CoreHitTestResultAt(point); 250 return web_view_->CoreHitTestResultAt(point);
251 } 251 }
252 252
253 } // namespace blink 253 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewFrameWidget.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698