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

Unified Diff: sky/engine/core/css/MediaValues.cpp

Issue 758843004: Delete most of rendering/compositing. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: sky/engine/core/css/MediaValues.cpp
diff --git a/sky/engine/core/css/MediaValues.cpp b/sky/engine/core/css/MediaValues.cpp
index 967c1a6dd61f031f94eaa64fe372b28f1ba5031f..87e0db094afaff37a8e6f9dd06efb0caa60a67f4 100644
--- a/sky/engine/core/css/MediaValues.cpp
+++ b/sky/engine/core/css/MediaValues.cpp
@@ -18,7 +18,6 @@
#include "sky/engine/core/page/Page.h"
#include "sky/engine/core/rendering/RenderObject.h"
#include "sky/engine/core/rendering/RenderView.h"
-#include "sky/engine/core/rendering/compositing/RenderLayerCompositor.h"
#include "sky/engine/core/rendering/style/RenderStyle.h"
#include "sky/engine/platform/PlatformScreen.h"
@@ -99,11 +98,8 @@ const String MediaValues::calculateMediaType(LocalFrame* frame) const
bool MediaValues::calculateThreeDEnabled(LocalFrame* frame) const
{
- ASSERT(frame && frame->contentRenderer() && frame->contentRenderer()->compositor());
- bool threeDEnabled = false;
- if (RenderView* view = frame->contentRenderer())
- threeDEnabled = view->compositor()->hasAcceleratedCompositing();
- return threeDEnabled;
+ // FIXME(sky): Remove
+ 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
}
PointerType MediaValues::calculatePrimaryPointerType(LocalFrame* frame) const

Powered by Google App Engine
This is Rietveld 408576698