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

Side by Side Diff: cc/CCLayerTreeHostImpl.cpp

Issue 10900021: Use std::string instead of WTF::String / TextStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCRenderSurface.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 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "config.h" 5 #include "config.h"
6 6
7 #include "CCLayerTreeHostImpl.h" 7 #include "CCLayerTreeHostImpl.h"
8 8
9 #include "CCAppendQuadsData.h" 9 #include "CCAppendQuadsData.h"
10 #include "CCDamageTracker.h" 10 #include "CCDamageTracker.h"
11 #include "CCDebugRectHistory.h" 11 #include "CCDebugRectHistory.h"
12 #include "CCDelayBasedTimeSource.h" 12 #include "CCDelayBasedTimeSource.h"
13 #include "CCFontAtlas.h" 13 #include "CCFontAtlas.h"
14 #include "CCFrameRateCounter.h" 14 #include "CCFrameRateCounter.h"
15 #include "CCHeadsUpDisplayLayerImpl.h" 15 #include "CCHeadsUpDisplayLayerImpl.h"
16 #include "CCLayerIterator.h" 16 #include "CCLayerIterator.h"
17 #include "CCLayerTreeHost.h" 17 #include "CCLayerTreeHost.h"
18 #include "CCLayerTreeHostCommon.h" 18 #include "CCLayerTreeHostCommon.h"
19 #include "CCMathUtil.h" 19 #include "CCMathUtil.h"
20 #include "CCOverdrawMetrics.h" 20 #include "CCOverdrawMetrics.h"
21 #include "CCPageScaleAnimation.h" 21 #include "CCPageScaleAnimation.h"
22 #include "CCPrioritizedTextureManager.h" 22 #include "CCPrioritizedTextureManager.h"
23 #include "CCRenderPassDrawQuad.h" 23 #include "CCRenderPassDrawQuad.h"
24 #include "CCRendererGL.h" 24 #include "CCRendererGL.h"
25 #include "CCRenderingStats.h" 25 #include "CCRenderingStats.h"
26 #include "CCScrollbarAnimationController.h" 26 #include "CCScrollbarAnimationController.h"
27 #include "CCScrollbarLayerImpl.h" 27 #include "CCScrollbarLayerImpl.h"
28 #include "CCSettings.h" 28 #include "CCSettings.h"
29 #include "CCSingleThreadProxy.h" 29 #include "CCSingleThreadProxy.h"
30 #include "TextStream.h"
31 #include "TraceEvent.h" 30 #include "TraceEvent.h"
32 #include <wtf/CurrentTime.h> 31 #include <wtf/CurrentTime.h>
33 32
34 using WebKit::WebTransformationMatrix; 33 using WebKit::WebTransformationMatrix;
35 34
36 namespace { 35 namespace {
37 36
38 void didVisibilityChange(WebCore::CCLayerTreeHostImpl* id, bool visible) 37 void didVisibilityChange(WebCore::CCLayerTreeHostImpl* id, bool visible)
39 { 38 {
40 if (visible) { 39 if (visible) {
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 clearRenderSurfacesOnCCLayerImplRecursive(current->children()[i].get()); 1213 clearRenderSurfacesOnCCLayerImplRecursive(current->children()[i].get());
1215 current->clearRenderSurface(); 1214 current->clearRenderSurface();
1216 } 1215 }
1217 1216
1218 void CCLayerTreeHostImpl::clearRenderSurfaces() 1217 void CCLayerTreeHostImpl::clearRenderSurfaces()
1219 { 1218 {
1220 clearRenderSurfacesOnCCLayerImplRecursive(m_rootLayerImpl.get()); 1219 clearRenderSurfacesOnCCLayerImplRecursive(m_rootLayerImpl.get());
1221 m_renderSurfaceLayerList.clear(); 1220 m_renderSurfaceLayerList.clear();
1222 } 1221 }
1223 1222
1224 String CCLayerTreeHostImpl::layerTreeAsText() const 1223 std::string CCLayerTreeHostImpl::layerTreeAsText() const
1225 { 1224 {
1226 TextStream ts; 1225 std::string str;
1227 if (m_rootLayerImpl) { 1226 if (m_rootLayerImpl) {
1228 ts << m_rootLayerImpl->layerTreeAsText(); 1227 str = m_rootLayerImpl->layerTreeAsText();
1229 ts << "RenderSurfaces:\n"; 1228 str += "RenderSurfaces:\n";
1230 dumpRenderSurfaces(ts, 1, m_rootLayerImpl.get()); 1229 dumpRenderSurfaces(&str, 1, m_rootLayerImpl.get());
1231 } 1230 }
1232 return ts.release(); 1231 return str;
1233 } 1232 }
1234 1233
1235 void CCLayerTreeHostImpl::dumpRenderSurfaces(TextStream& ts, int indent, const C CLayerImpl* layer) const 1234 void CCLayerTreeHostImpl::dumpRenderSurfaces(std::string* str, int indent, const CCLayerImpl* layer) const
1236 { 1235 {
1237 if (layer->renderSurface()) 1236 if (layer->renderSurface())
1238 layer->renderSurface()->dumpSurface(ts, indent); 1237 layer->renderSurface()->dumpSurface(str, indent);
1239 1238
1240 for (size_t i = 0; i < layer->children().size(); ++i) 1239 for (size_t i = 0; i < layer->children().size(); ++i)
1241 dumpRenderSurfaces(ts, indent, layer->children()[i].get()); 1240 dumpRenderSurfaces(str, indent, layer->children()[i].get());
1242 } 1241 }
1243 1242
1244 int CCLayerTreeHostImpl::sourceAnimationFrameNumber() const 1243 int CCLayerTreeHostImpl::sourceAnimationFrameNumber() const
1245 { 1244 {
1246 return fpsCounter()->currentFrameNumber(); 1245 return fpsCounter()->currentFrameNumber();
1247 } 1246 }
1248 1247
1249 void CCLayerTreeHostImpl::renderingStats(CCRenderingStats& stats) const 1248 void CCLayerTreeHostImpl::renderingStats(CCRenderingStats& stats) const
1250 { 1249 {
1251 stats.numFramesSentToScreen = fpsCounter()->currentFrameNumber(); 1250 stats.numFramesSentToScreen = fpsCounter()->currentFrameNumber();
(...skipping 12 matching lines...) Expand all
1264 1263
1265 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController(); 1264 CCScrollbarAnimationController* scrollbarController = layer->scrollbarAnimat ionController();
1266 if (scrollbarController && scrollbarController->animate(monotonicTime)) 1265 if (scrollbarController && scrollbarController->animate(monotonicTime))
1267 m_client->setNeedsRedrawOnImplThread(); 1266 m_client->setNeedsRedrawOnImplThread();
1268 1267
1269 for (size_t i = 0; i < layer->children().size(); ++i) 1268 for (size_t i = 0; i < layer->children().size(); ++i)
1270 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime); 1269 animateScrollbarsRecursive(layer->children()[i].get(), monotonicTime);
1271 } 1270 }
1272 1271
1273 } // namespace WebCore 1272 } // namespace WebCore
OLDNEW
« no previous file with comments | « cc/CCLayerTreeHostImpl.h ('k') | cc/CCRenderSurface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698