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

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

Issue 2614883006: Change PartitionAlloc to Chromium naming style. (Closed)
Patch Set: Rebase and fix some names. Created 3 years, 11 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
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. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 std::unique_ptr<void*> m_paintProperties; 132 std::unique_ptr<void*> m_paintProperties;
133 }; 133 };
134 134
135 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject), 135 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject),
136 "LayoutObject should stay small"); 136 "LayoutObject should stay small");
137 137
138 bool LayoutObject::s_affectsParentBlock = false; 138 bool LayoutObject::s_affectsParentBlock = false;
139 139
140 void* LayoutObject::operator new(size_t sz) { 140 void* LayoutObject::operator new(size_t sz) {
141 ASSERT(isMainThread()); 141 ASSERT(isMainThread());
142 return partitionAlloc(WTF::Partitions::layoutPartition(), sz, 142 return PartitionAlloc(WTF::Partitions::layoutPartition(), sz,
143 WTF_HEAP_PROFILER_TYPE_NAME(LayoutObject)); 143 WTF_HEAP_PROFILER_TYPE_NAME(LayoutObject));
144 } 144 }
145 145
146 void LayoutObject::operator delete(void* ptr) { 146 void LayoutObject::operator delete(void* ptr) {
147 ASSERT(isMainThread()); 147 ASSERT(isMainThread());
148 WTF::partitionFree(ptr); 148 WTF::PartitionFree(ptr);
149 } 149 }
150 150
151 LayoutObject* LayoutObject::createObject(Element* element, 151 LayoutObject* LayoutObject::createObject(Element* element,
152 const ComputedStyle& style) { 152 const ComputedStyle& style) {
153 ASSERT(isAllowedToModifyLayoutTreeStructure(element->document())); 153 ASSERT(isAllowedToModifyLayoutTreeStructure(element->document()));
154 154
155 // Minimal support for content properties replacing an entire element. 155 // Minimal support for content properties replacing an entire element.
156 // Works only if we have exactly one piece of content and it's a URL. 156 // Works only if we have exactly one piece of content and it's a URL.
157 // Otherwise acts as if we didn't support this feature. 157 // Otherwise acts as if we didn't support this feature.
158 const ContentData* contentData = style.contentData(); 158 const ContentData* contentData = style.contentData();
(...skipping 3378 matching lines...) Expand 10 before | Expand all | Expand 10 after
3537 const blink::LayoutObject* root = object1; 3537 const blink::LayoutObject* root = object1;
3538 while (root->parent()) 3538 while (root->parent())
3539 root = root->parent(); 3539 root = root->parent();
3540 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3540 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3541 } else { 3541 } else {
3542 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3542 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3543 } 3543 }
3544 } 3544 }
3545 3545
3546 #endif 3546 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698