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

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

Issue 1067293003: Fix Android build. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('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) 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 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 RGBA32 m_color; 45 RGBA32 m_color;
46 unsigned m_width; 46 unsigned m_width;
47 }; 47 };
48 48
49 COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue _should_not_grow); 49 COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue _should_not_grow);
50 50
51 struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> { 51 struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> {
52 void* dataRefs[7]; 52 void* dataRefs[7];
53 53
54 struct InheritedFlags { 54 struct InheritedFlags {
55 unsigned m_bitfields[2]; 55 unsigned m_bitfields;
56 } inherited_flags; 56 } inherited_flags;
57 57
58 struct NonInheritedFlags { 58 struct NonInheritedFlags {
59 unsigned m_bitfields[2]; 59 unsigned m_bitfields[2];
60 } noninherited_flags; 60 } noninherited_flags;
61 }; 61 };
62 62
63 COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle _should_stay_small); 63 COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle _should_stay_small);
64 64
65 inline RenderStyle* defaultStyle() 65 inline RenderStyle* defaultStyle()
(...skipping 1094 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 // right 1160 // right
1161 radiiSum = radii.topRight().height() + radii.bottomRight().height(); 1161 radiiSum = radii.topRight().height() + radii.bottomRight().height();
1162 if (radiiSum > rect.height()) 1162 if (radiiSum > rect.height())
1163 factor = std::min(rect.height() / radiiSum, factor); 1163 factor = std::min(rect.height() / radiiSum, factor);
1164 1164
1165 ASSERT(factor <= 1); 1165 ASSERT(factor <= 1);
1166 return factor; 1166 return factor;
1167 } 1167 }
1168 1168
1169 } // namespace blink 1169 } // namespace blink
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/style/RenderStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698