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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 811843003: replace COMPILE_ASSERT with static_assert in core/rendering/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « Source/core/rendering/RenderInline.cpp ('k') | Source/core/rendering/RenderTableCell.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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 #if ENABLE(OILPAN) 127 #if ENABLE(OILPAN)
128 unsigned m_oilpanBitfields : 1; 128 unsigned m_oilpanBitfields : 1;
129 #endif 129 #endif
130 #endif 130 #endif
131 unsigned m_bitfields; 131 unsigned m_bitfields;
132 unsigned m_bitfields2; 132 unsigned m_bitfields2;
133 LayoutRect rect; // Stores the previous paint invalidation rect. 133 LayoutRect rect; // Stores the previous paint invalidation rect.
134 LayoutPoint position; // Stores the previous position from the paint invalid ation container. 134 LayoutPoint position; // Stores the previous position from the paint invalid ation container.
135 }; 135 };
136 136
137 COMPILE_ASSERT(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), RenderObj ect_should_stay_small); 137 static_assert(sizeof(RenderObject) == sizeof(SameSizeAsRenderObject), "RenderObj ect should stay small");
138 138
139 bool RenderObject::s_affectsParentBlock = false; 139 bool RenderObject::s_affectsParentBlock = false;
140 140
141 typedef HashMap<const RenderObject*, LayoutRect> SelectionPaintInvalidationMap; 141 typedef HashMap<const RenderObject*, LayoutRect> SelectionPaintInvalidationMap;
142 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0; 142 static SelectionPaintInvalidationMap* selectionPaintInvalidationMap = 0;
143 143
144 #if !ENABLE(OILPAN) 144 #if !ENABLE(OILPAN)
145 void* RenderObject::operator new(size_t sz) 145 void* RenderObject::operator new(size_t sz)
146 { 146 {
147 ASSERT(isMainThread()); 147 ASSERT(isMainThread());
(...skipping 2990 matching lines...) Expand 10 before | Expand all | Expand 10 after
3138 { 3138 {
3139 if (object1) { 3139 if (object1) {
3140 const blink::RenderObject* root = object1; 3140 const blink::RenderObject* root = object1;
3141 while (root->parent()) 3141 while (root->parent())
3142 root = root->parent(); 3142 root = root->parent();
3143 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3143 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3144 } 3144 }
3145 } 3145 }
3146 3146
3147 #endif 3147 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderInline.cpp ('k') | Source/core/rendering/RenderTableCell.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698