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

Side by Side Diff: Source/core/layout/LayoutObject.cpp

Issue 1041103002: PartitionAlloc: Centralize Partition allocators into one place (Part 1) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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/dom/Node.cpp ('k') | Source/core/layout/LayoutState.cpp » ('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 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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "core/layout/LayoutView.h" 71 #include "core/layout/LayoutView.h"
72 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 72 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
73 #include "core/layout/style/ContentData.h" 73 #include "core/layout/style/ContentData.h"
74 #include "core/layout/style/ShadowList.h" 74 #include "core/layout/style/ShadowList.h"
75 #include "core/page/AutoscrollController.h" 75 #include "core/page/AutoscrollController.h"
76 #include "core/page/EventHandler.h" 76 #include "core/page/EventHandler.h"
77 #include "core/page/Page.h" 77 #include "core/page/Page.h"
78 #include "core/paint/DeprecatedPaintLayer.h" 78 #include "core/paint/DeprecatedPaintLayer.h"
79 #include "core/paint/ObjectPainter.h" 79 #include "core/paint/ObjectPainter.h"
80 #include "platform/JSONValues.h" 80 #include "platform/JSONValues.h"
81 #include "platform/Partitions.h"
82 #include "platform/RuntimeEnabledFeatures.h" 81 #include "platform/RuntimeEnabledFeatures.h"
83 #include "platform/TraceEvent.h" 82 #include "platform/TraceEvent.h"
84 #include "platform/TracedValue.h" 83 #include "platform/TracedValue.h"
85 #include "platform/geometry/TransformState.h" 84 #include "platform/geometry/TransformState.h"
86 #include "platform/graphics/GraphicsContext.h" 85 #include "platform/graphics/GraphicsContext.h"
87 #include "platform/graphics/paint/DisplayItemList.h" 86 #include "platform/graphics/paint/DisplayItemList.h"
87 #include "wtf/Partitions.h"
88 #include "wtf/RefCountedLeakCounter.h" 88 #include "wtf/RefCountedLeakCounter.h"
89 #include "wtf/text/StringBuilder.h" 89 #include "wtf/text/StringBuilder.h"
90 #include "wtf/text/WTFString.h" 90 #include "wtf/text/WTFString.h"
91 #include <algorithm> 91 #include <algorithm>
92 #ifndef NDEBUG 92 #ifndef NDEBUG
93 #include <stdio.h> 93 #include <stdio.h>
94 #endif 94 #endif
95 95
96 namespace blink { 96 namespace blink {
97 97
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small"); 135 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small");
136 136
137 bool LayoutObject::s_affectsParentBlock = false; 137 bool LayoutObject::s_affectsParentBlock = false;
138 138
139 typedef HashMap<const LayoutObject*, LayoutRect> SelectionPaintInvalidationMap; 139 typedef HashMap<const LayoutObject*, LayoutRect> SelectionPaintInvalidationMap;
140 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0; 140 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0;
141 141
142 void* LayoutObject::operator new(size_t sz) 142 void* LayoutObject::operator new(size_t sz)
143 { 143 {
144 ASSERT(isMainThread()); 144 ASSERT(isMainThread());
145 return partitionAlloc(Partitions::getRenderingPartition(), sz); 145 return partitionAlloc(WTF::Partitions::getRenderingPartition(), sz);
146 } 146 }
147 147
148 void LayoutObject::operator delete(void* ptr) 148 void LayoutObject::operator delete(void* ptr)
149 { 149 {
150 ASSERT(isMainThread()); 150 ASSERT(isMainThread());
151 partitionFree(ptr); 151 partitionFree(ptr);
152 } 152 }
153 153
154 LayoutObject* LayoutObject::createObject(Element* element, const LayoutStyle& st yle) 154 LayoutObject* LayoutObject::createObject(Element* element, const LayoutStyle& st yle)
155 { 155 {
(...skipping 3074 matching lines...) Expand 10 before | Expand all | Expand 10 after
3230 { 3230 {
3231 if (object1) { 3231 if (object1) {
3232 const blink::LayoutObject* root = object1; 3232 const blink::LayoutObject* root = object1;
3233 while (root->parent()) 3233 while (root->parent())
3234 root = root->parent(); 3234 root = root->parent();
3235 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3235 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3236 } 3236 }
3237 } 3237 }
3238 3238
3239 #endif 3239 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | Source/core/layout/LayoutState.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698