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

Side by Side Diff: Source/core/rendering/style/StyleRareNonInheritedData.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
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | Source/core/svg/SVGColor.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 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
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 12 matching lines...) Expand all
23 #include "StyleRareNonInheritedData.h" 23 #include "StyleRareNonInheritedData.h"
24 24
25 #include "ContentData.h" 25 #include "ContentData.h"
26 #include "RenderCounter.h" 26 #include "RenderCounter.h"
27 #include "RenderStyle.h" 27 #include "RenderStyle.h"
28 #include "ShadowData.h" 28 #include "ShadowData.h"
29 #include "StyleFilterData.h" 29 #include "StyleFilterData.h"
30 #include "StyleTransformData.h" 30 #include "StyleTransformData.h"
31 #include "StyleImage.h" 31 #include "StyleImage.h"
32 #include "StyleResolver.h" 32 #include "StyleResolver.h"
33 #include "WebCoreMemoryInstrumentation.h"
34 #include <wtf/MemoryInstrumentationHashMap.h>
35 #include <wtf/MemoryInstrumentationVector.h>
36 #include <wtf/MemoryObjectInfo.h>
37 33
38 namespace WebCore { 34 namespace WebCore {
39 35
40 StyleRareNonInheritedData::StyleRareNonInheritedData() 36 StyleRareNonInheritedData::StyleRareNonInheritedData()
41 : opacity(RenderStyle::initialOpacity()) 37 : opacity(RenderStyle::initialOpacity())
42 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator()) 38 , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
43 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator()) 39 , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
44 , m_perspective(RenderStyle::initialPerspective()) 40 , m_perspective(RenderStyle::initialPerspective())
45 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX()) 41 , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
46 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY()) 42 , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 294
299 bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInher itedData& o) const 295 bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInher itedData& o) const
300 { 296 {
301 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition s)) 297 if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transition s))
302 return false; 298 return false;
303 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions) ) 299 if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions) )
304 return false; 300 return false;
305 return true; 301 return true;
306 } 302 }
307 303
308 void StyleRareNonInheritedData::reportMemoryUsage(MemoryObjectInfo* memoryObject Info) const
309 {
310 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
311 info.addMember(m_deprecatedFlexibleBox, "deprecatedFlexibleBox");
312 info.addMember(m_flexibleBox, "flexibleBox");
313 info.addMember(m_marquee, "marquee");
314 info.addMember(m_multiCol, "multiCol");
315 info.addMember(m_transform, "transform");
316 info.addMember(m_filter, "filter");
317 info.addMember(m_grid, "grid");
318 info.addMember(m_gridItem, "gridItem");
319 info.addMember(m_content, "content");
320 info.addMember(m_counterDirectives, "counterDirectives");
321 info.addMember(m_boxShadow, "boxShadow");
322 info.addMember(m_boxReflect, "boxReflect");
323 info.addMember(m_animations, "animations");
324 info.addMember(m_transitions, "transitions");
325 info.addMember(m_shapeInside, "shapeInside");
326 info.addMember(m_shapeOutside, "shapeOutside");
327 info.addMember(m_clipPath, "clipPath");
328 info.addMember(m_flowThread, "flowThread");
329 info.addMember(m_regionThread, "regionThread");
330
331 info.ignoreMember(m_perspectiveOriginX);
332 info.ignoreMember(m_perspectiveOriginY);
333 info.ignoreMember(m_pageSize);
334 info.ignoreMember(m_shapeMargin);
335 info.ignoreMember(m_shapePadding);
336 }
337
338 } // namespace WebCore 304 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | Source/core/svg/SVGColor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698