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

Unified Diff: Source/core/rendering/RenderView.cpp

Issue 14398007: Remove USE(3D_GRAPHICS) as it is always turned on. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/wtf/Platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderView.cpp
diff --git a/Source/core/rendering/RenderView.cpp b/Source/core/rendering/RenderView.cpp
index 4245ddb0ad30f91a6c7387c71f2436ebf8470b61..567f8c5b0418b34943ef4734432bb1c075ebf14c 100644
--- a/Source/core/rendering/RenderView.cpp
+++ b/Source/core/rendering/RenderView.cpp
@@ -29,6 +29,7 @@
#include "core/page/Frame.h"
#include "core/page/FrameView.h"
#include "core/page/Page.h"
+#include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
#include "core/platform/graphics/FloatQuad.h"
#include "core/platform/graphics/GraphicsContext.h"
#include "core/platform/graphics/transforms/TransformState.h"
@@ -46,10 +47,6 @@
#include "core/rendering/RenderWidgetProtector.h"
#include "core/rendering/style/StyleInheritedData.h"
-#if USE(3D_GRAPHICS)
-#include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
-#endif
-
namespace WebCore {
RenderView::RenderView(Document* document)
@@ -1082,14 +1079,12 @@ void RenderView::setIsInWindow(bool isInWindow)
m_compositor->setIsInWindow(isInWindow);
}
-#if USE(3D_GRAPHICS)
CustomFilterGlobalContext* RenderView::customFilterGlobalContext()
{
if (!m_customFilterGlobalContext)
m_customFilterGlobalContext = adoptPtr(new CustomFilterGlobalContext());
return m_customFilterGlobalContext.get();
}
-#endif
void RenderView::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
{
@@ -1133,9 +1128,7 @@ void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
info.addMember(m_widgets, "widgets");
info.addMember(m_layoutState, "layoutState");
info.addMember(m_compositor, "compositor");
-#if USE(3D_GRAPHICS)
info.addMember(m_customFilterGlobalContext, "customFilterGlobalContext");
-#endif
info.addMember(m_flowThreadController, "flowThreadController");
info.addMember(m_intervalArena, "intervalArena");
info.addWeakPointer(m_renderQuoteHead);
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/wtf/Platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698