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

Side by Side Diff: Source/core/css/Pair.h

Issue 22887044: [oilpan] Make the oilpan branch build on Mac. (Closed) Base URL: svn://svn.chromium.org/blink/branches/oilpan
Patch Set: Add FIXME. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/MediaQueryExp.cpp ('k') | Source/core/css/SelectorFilter.h » ('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 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 String serializeResolvingVariables(const HashMap<AtomicString, String>& vari ables) const 63 String serializeResolvingVariables(const HashMap<AtomicString, String>& vari ables) const
64 { 64 {
65 return generateCSSString(first()->customSerializeResolvingVariables(vari ables), 65 return generateCSSString(first()->customSerializeResolvingVariables(vari ables),
66 second()->customSerializeResolvingVariables(var iables)); 66 second()->customSerializeResolvingVariables(var iables));
67 } 67 }
68 68
69 bool hasVariableReference() const { return first()->hasVariableReference() | | second()->hasVariableReference(); } 69 bool hasVariableReference() const { return first()->hasVariableReference() | | second()->hasVariableReference(); }
70 70
71 private: 71 private:
72 Pair() : m_first(0), m_second(0) { } 72 Pair() { }
73 Pair(const Handle<CSSPrimitiveValue>& first, const Handle<CSSPrimitiveValue> & second) 73 Pair(const Handle<CSSPrimitiveValue>& first, const Handle<CSSPrimitiveValue> & second)
74 : m_first(first), m_second(second) { } 74 : m_first(first), m_second(second) { }
75 75
76 static String generateCSSString(const String& first, const String& second) 76 static String generateCSSString(const String& first, const String& second)
77 { 77 {
78 if (first == second) 78 if (first == second)
79 return first; 79 return first;
80 return first + ' ' + second; 80 return first + ' ' + second;
81 } 81 }
82 82
83 Member<CSSPrimitiveValue> m_first; 83 Member<CSSPrimitiveValue> m_first;
84 Member<CSSPrimitiveValue> m_second; 84 Member<CSSPrimitiveValue> m_second;
85 }; 85 };
86 86
87 } // namespace 87 } // namespace
88 88
89 #endif 89 #endif
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryExp.cpp ('k') | Source/core/css/SelectorFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698