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

Side by Side Diff: Source/core/css/MediaValues.cpp

Issue 1260403002: Oilpan: Remove raw pointer to LocalFrame from MediaValuesDynamic (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "config.h" 5 #include "config.h"
6 #include "core/css/MediaValues.h" 6 #include "core/css/MediaValues.h"
7 7
8 #include "core/css/CSSHelper.h" 8 #include "core/css/CSSHelper.h"
9 #include "core/css/MediaValuesCached.h" 9 #include "core/css/MediaValuesCached.h"
10 #include "core/css/MediaValuesDynamic.h" 10 #include "core/css/MediaValuesDynamic.h"
11 #include "core/dom/Document.h" 11 #include "core/dom/Document.h"
12 #include "core/dom/Element.h" 12 #include "core/dom/Element.h"
13 #include "core/frame/FrameHost.h" 13 #include "core/frame/FrameHost.h"
14 #include "core/frame/FrameView.h" 14 #include "core/frame/FrameView.h"
15 #include "core/frame/LocalFrame.h" 15 #include "core/frame/LocalFrame.h"
16 #include "core/frame/Settings.h" 16 #include "core/frame/Settings.h"
17 #include "core/html/imports/HTMLImportsController.h" 17 #include "core/html/imports/HTMLImportsController.h"
18 #include "core/layout/LayoutObject.h" 18 #include "core/layout/LayoutObject.h"
19 #include "core/layout/LayoutView.h" 19 #include "core/layout/LayoutView.h"
20 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 20 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
21 #include "core/page/ChromeClient.h" 21 #include "core/page/ChromeClient.h"
22 #include "core/page/Page.h" 22 #include "core/page/Page.h"
23 #include "core/style/ComputedStyle.h" 23 #include "core/style/ComputedStyle.h"
24 #include "public/platform/WebScreenInfo.h" 24 #include "public/platform/WebScreenInfo.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 PassRefPtr<MediaValues> MediaValues::createDynamicIfFrameExists(LocalFrame* fram e) 28 PassRefPtrWillBeRawPtr<MediaValues> MediaValues::createDynamicIfFrameExists(Loca lFrame* frame)
29 { 29 {
30 if (frame) 30 if (frame)
31 return MediaValuesDynamic::create(frame); 31 return MediaValuesDynamic::create(frame);
32 return MediaValuesCached::create(); 32 return MediaValuesCached::create();
33 } 33 }
34 34
35 int MediaValues::calculateViewportWidth(LocalFrame* frame) const 35 int MediaValues::calculateViewportWidth(LocalFrame* frame) const
36 { 36 {
37 ASSERT(frame && frame->view() && frame->document()); 37 ASSERT(frame && frame->view() && frame->document());
38 int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width(); 38 int viewportWidth = frame->view()->layoutSize(IncludeScrollbars).width();
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 217 }
218 218
219 LocalFrame* MediaValues::frameFrom(Document& document) 219 LocalFrame* MediaValues::frameFrom(Document& document)
220 { 220 {
221 Document* executingDocument = document.importsController() ? document.import sController()->master() : &document; 221 Document* executingDocument = document.importsController() ? document.import sController()->master() : &document;
222 ASSERT(executingDocument); 222 ASSERT(executingDocument);
223 return executingDocument->frame(); 223 return executingDocument->frame();
224 } 224 }
225 225
226 } // namespace 226 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698