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

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

Issue 2387263004: Manually remove many instances of a comma quirk arising from the reformat. (Closed)
Patch Set: merge with master; thakis nit Created 4 years, 2 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. 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 ASSERT_NOT_REACHED(); 224 ASSERT_NOT_REACHED();
225 return nullptr; 225 return nullptr;
226 } 226 }
227 227
228 LayoutObject::LayoutObject(Node* node) 228 LayoutObject::LayoutObject(Node* node)
229 : m_style(nullptr), 229 : m_style(nullptr),
230 m_node(node), 230 m_node(node),
231 m_parent(nullptr), 231 m_parent(nullptr),
232 m_previous(nullptr), 232 m_previous(nullptr),
233 m_next(nullptr) 233 m_next(nullptr),
234 #if ENABLE(ASSERT) 234 #if ENABLE(ASSERT)
235 ,
236 m_hasAXObject(false), 235 m_hasAXObject(false),
237 m_setNeedsLayoutForbidden(false) 236 m_setNeedsLayoutForbidden(false),
238 #endif 237 #endif
239 ,
240 m_bitfields(node) { 238 m_bitfields(node) {
241 InstanceCounters::incrementCounter(InstanceCounters::LayoutObjectCounter); 239 InstanceCounters::incrementCounter(InstanceCounters::LayoutObjectCounter);
242 if (m_node) 240 if (m_node)
243 frameView()->incrementLayoutObjectCount(); 241 frameView()->incrementLayoutObjectCount();
244 } 242 }
245 243
246 LayoutObject::~LayoutObject() { 244 LayoutObject::~LayoutObject() {
247 ASSERT(!m_hasAXObject); 245 ASSERT(!m_hasAXObject);
248 InstanceCounters::decrementCounter(InstanceCounters::LayoutObjectCounter); 246 InstanceCounters::decrementCounter(InstanceCounters::LayoutObjectCounter);
249 } 247 }
(...skipping 3206 matching lines...) Expand 10 before | Expand all | Expand 10 after
3456 const blink::LayoutObject* root = object1; 3454 const blink::LayoutObject* root = object1;
3457 while (root->parent()) 3455 while (root->parent())
3458 root = root->parent(); 3456 root = root->parent();
3459 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3457 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3460 } else { 3458 } else {
3461 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3459 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3462 } 3460 }
3463 } 3461 }
3464 3462
3465 #endif 3463 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutPart.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698