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

Side by Side Diff: Source/core/rendering/svg/SVGInlineTextBox.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/style/StyleRareInheritedData.cpp ('k') | no next file » | 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) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 27 matching lines...) Expand all
38 #include "platform/fonts/FontCache.h" 38 #include "platform/fonts/FontCache.h"
39 39
40 namespace blink { 40 namespace blink {
41 41
42 struct ExpectedSVGInlineTextBoxSize : public InlineTextBox { 42 struct ExpectedSVGInlineTextBoxSize : public InlineTextBox {
43 FloatWillBeLayoutUnit float1; 43 FloatWillBeLayoutUnit float1;
44 uint32_t bitfields : 1; 44 uint32_t bitfields : 1;
45 Vector<SVGTextFragment> vector; 45 Vector<SVGTextFragment> vector;
46 }; 46 };
47 47
48 COMPILE_ASSERT(sizeof(SVGInlineTextBox) == sizeof(ExpectedSVGInlineTextBoxSize), SVGInlineTextBox_is_not_of_expected_size); 48 static_assert(sizeof(SVGInlineTextBox) == sizeof(ExpectedSVGInlineTextBoxSize), "SVGInlineTextBox has an unexpected size");
49 49
50 SVGInlineTextBox::SVGInlineTextBox(RenderObject& object, int start, unsigned sho rt length) 50 SVGInlineTextBox::SVGInlineTextBox(RenderObject& object, int start, unsigned sho rt length)
51 : InlineTextBox(object, start, length) 51 : InlineTextBox(object, start, length)
52 , m_logicalHeight(0) 52 , m_logicalHeight(0)
53 , m_startsNewTextChunk(false) 53 , m_startsNewTextChunk(false)
54 { 54 {
55 } 55 }
56 56
57 void SVGInlineTextBox::dirtyLineBoxes() 57 void SVGInlineTextBox::dirtyLineBoxes()
58 { 58 {
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset)); 287 renderer().updateHitTestResult(result, locationInContainer.point () - toLayoutSize(accumulatedOffset));
288 if (!result.addNodeToRectBasedTestResult(renderer().node(), requ est, locationInContainer, rect)) 288 if (!result.addNodeToRectBasedTestResult(renderer().node(), requ est, locationInContainer, rect))
289 return true; 289 return true;
290 } 290 }
291 } 291 }
292 } 292 }
293 return false; 293 return false;
294 } 294 }
295 295
296 } // namespace blink 296 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/style/StyleRareInheritedData.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698