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

Side by Side 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, 7 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
« no previous file with comments | « Source/core/rendering/RenderView.h ('k') | Source/wtf/Platform.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 11 matching lines...) Expand all
22 #include "core/rendering/RenderView.h" 22 #include "core/rendering/RenderView.h"
23 23
24 #include "HTMLFrameOwnerElement.h" 24 #include "HTMLFrameOwnerElement.h"
25 #include "HTMLIFrameElement.h" 25 #include "HTMLIFrameElement.h"
26 #include "core/dom/Document.h" 26 #include "core/dom/Document.h"
27 #include "core/dom/Element.h" 27 #include "core/dom/Element.h"
28 #include "core/dom/WebCoreMemoryInstrumentation.h" 28 #include "core/dom/WebCoreMemoryInstrumentation.h"
29 #include "core/page/Frame.h" 29 #include "core/page/Frame.h"
30 #include "core/page/FrameView.h" 30 #include "core/page/FrameView.h"
31 #include "core/page/Page.h" 31 #include "core/page/Page.h"
32 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
32 #include "core/platform/graphics/FloatQuad.h" 33 #include "core/platform/graphics/FloatQuad.h"
33 #include "core/platform/graphics/GraphicsContext.h" 34 #include "core/platform/graphics/GraphicsContext.h"
34 #include "core/platform/graphics/transforms/TransformState.h" 35 #include "core/platform/graphics/transforms/TransformState.h"
35 #include "core/rendering/ColumnInfo.h" 36 #include "core/rendering/ColumnInfo.h"
36 #include "core/rendering/FlowThreadController.h" 37 #include "core/rendering/FlowThreadController.h"
37 #include "core/rendering/HitTestResult.h" 38 #include "core/rendering/HitTestResult.h"
38 #include "core/rendering/RenderGeometryMap.h" 39 #include "core/rendering/RenderGeometryMap.h"
39 #include "core/rendering/RenderLayer.h" 40 #include "core/rendering/RenderLayer.h"
40 #include "core/rendering/RenderLayerBacking.h" 41 #include "core/rendering/RenderLayerBacking.h"
41 #include "core/rendering/RenderLayerCompositor.h" 42 #include "core/rendering/RenderLayerCompositor.h"
42 #include "core/rendering/RenderLazyBlock.h" 43 #include "core/rendering/RenderLazyBlock.h"
43 #include "core/rendering/RenderNamedFlowThread.h" 44 #include "core/rendering/RenderNamedFlowThread.h"
44 #include "core/rendering/RenderSelectionInfo.h" 45 #include "core/rendering/RenderSelectionInfo.h"
45 #include "core/rendering/RenderWidget.h" 46 #include "core/rendering/RenderWidget.h"
46 #include "core/rendering/RenderWidgetProtector.h" 47 #include "core/rendering/RenderWidgetProtector.h"
47 #include "core/rendering/style/StyleInheritedData.h" 48 #include "core/rendering/style/StyleInheritedData.h"
48 49
49 #if USE(3D_GRAPHICS)
50 #include "core/platform/graphics/filters/custom/CustomFilterGlobalContext.h"
51 #endif
52
53 namespace WebCore { 50 namespace WebCore {
54 51
55 RenderView::RenderView(Document* document) 52 RenderView::RenderView(Document* document)
56 : RenderBlock(document) 53 : RenderBlock(document)
57 , m_frameView(document->view()) 54 , m_frameView(document->view())
58 , m_selectionStart(0) 55 , m_selectionStart(0)
59 , m_selectionEnd(0) 56 , m_selectionEnd(0)
60 , m_selectionStartPos(-1) 57 , m_selectionStartPos(-1)
61 , m_selectionEndPos(-1) 58 , m_selectionEndPos(-1)
62 , m_maximalOutlineSize(0) 59 , m_maximalOutlineSize(0)
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 1072
1076 return m_compositor.get(); 1073 return m_compositor.get();
1077 } 1074 }
1078 1075
1079 void RenderView::setIsInWindow(bool isInWindow) 1076 void RenderView::setIsInWindow(bool isInWindow)
1080 { 1077 {
1081 if (m_compositor) 1078 if (m_compositor)
1082 m_compositor->setIsInWindow(isInWindow); 1079 m_compositor->setIsInWindow(isInWindow);
1083 } 1080 }
1084 1081
1085 #if USE(3D_GRAPHICS)
1086 CustomFilterGlobalContext* RenderView::customFilterGlobalContext() 1082 CustomFilterGlobalContext* RenderView::customFilterGlobalContext()
1087 { 1083 {
1088 if (!m_customFilterGlobalContext) 1084 if (!m_customFilterGlobalContext)
1089 m_customFilterGlobalContext = adoptPtr(new CustomFilterGlobalContext()); 1085 m_customFilterGlobalContext = adoptPtr(new CustomFilterGlobalContext());
1090 return m_customFilterGlobalContext.get(); 1086 return m_customFilterGlobalContext.get();
1091 } 1087 }
1092 #endif
1093 1088
1094 void RenderView::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl e) 1089 void RenderView::styleDidChange(StyleDifference diff, const RenderStyle* oldStyl e)
1095 { 1090 {
1096 RenderBlock::styleDidChange(diff, oldStyle); 1091 RenderBlock::styleDidChange(diff, oldStyle);
1097 if (hasRenderNamedFlowThreads()) 1092 if (hasRenderNamedFlowThreads())
1098 flowThreadController()->styleDidChange(); 1093 flowThreadController()->styleDidChange();
1099 } 1094 }
1100 1095
1101 bool RenderView::hasRenderNamedFlowThreads() const 1096 bool RenderView::hasRenderNamedFlowThreads() const
1102 { 1097 {
(...skipping 23 matching lines...) Expand all
1126 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1121 void RenderView::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1127 { 1122 {
1128 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1123 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1129 RenderBlock::reportMemoryUsage(memoryObjectInfo); 1124 RenderBlock::reportMemoryUsage(memoryObjectInfo);
1130 info.addWeakPointer(m_frameView); 1125 info.addWeakPointer(m_frameView);
1131 info.addWeakPointer(m_selectionStart); 1126 info.addWeakPointer(m_selectionStart);
1132 info.addWeakPointer(m_selectionEnd); 1127 info.addWeakPointer(m_selectionEnd);
1133 info.addMember(m_widgets, "widgets"); 1128 info.addMember(m_widgets, "widgets");
1134 info.addMember(m_layoutState, "layoutState"); 1129 info.addMember(m_layoutState, "layoutState");
1135 info.addMember(m_compositor, "compositor"); 1130 info.addMember(m_compositor, "compositor");
1136 #if USE(3D_GRAPHICS)
1137 info.addMember(m_customFilterGlobalContext, "customFilterGlobalContext"); 1131 info.addMember(m_customFilterGlobalContext, "customFilterGlobalContext");
1138 #endif
1139 info.addMember(m_flowThreadController, "flowThreadController"); 1132 info.addMember(m_flowThreadController, "flowThreadController");
1140 info.addMember(m_intervalArena, "intervalArena"); 1133 info.addMember(m_intervalArena, "intervalArena");
1141 info.addWeakPointer(m_renderQuoteHead); 1134 info.addWeakPointer(m_renderQuoteHead);
1142 info.addMember(m_legacyPrinting, "legacyPrinting"); 1135 info.addMember(m_legacyPrinting, "legacyPrinting");
1143 } 1136 }
1144 1137
1145 FragmentationDisabler::FragmentationDisabler(RenderObject* root) 1138 FragmentationDisabler::FragmentationDisabler(RenderObject* root)
1146 { 1139 {
1147 RenderView* renderView = root->view(); 1140 RenderView* renderView = root->view();
1148 ASSERT(renderView); 1141 ASSERT(renderView);
(...skipping 25 matching lines...) Expand all
1174 #endif 1167 #endif
1175 1168
1176 if (layoutState) 1169 if (layoutState)
1177 layoutState->m_isPaginated = m_fragmenting; 1170 layoutState->m_isPaginated = m_fragmenting;
1178 1171
1179 if (m_flowThreadState != RenderObject::NotInsideFlowThread) 1172 if (m_flowThreadState != RenderObject::NotInsideFlowThread)
1180 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState); 1173 m_root->setFlowThreadStateIncludingDescendants(m_flowThreadState);
1181 } 1174 }
1182 1175
1183 } // namespace WebCore 1176 } // namespace WebCore
OLDNEW
« 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