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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 { 60 {
61 return compareCSSValuePtr(m_first, other.m_first) 61 return compareCSSValuePtr(m_first, other.m_first)
62 && compareCSSValuePtr(m_second, other.m_second) 62 && compareCSSValuePtr(m_second, other.m_second)
63 && m_identicalValuesPolicy == other.m_identicalValuesPolicy; 63 && m_identicalValuesPolicy == other.m_identicalValuesPolicy;
64 } 64 }
65 65
66 void trace(Visitor*); 66 void trace(Visitor*);
67 67
68 private: 68 private:
69 Pair() 69 Pair()
70 : m_first(0) 70 : m_first(nullptr)
71 , m_second(0) 71 , m_second(nullptr)
72 , m_identicalValuesPolicy(DropIdenticalValues) { } 72 , m_identicalValuesPolicy(DropIdenticalValues) { }
73 73
74 Pair(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> first, PassRefPtrWillBeRawPtr <CSSPrimitiveValue> second, IdenticalValuesPolicy identicalValuesPolicy) 74 Pair(PassRefPtrWillBeRawPtr<CSSPrimitiveValue> first, PassRefPtrWillBeRawPtr <CSSPrimitiveValue> second, IdenticalValuesPolicy identicalValuesPolicy)
75 : m_first(first) 75 : m_first(first)
76 , m_second(second) 76 , m_second(second)
77 , m_identicalValuesPolicy(identicalValuesPolicy) { } 77 , m_identicalValuesPolicy(identicalValuesPolicy) { }
78 78
79 static String generateCSSString(const String& first, const String& second, I denticalValuesPolicy identicalValuesPolicy) 79 static String generateCSSString(const String& first, const String& second, I denticalValuesPolicy identicalValuesPolicy)
80 { 80 {
81 if (identicalValuesPolicy == DropIdenticalValues && first == second) 81 if (identicalValuesPolicy == DropIdenticalValues && first == second)
82 return first; 82 return first;
83 return first + ' ' + second; 83 return first + ' ' + second;
84 } 84 }
85 85
86 RefPtrWillBeMember<CSSPrimitiveValue> m_first; 86 RefPtrWillBeMember<CSSPrimitiveValue> m_first;
87 RefPtrWillBeMember<CSSPrimitiveValue> m_second; 87 RefPtrWillBeMember<CSSPrimitiveValue> m_second;
88 IdenticalValuesPolicy m_identicalValuesPolicy; 88 IdenticalValuesPolicy m_identicalValuesPolicy;
89 }; 89 };
90 90
91 } // namespace 91 } // namespace
92 92
93 #endif 93 #endif
OLDNEW
« no previous file with comments | « Source/core/css/MediaQueryMatcher.cpp ('k') | Source/core/css/PropertySetCSSStyleDeclaration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698