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

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

Issue 2896563002: Update WebLocalFrameImpl with WebLocalFrameBase to break dependencies. (Closed)
Patch Set: Rebase Created 3 years, 7 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 18 matching lines...) Expand all
29 */ 29 */
30 30
31 #include "web/FullscreenController.h" 31 #include "web/FullscreenController.h"
32 32
33 #include "core/dom/Document.h" 33 #include "core/dom/Document.h"
34 #include "core/dom/Fullscreen.h" 34 #include "core/dom/Fullscreen.h"
35 #include "core/exported/WebViewBase.h" 35 #include "core/exported/WebViewBase.h"
36 #include "core/frame/FrameView.h" 36 #include "core/frame/FrameView.h"
37 #include "core/frame/LocalFrame.h" 37 #include "core/frame/LocalFrame.h"
38 #include "core/frame/PageScaleConstraintsSet.h" 38 #include "core/frame/PageScaleConstraintsSet.h"
39 #include "core/frame/WebLocalFrameBase.h"
39 #include "core/html/HTMLVideoElement.h" 40 #include "core/html/HTMLVideoElement.h"
40 #include "core/layout/LayoutFullScreen.h" 41 #include "core/layout/LayoutFullScreen.h"
41 #include "core/page/Page.h" 42 #include "core/page/Page.h"
42 #include "public/platform/WebLayerTreeView.h" 43 #include "public/platform/WebLayerTreeView.h"
43 #include "public/web/WebFrameClient.h" 44 #include "public/web/WebFrameClient.h"
44 #include "web/WebLocalFrameImpl.h"
45 45
46 namespace blink { 46 namespace blink {
47 47
48 namespace { 48 namespace {
49 49
50 WebFrameClient& GetWebFrameClient(LocalFrame& frame) { 50 WebFrameClient& GetWebFrameClient(LocalFrame& frame) {
51 WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame); 51 WebLocalFrameBase* web_frame = WebLocalFrameBase::FromFrame(frame);
52 DCHECK(web_frame); 52 DCHECK(web_frame);
53 DCHECK(web_frame->Client()); 53 DCHECK(web_frame->Client());
54 return *web_frame->Client(); 54 return *web_frame->Client();
55 } 55 }
56 56
57 } // anonymous namespace 57 } // anonymous namespace
58 58
59 std::unique_ptr<FullscreenController> FullscreenController::Create( 59 std::unique_ptr<FullscreenController> FullscreenController::Create(
60 WebViewBase* web_view_base) { 60 WebViewBase* web_view_base) {
61 return WTF::WrapUnique(new FullscreenController(web_view_base)); 61 return WTF::WrapUnique(new FullscreenController(web_view_base));
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // again to ensure the final constraints pick up the latest contents size. 286 // again to ensure the final constraints pick up the latest contents size.
287 web_view_base_->DidChangeContentsSize(); 287 web_view_base_->DidChangeContentsSize();
288 if (web_view_base_->MainFrameImpl() && 288 if (web_view_base_->MainFrameImpl() &&
289 web_view_base_->MainFrameImpl()->GetFrameView()) 289 web_view_base_->MainFrameImpl()->GetFrameView())
290 web_view_base_->MainFrameImpl()->GetFrameView()->SetNeedsLayout(); 290 web_view_base_->MainFrameImpl()->GetFrameView()->SetNeedsLayout();
291 291
292 web_view_base_->UpdateMainFrameLayoutSize(); 292 web_view_base_->UpdateMainFrameLayoutSize();
293 } 293 }
294 294
295 } // namespace blink 295 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ExternalPopupMenuTest.cpp ('k') | third_party/WebKit/Source/web/InspectorOverlayAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698