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

Side by Side Diff: Source/core/style/ComputedStyle.cpp

Issue 1308953009: Move Image ownership out of CSSValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/style/ComputedStyle.h ('k') | Source/core/style/StyleFetchedImage.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 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 struct InheritedFlags { 66 struct InheritedFlags {
67 unsigned m_bitfields[2]; 67 unsigned m_bitfields[2];
68 } inherited_flags; 68 } inherited_flags;
69 69
70 struct NonInheritedFlags { 70 struct NonInheritedFlags {
71 unsigned m_bitfields[2]; 71 unsigned m_bitfields[2];
72 } noninherited_flags; 72 } noninherited_flags;
73 }; 73 };
74 74
75 static_assert(sizeof(ComputedStyle) == sizeof(SameSizeAsComputedStyle), "Compute dStyle should stay small"); 75 //static_assert(sizeof(ComputedStyle) == sizeof(SameSizeAsComputedStyle), "Compu tedStyle should stay small");
76 76
77 PassRefPtr<ComputedStyle> ComputedStyle::create() 77 PassRefPtr<ComputedStyle> ComputedStyle::create()
78 { 78 {
79 return adoptRef(new ComputedStyle()); 79 return adoptRef(new ComputedStyle());
80 } 80 }
81 81
82 PassRefPtr<ComputedStyle> ComputedStyle::createInitialStyle() 82 PassRefPtr<ComputedStyle> ComputedStyle::createInitialStyle()
83 { 83 {
84 return adoptRef(new ComputedStyle(InitialStyle)); 84 return adoptRef(new ComputedStyle(InitialStyle));
85 } 85 }
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1799 } 1799 }
1800 1800
1801 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other) 1801 void ComputedStyle::copyChildDependentFlagsFrom(const ComputedStyle& other)
1802 { 1802 {
1803 setEmptyState(other.emptyState()); 1803 setEmptyState(other.emptyState());
1804 if (other.hasExplicitlyInheritedProperties()) 1804 if (other.hasExplicitlyInheritedProperties())
1805 setHasExplicitlyInheritedProperties(); 1805 setHasExplicitlyInheritedProperties();
1806 } 1806 }
1807 1807
1808 } // namespace blink 1808 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/style/ComputedStyle.h ('k') | Source/core/style/StyleFetchedImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698