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

Side by Side Diff: Source/core/rendering/RenderLayerModelObject.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved. 7 * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIB. If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "RenderLayerModelObject.h" 26 #include "RenderLayerModelObject.h"
27 27
28 #include "RenderLayer.h" 28 #include "RenderLayer.h"
29 #include "RenderView.h" 29 #include "RenderView.h"
30 #include "WebCoreMemoryInstrumentation.h"
31 30
32 using namespace std; 31 using namespace std;
33 32
34 namespace WebCore { 33 namespace WebCore {
35 34
36 bool RenderLayerModelObject::s_wasFloating = false; 35 bool RenderLayerModelObject::s_wasFloating = false;
37 bool RenderLayerModelObject::s_hadLayer = false; 36 bool RenderLayerModelObject::s_hadLayer = false;
38 bool RenderLayerModelObject::s_hadTransform = false; 37 bool RenderLayerModelObject::s_hadTransform = false;
39 bool RenderLayerModelObject::s_layerWasSelfPainting = false; 38 bool RenderLayerModelObject::s_layerWasSelfPainting = false;
40 39
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition(); 175 bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportCo nstrainedPosition();
177 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) { 176 if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
178 if (newStyleIsViewportConstained && layer()) 177 if (newStyleIsViewportConstained && layer())
179 frameView->addViewportConstrainedObject(this); 178 frameView->addViewportConstrainedObject(this);
180 else 179 else
181 frameView->removeViewportConstrainedObject(this); 180 frameView->removeViewportConstrainedObject(this);
182 } 181 }
183 } 182 }
184 } 183 }
185 184
186 void RenderLayerModelObject::reportMemoryUsage(MemoryObjectInfo* memoryObjectInf o) const
187 {
188 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
189 RenderObject::reportMemoryUsage(memoryObjectInfo);
190 info.addWeakPointer(m_layer);
191 }
192
193 } // namespace WebCore 185 } // namespace WebCore
194 186
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayerModelObject.h ('k') | Source/core/rendering/RenderListMarker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698