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

Side by Side Diff: Source/core/rendering/RenderLayerCompositor.cpp

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "RenderLayerBacking.h" 51 #include "RenderLayerBacking.h"
52 #include "RenderReplica.h" 52 #include "RenderReplica.h"
53 #include "RenderVideo.h" 53 #include "RenderVideo.h"
54 #include "RenderView.h" 54 #include "RenderView.h"
55 #include "ScrollbarTheme.h" 55 #include "ScrollbarTheme.h"
56 #include "ScrollingConstraints.h" 56 #include "ScrollingConstraints.h"
57 #include "ScrollingCoordinator.h" 57 #include "ScrollingCoordinator.h"
58 #include "Settings.h" 58 #include "Settings.h"
59 #include "TraceEvent.h" 59 #include "TraceEvent.h"
60 #include "TransformState.h" 60 #include "TransformState.h"
61 #include "WebCoreMemoryInstrumentation.h"
62 #include <wtf/MemoryInstrumentationHashMap.h>
63 #include <wtf/TemporaryChange.h> 61 #include <wtf/TemporaryChange.h>
64 62
65 #if !LOG_DISABLED 63 #if !LOG_DISABLED
66 #include <wtf/CurrentTime.h> 64 #include <wtf/CurrentTime.h>
67 #endif 65 #endif
68 66
69 #ifndef NDEBUG 67 #ifndef NDEBUG
70 #include "RenderTreeAsText.h" 68 #include "RenderTreeAsText.h"
71 #endif 69 #endif
72 70
(...skipping 2622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2695 } 2693 }
2696 2694
2697 Page* RenderLayerCompositor::page() const 2695 Page* RenderLayerCompositor::page() const
2698 { 2696 {
2699 if (Frame* frame = m_renderView->frameView()->frame()) 2697 if (Frame* frame = m_renderView->frameView()->frame())
2700 return frame->page(); 2698 return frame->page();
2701 2699
2702 return 0; 2700 return 0;
2703 } 2701 }
2704 2702
2705 void RenderLayerCompositor::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo ) const
2706 {
2707 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
2708 info.addWeakPointer(m_renderView);
2709 info.addMember(m_rootContentLayer, "rootContentLayer");
2710 info.addMember(m_clipLayer, "clipLayer");
2711 info.addMember(m_scrollLayer, "scrollLayer");
2712 info.addMember(m_viewportConstrainedLayers, "viewportConstrainedLayers");
2713 info.addMember(m_overflowControlsHostLayer, "overflowControlsHostLayer");
2714 info.addMember(m_layerForHorizontalScrollbar, "layerForHorizontalScrollbar") ;
2715 info.addMember(m_layerForVerticalScrollbar, "layerForVerticalScrollbar");
2716 info.addMember(m_layerForScrollCorner, "layerForScrollCorner");
2717 #if ENABLE(RUBBER_BANDING)
2718 info.addMember(m_layerForOverhangAreas, "layerForOverhangAreas");
2719 info.addMember(m_contentShadowLayer, "contentShadowLayer");
2720 info.addMember(m_layerForTopOverhangArea, "layerForTopOverhangArea");
2721 info.addMember(m_layerForBottomOverhangArea, "layerForBottomOverhangArea");
2722 #endif
2723 }
2724
2725 } // namespace WebCore 2703 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerCompositor.h ('k') | Source/core/rendering/RenderLayerModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698