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

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

Issue 1189593003: Rename Partitions::getRenderingPartition() -> getLayoutPartition() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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/line/InlineBox.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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small"); 142 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), "LayoutObj ect should stay small");
143 143
144 bool LayoutObject::s_affectsParentBlock = false; 144 bool LayoutObject::s_affectsParentBlock = false;
145 145
146 typedef HashMap<const LayoutObject*, LayoutRect> SelectionPaintInvalidationMap; 146 typedef HashMap<const LayoutObject*, LayoutRect> SelectionPaintInvalidationMap;
147 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = nullptr; 147 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = nullptr;
148 148
149 void* LayoutObject::operator new(size_t sz) 149 void* LayoutObject::operator new(size_t sz)
150 { 150 {
151 ASSERT(isMainThread()); 151 ASSERT(isMainThread());
152 return partitionAlloc(WTF::Partitions::getRenderingPartition(), sz); 152 return partitionAlloc(WTF::Partitions::layoutPartition(), sz);
153 } 153 }
154 154
155 void LayoutObject::operator delete(void* ptr) 155 void LayoutObject::operator delete(void* ptr)
156 { 156 {
157 ASSERT(isMainThread()); 157 ASSERT(isMainThread());
158 partitionFree(ptr); 158 partitionFree(ptr);
159 } 159 }
160 160
161 LayoutObject* LayoutObject::createObject(Element* element, const ComputedStyle& style) 161 LayoutObject* LayoutObject::createObject(Element* element, const ComputedStyle& style)
162 { 162 {
(...skipping 3107 matching lines...) Expand 10 before | Expand all | Expand 10 after
3270 const blink::LayoutObject* root = object1; 3270 const blink::LayoutObject* root = object1;
3271 while (root->parent()) 3271 while (root->parent())
3272 root = root->parent(); 3272 root = root->parent();
3273 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3273 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3274 } else { 3274 } else {
3275 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3275 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3276 } 3276 }
3277 } 3277 }
3278 3278
3279 #endif 3279 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/Node.cpp ('k') | Source/core/layout/line/InlineBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698