Chromium Code Reviews| 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/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/css/MediaValues.h" | 6 #include "sky/engine/core/css/MediaValues.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/css/CSSHelper.h" | 8 #include "sky/engine/core/css/CSSHelper.h" |
| 9 #include "sky/engine/core/css/MediaValuesCached.h" | 9 #include "sky/engine/core/css/MediaValuesCached.h" |
| 10 #include "sky/engine/core/css/MediaValuesDynamic.h" | 10 #include "sky/engine/core/css/MediaValuesDynamic.h" |
| 11 #include "sky/engine/core/dom/Document.h" | 11 #include "sky/engine/core/dom/Document.h" |
| 12 #include "sky/engine/core/dom/Element.h" | 12 #include "sky/engine/core/dom/Element.h" |
| 13 #include "sky/engine/core/frame/FrameHost.h" | 13 #include "sky/engine/core/frame/FrameHost.h" |
| 14 #include "sky/engine/core/frame/FrameView.h" | 14 #include "sky/engine/core/frame/FrameView.h" |
| 15 #include "sky/engine/core/frame/LocalFrame.h" | 15 #include "sky/engine/core/frame/LocalFrame.h" |
| 16 #include "sky/engine/core/frame/Settings.h" | 16 #include "sky/engine/core/frame/Settings.h" |
| 17 #include "sky/engine/core/html/imports/HTMLImportsController.h" | 17 #include "sky/engine/core/html/imports/HTMLImportsController.h" |
| 18 #include "sky/engine/core/page/Page.h" | 18 #include "sky/engine/core/page/Page.h" |
| 19 #include "sky/engine/core/rendering/RenderObject.h" | 19 #include "sky/engine/core/rendering/RenderObject.h" |
| 20 #include "sky/engine/core/rendering/RenderView.h" | 20 #include "sky/engine/core/rendering/RenderView.h" |
| 21 #include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h" | |
| 22 #include "sky/engine/core/rendering/style/RenderStyle.h" | 21 #include "sky/engine/core/rendering/style/RenderStyle.h" |
| 23 #include "sky/engine/platform/PlatformScreen.h" | 22 #include "sky/engine/platform/PlatformScreen.h" |
| 24 | 23 |
| 25 namespace blink { | 24 namespace blink { |
| 26 | 25 |
| 27 PassRefPtr<MediaValues> MediaValues::createDynamicIfFrameExists(LocalFrame* fram e) | 26 PassRefPtr<MediaValues> MediaValues::createDynamicIfFrameExists(LocalFrame* fram e) |
| 28 { | 27 { |
| 29 if (frame) | 28 if (frame) |
| 30 return MediaValuesDynamic::create(frame); | 29 return MediaValuesDynamic::create(frame); |
| 31 return MediaValuesCached::create(); | 30 return MediaValuesCached::create(); |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 const String MediaValues::calculateMediaType(LocalFrame* frame) const | 91 const String MediaValues::calculateMediaType(LocalFrame* frame) const |
| 93 { | 92 { |
| 94 ASSERT(frame); | 93 ASSERT(frame); |
| 95 if (!frame->view()) | 94 if (!frame->view()) |
| 96 return emptyAtom; | 95 return emptyAtom; |
| 97 return frame->view()->mediaType(); | 96 return frame->view()->mediaType(); |
| 98 } | 97 } |
| 99 | 98 |
| 100 bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const | 99 bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const |
| 101 { | 100 { |
| 102 ASSERT(frame && frame->contentRenderer() && frame->contentRenderer()->compos itor()); | 101 // FIXME(sky): Remove |
| 103 bool threeDEnabled = false; | 102 return true; |
|
ojan
2014/11/26 19:38:51
I'm not sure if this should be returning true or f
abarth-chromium
2014/11/26 19:48:36
Yeah.
abarth-chromium
2014/11/26 19:48:58
We should probably return false for now and change
ojan
2014/11/26 23:13:03
Done
| |
| 104 if (RenderView* view = frame->contentRenderer()) | |
| 105 threeDEnabled = view->compositor()->hasAcceleratedCompositing(); | |
| 106 return threeDEnabled; | |
| 107 } | 103 } |
| 108 | 104 |
| 109 PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame) const | 105 PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame) const |
| 110 { | 106 { |
| 111 ASSERT(frame && frame->settings()); | 107 ASSERT(frame && frame->settings()); |
| 112 return frame->settings()->primaryPointerType(); | 108 return frame->settings()->primaryPointerType(); |
| 113 } | 109 } |
| 114 | 110 |
| 115 int MediaValues::calculateAvailablePointerTypes(LocalFrame* frame) const | 111 int MediaValues::calculateAvailablePointerTypes(LocalFrame* frame) const |
| 116 { | 112 { |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 194 } | 190 } |
| 195 | 191 |
| 196 LocalFrame* MediaValues::frameFrom(Document& document) | 192 LocalFrame* MediaValues::frameFrom(Document& document) |
| 197 { | 193 { |
| 198 Document* executingDocument = document.importsController() ? document.import sController()->master() : &document; | 194 Document* executingDocument = document.importsController() ? document.import sController()->master() : &document; |
| 199 ASSERT(executingDocument); | 195 ASSERT(executingDocument); |
| 200 return executingDocument->frame(); | 196 return executingDocument->frame(); |
| 201 } | 197 } |
| 202 | 198 |
| 203 } // namespace | 199 } // namespace |
| OLD | NEW |