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

Side by Side Diff: Source/platform/text/BidiContext.cpp

Issue 813883002: replace COMPILE_ASSERT with static_assert in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: final fixups 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/platform/scroll/ScrollableArea.cpp ('k') | Source/platform/text/TextBreakIterator.h » ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2006, 2007, 2009, 2010 Apple Inc. All right reserve d. 3 * Copyright (C) 2003, 2004, 2006, 2007, 2009, 2010 Apple Inc. All right reserve d.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 16 matching lines...) Expand all
27 27
28 namespace blink { 28 namespace blink {
29 29
30 using namespace WTF::Unicode; 30 using namespace WTF::Unicode;
31 31
32 struct SameSizeAsBidiContext : public RefCounted<SameSizeAsBidiContext> { 32 struct SameSizeAsBidiContext : public RefCounted<SameSizeAsBidiContext> {
33 uint32_t bitfields : 16; 33 uint32_t bitfields : 16;
34 void* parent; 34 void* parent;
35 }; 35 };
36 36
37 COMPILE_ASSERT(sizeof(BidiContext) == sizeof(SameSizeAsBidiContext), BidiContext _should_stay_small); 37 static_assert(sizeof(BidiContext) == sizeof(SameSizeAsBidiContext), "BidiContext should stay small");
38 38
39 inline PassRefPtr<BidiContext> BidiContext::createUncached(unsigned char level, Direction direction, bool override, BidiEmbeddingSource source, BidiContext* par ent) 39 inline PassRefPtr<BidiContext> BidiContext::createUncached(unsigned char level, Direction direction, bool override, BidiEmbeddingSource source, BidiContext* par ent)
40 { 40 {
41 return adoptRef(new BidiContext(level, direction, override, source, parent)) ; 41 return adoptRef(new BidiContext(level, direction, override, source, parent)) ;
42 } 42 }
43 43
44 PassRefPtr<BidiContext> BidiContext::create(unsigned char level, Direction direc tion, bool override, BidiEmbeddingSource source, BidiContext* parent) 44 PassRefPtr<BidiContext> BidiContext::create(unsigned char level, Direction direc tion, bool override, BidiEmbeddingSource source, BidiContext* parent)
45 { 45 {
46 ASSERT(direction == (level % 2 ? RightToLeft : LeftToRight)); 46 ASSERT(direction == (level % 2 ? RightToLeft : LeftToRight));
47 47
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 if (&c1 == &c2) 104 if (&c1 == &c2)
105 return true; 105 return true;
106 if (c1.level() != c2.level() || c1.override() != c2.override() || c1.dir() ! = c2.dir() || c1.source() != c2.source()) 106 if (c1.level() != c2.level() || c1.override() != c2.override() || c1.dir() ! = c2.dir() || c1.source() != c2.source())
107 return false; 107 return false;
108 if (!c1.parent()) 108 if (!c1.parent())
109 return !c2.parent(); 109 return !c2.parent();
110 return c2.parent() && *c1.parent() == *c2.parent(); 110 return c2.parent() && *c1.parent() == *c2.parent();
111 } 111 }
112 112
113 } // namespace blink 113 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollableArea.cpp ('k') | Source/platform/text/TextBreakIterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698