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

Side by Side Diff: sky/engine/core/css/MediaValues.cpp

Issue 1215103007: Remove remaining HTML elements (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 "sky/engine/core/css/MediaValues.h" 5 #include "sky/engine/core/css/MediaValues.h"
6 6
7 #include "sky/engine/core/css/CSSHelper.h" 7 #include "sky/engine/core/css/CSSHelper.h"
8 #include "sky/engine/core/css/MediaValuesCached.h" 8 #include "sky/engine/core/css/MediaValuesCached.h"
9 #include "sky/engine/core/css/MediaValuesDynamic.h" 9 #include "sky/engine/core/css/MediaValuesDynamic.h"
10 #include "sky/engine/core/dom/Document.h" 10 #include "sky/engine/core/dom/Document.h"
11 #include "sky/engine/core/dom/Element.h" 11 #include "sky/engine/core/dom/Element.h"
12 #include "sky/engine/core/frame/FrameHost.h" 12 #include "sky/engine/core/frame/FrameHost.h"
13 #include "sky/engine/core/frame/FrameView.h" 13 #include "sky/engine/core/frame/FrameView.h"
14 #include "sky/engine/core/frame/LocalFrame.h" 14 #include "sky/engine/core/frame/LocalFrame.h"
15 #include "sky/engine/core/frame/Settings.h" 15 #include "sky/engine/core/frame/Settings.h"
16 #include "sky/engine/core/html/imports/HTMLImportsController.h"
17 #include "sky/engine/core/page/Page.h" 16 #include "sky/engine/core/page/Page.h"
18 #include "sky/engine/core/rendering/RenderObject.h" 17 #include "sky/engine/core/rendering/RenderObject.h"
19 #include "sky/engine/core/rendering/RenderView.h" 18 #include "sky/engine/core/rendering/RenderView.h"
20 #include "sky/engine/core/rendering/style/RenderStyle.h" 19 #include "sky/engine/core/rendering/style/RenderStyle.h"
21 #include "sky/engine/platform/PlatformScreen.h" 20 #include "sky/engine/platform/PlatformScreen.h"
22 21
23 namespace blink { 22 namespace blink {
24 23
25 PassRefPtr<MediaValues> MediaValues::createDynamicIfFrameExists(LocalFrame* fram e) 24 PassRefPtr<MediaValues> MediaValues::createDynamicIfFrameExists(LocalFrame* fram e)
26 { 25 {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return false; 181 return false;
183 } 182 }
184 183
185 ASSERT(factor > 0); 184 ASSERT(factor > 0);
186 result = value * factor; 185 result = value * factor;
187 return true; 186 return true;
188 } 187 }
189 188
190 LocalFrame* MediaValues::frameFrom(Document& document) 189 LocalFrame* MediaValues::frameFrom(Document& document)
191 { 190 {
192 Document* executingDocument = document.importsController() ? document.import sController()->master() : &document; 191 return document.frame();
193 ASSERT(executingDocument);
194 return executingDocument->frame();
195 } 192 }
196 193
197 } // namespace 194 } // namespace
OLDNEW
« no previous file with comments | « sky/engine/core/css/CSSStyleSheet.cpp ('k') | sky/engine/core/css/parser/MediaQueryInputStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698