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

Side by Side Diff: sky/engine/core/rendering/style/StyleRareInheritedData.cpp

Issue 716673002: Speculative fix for android compile. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | 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) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
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 24 matching lines...) Expand all
35 35
36 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> { 36 struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI nheritedData> {
37 void* styleImage; 37 void* styleImage;
38 Color firstColor; 38 Color firstColor;
39 float firstFloat; 39 float firstFloat;
40 Color colors[2]; 40 Color colors[2];
41 void* ownPtrs[1]; 41 void* ownPtrs[1];
42 AtomicString atomicStrings[4]; 42 AtomicString atomicStrings[4];
43 void* refPtrs[3]; 43 void* refPtrs[3];
44 Length lengths[1]; 44 Length lengths[1];
45 float secondFloat;
46 unsigned m_bitfields[2]; 45 unsigned m_bitfields[2];
47 short pagedMediaShorts[2]; 46 short pagedMediaShorts[2];
48 unsigned unsigneds[1]; 47 unsigned unsigneds[1];
49 short hyphenationShorts[3]; 48 short hyphenationShorts[3];
50 49
51 Color touchColors; 50 Color touchColors;
52 }; 51 };
53 52
54 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack); 53 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInher itedData), StyleRareInheritedData_should_bit_pack);
55 54
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 { 199 {
201 return dataEquivalent(textShadow.get(), o.textShadow.get()); 200 return dataEquivalent(textShadow.get(), o.textShadow.get());
202 } 201 }
203 202
204 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const 203 bool StyleRareInheritedData::quotesDataEquivalent(const StyleRareInheritedData& o) const
205 { 204 {
206 return dataEquivalent(quotes, o.quotes); 205 return dataEquivalent(quotes, o.quotes);
207 } 206 }
208 207
209 } // namespace blink 208 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698