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

Unified Diff: Source/core/rendering/style/StyleRareInheritedData.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/style/StyleRareInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareInheritedData.cpp b/Source/core/rendering/style/StyleRareInheritedData.cpp
index 8db21a068bfb22de531d53a3cec8de8262e3275e..3ca9ff22144720e54b9280cb413c5c2b231009f2 100644
--- a/Source/core/rendering/style/StyleRareInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareInheritedData.cpp
@@ -33,9 +33,9 @@ namespace WebCore {
struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareInheritedData> {
void* styleImage;
- StyleColor firstColor;
+ Color firstColor;
float firstFloat;
- StyleColor colors[5];
+ Color colors[5];
void* ownPtrs[1];
AtomicString atomicStrings[5];
void* refPtrs[2];
@@ -46,7 +46,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
unsigned unsigneds[1];
short hyphenationShorts[3];
- StyleColor touchColors;
+ Color touchColors;
void* variableDataRefs[1];
};

Powered by Google App Engine
This is Rietveld 408576698