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

Side by Side Diff: Source/core/style/StyleRareNonInheritedData.h

Issue 1266723004: Revert of Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 4 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 | « Source/core/style/ComputedStyle.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 // In which case, we need to update the ComputedStyle on the LayoutEmbeddedO bject, 197 // In which case, we need to update the ComputedStyle on the LayoutEmbeddedO bject,
198 // so store this bit so that the style actually changes when the plugin 198 // so store this bit so that the style actually changes when the plugin
199 // becomes composited. 199 // becomes composited.
200 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1; 200 unsigned m_requiresAcceleratedCompositingForExternalReasons: 1;
201 201
202 // Whether the transform (if it exists) is stored in the element's inline st yle. 202 // Whether the transform (if it exists) is stored in the element's inline st yle.
203 unsigned m_hasInlineTransform : 1; 203 unsigned m_hasInlineTransform : 1;
204 unsigned m_resize : 2; // EResize 204 unsigned m_resize : 2; // EResize
205 unsigned m_hasCompositorProxy : 1; 205 unsigned m_hasCompositorProxy : 1;
206 206
207 // Style adjustment for appearance is disabled when certain properties are s et.
208 unsigned m_hasAuthorBackground : 1; // Whether there is a author-defined bac kground.
209 unsigned m_hasAuthorBorder : 1; // Whether there is a author-defined border.
210
211 private: 207 private:
212 StyleRareNonInheritedData(); 208 StyleRareNonInheritedData();
213 StyleRareNonInheritedData(const StyleRareNonInheritedData&); 209 StyleRareNonInheritedData(const StyleRareNonInheritedData&);
214 }; 210 };
215 211
216 } // namespace blink 212 } // namespace blink
217 213
218 #endif // StyleRareNonInheritedData_h 214 #endif // StyleRareNonInheritedData_h
OLDNEW
« no previous file with comments | « Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698