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

Side by Side Diff: Source/core/platform/graphics/chromium/GraphicsLayerChromium.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) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * Copyright (C) 2009 Apple Inc. All rights reserved. 3 * Copyright (C) 2009 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "GraphicsLayerChromium.h" 44 #include "GraphicsLayerChromium.h"
45 45
46 #include "AnimationTranslationUtil.h" 46 #include "AnimationTranslationUtil.h"
47 #include "FloatConversion.h" 47 #include "FloatConversion.h"
48 #include "FloatRect.h" 48 #include "FloatRect.h"
49 #include "GraphicsContext.h" 49 #include "GraphicsContext.h"
50 #include "GraphicsLayerFactory.h" 50 #include "GraphicsLayerFactory.h"
51 #include "Image.h" 51 #include "Image.h"
52 #include "NativeImageSkia.h" 52 #include "NativeImageSkia.h"
53 #include "PlatformContextSkia.h" 53 #include "PlatformContextSkia.h"
54 #include "PlatformMemoryInstrumentation.h"
55 #include "ScrollableArea.h" 54 #include "ScrollableArea.h"
56 #include "SkImageFilter.h" 55 #include "SkImageFilter.h"
57 #include "SkMatrix44.h" 56 #include "SkMatrix44.h"
58 #include "SkiaImageFilterBuilder.h" 57 #include "SkiaImageFilterBuilder.h"
59 #include "TransformSkMatrix44Conversions.h" 58 #include "TransformSkMatrix44Conversions.h"
60 #include <public/Platform.h> 59 #include <public/Platform.h>
61 #include <public/WebAnimation.h> 60 #include <public/WebAnimation.h>
62 #include <public/WebCompositorSupport.h> 61 #include <public/WebCompositorSupport.h>
63 #include <public/WebContentLayer.h> 62 #include <public/WebContentLayer.h>
64 #include <public/WebFilterOperation.h> 63 #include <public/WebFilterOperation.h>
65 #include <public/WebFilterOperations.h> 64 #include <public/WebFilterOperations.h>
66 #include <public/WebFloatPoint.h> 65 #include <public/WebFloatPoint.h>
67 #include <public/WebFloatRect.h> 66 #include <public/WebFloatRect.h>
68 #include <public/WebImageLayer.h> 67 #include <public/WebImageLayer.h>
69 #include <public/WebSize.h> 68 #include <public/WebSize.h>
70 #include <public/WebSolidColorLayer.h> 69 #include <public/WebSolidColorLayer.h>
71 #include <wtf/CurrentTime.h> 70 #include <wtf/CurrentTime.h>
72 #include <wtf/HashSet.h> 71 #include <wtf/HashSet.h>
73 #include <wtf/MemoryInstrumentationHashMap.h>
74 #include <wtf/StringExtras.h> 72 #include <wtf/StringExtras.h>
75 #include <wtf/text/CString.h> 73 #include <wtf/text/CString.h>
76 #include <wtf/text/StringHash.h> 74 #include <wtf/text/StringHash.h>
77 #include <wtf/text/WTFString.h> 75 #include <wtf/text/WTFString.h>
78 76
79 using namespace std; 77 using namespace std;
80 using namespace WebKit; 78 using namespace WebKit;
81 79
82 namespace WebCore { 80 namespace WebCore {
83 81
(...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 { 854 {
857 // Do nothing. 855 // Do nothing.
858 } 856 }
859 857
860 void GraphicsLayerChromium::didScroll() 858 void GraphicsLayerChromium::didScroll()
861 { 859 {
862 if (m_scrollableArea) 860 if (m_scrollableArea)
863 m_scrollableArea->scrollToOffsetWithoutAnimation(IntPoint(m_layer->layer ()->scrollPosition())); 861 m_scrollableArea->scrollToOffsetWithoutAnimation(IntPoint(m_layer->layer ()->scrollPosition()));
864 } 862 }
865 863
866 void GraphicsLayerChromium::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo ) const
867 {
868 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Layers);
869 GraphicsLayer::reportMemoryUsage(memoryObjectInfo);
870 info.addMember(m_nameBase, "nameBase");
871 info.addMember(m_layer, "layer");
872 info.addMember(m_transformLayer, "transformLayer");
873 info.addMember(m_imageLayer, "imageLayer");
874 info.addMember(m_contentsLayer, "contentsLayer");
875 info.addMember(m_linkHighlight, "linkHighlight");
876 info.addMember(m_opaqueRectTrackingContentLayerDelegate, "opaqueRectTracking ContentLayerDelegate");
877 info.addMember(m_animationIdMap, "animationIdMap");
878 info.addMember(m_scrollableArea, "scrollableArea");
879 }
880
881 } // namespace WebCore 864 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698