| OLD | NEW |
| 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 Loading... |
| 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 |
| OLD | NEW |