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

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

Issue 333163004: Remove explicit bounds check from CSSValueList::item (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: address comment Created 6 years, 6 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
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, 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 * 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 static PassRefPtrWillBeRawPtr<CSSValueList> createSlashSeparated() 42 static PassRefPtrWillBeRawPtr<CSSValueList> createSlashSeparated()
43 { 43 {
44 return adoptRefWillBeNoop(new CSSValueList(SlashSeparator)); 44 return adoptRefWillBeNoop(new CSSValueList(SlashSeparator));
45 } 45 }
46 static PassRefPtrWillBeRawPtr<CSSValueList> createFromParserValueList(CSSPar serValueList* list) 46 static PassRefPtrWillBeRawPtr<CSSValueList> createFromParserValueList(CSSPar serValueList* list)
47 { 47 {
48 return adoptRefWillBeNoop(new CSSValueList(list)); 48 return adoptRefWillBeNoop(new CSSValueList(list));
49 } 49 }
50 50
51 size_t length() const { return m_values.size(); } 51 size_t length() const { return m_values.size(); }
52 CSSValue* item(size_t index) { return index < m_values.size() ? m_values[ind ex].get() : 0; } 52 CSSValue* item(size_t index) { return m_values[index].get(); }
53 const CSSValue* item(size_t index) const { return index < m_values.size() ? m_values[index].get() : 0; } 53 const CSSValue* item(size_t index) const { return m_values[index].get(); }
54 CSSValue* itemWithoutBoundsCheck(size_t index) { return m_values[index].get( ); } 54 CSSValue* itemWithBoundsCheck(size_t index) { return index < m_values.size() ? m_values[index].get() : 0; }
55 55
56 void append(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.append(value) ; } 56 void append(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.append(value) ; }
57 void prepend(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.prepend(valu e); } 57 void prepend(PassRefPtrWillBeRawPtr<CSSValue> value) { m_values.prepend(valu e); }
58 bool removeAll(CSSValue*); 58 bool removeAll(CSSValue*);
59 bool hasValue(CSSValue*) const; 59 bool hasValue(CSSValue*) const;
60 PassRefPtrWillBeRawPtr<CSSValueList> copy(); 60 PassRefPtrWillBeRawPtr<CSSValueList> copy();
61 61
62 String customCSSText(CSSTextFormattingFlags = QuoteCSSStringIfNeeded) const; 62 String customCSSText(CSSTextFormattingFlags = QuoteCSSStringIfNeeded) const;
63 bool equals(const CSSValueList&) const; 63 bool equals(const CSSValueList&) const;
64 bool equals(const CSSValue&) const; 64 bool equals(const CSSValue&) const;
(...skipping 16 matching lines...) Expand all
81 }; 81 };
82 82
83 DEFINE_CSS_VALUE_TYPE_CASTS(CSSValueList, isValueList()); 83 DEFINE_CSS_VALUE_TYPE_CASTS(CSSValueList, isValueList());
84 84
85 // Objects of this class are intended to be stack-allocated and scoped to a sing le function. 85 // Objects of this class are intended to be stack-allocated and scoped to a sing le function.
86 // Please take care not to pass these around as they do hold onto a raw pointer. 86 // Please take care not to pass these around as they do hold onto a raw pointer.
87 class CSSValueListInspector { 87 class CSSValueListInspector {
88 STACK_ALLOCATED(); 88 STACK_ALLOCATED();
89 public: 89 public:
90 CSSValueListInspector(CSSValue* value) : m_list((value && value->isValueList ()) ? toCSSValueList(value) : 0) { } 90 CSSValueListInspector(CSSValue* value) : m_list((value && value->isValueList ()) ? toCSSValueList(value) : 0) { }
91 CSSValue* item(size_t index) const { ASSERT_WITH_SECURITY_IMPLICATION(index < length()); return m_list->itemWithoutBoundsCheck(index); } 91 CSSValue* item(size_t index) const { ASSERT_WITH_SECURITY_IMPLICATION(index < length()); return m_list->item(index); }
92 CSSValue* first() const { return item(0); } 92 CSSValue* first() const { return item(0); }
93 CSSValue* second() const { return item(1); } 93 CSSValue* second() const { return item(1); }
94 size_t length() const { return m_list ? m_list->length() : 0; } 94 size_t length() const { return m_list ? m_list->length() : 0; }
95 private: 95 private:
96 RawPtrWillBeMember<CSSValueList> m_list; 96 RawPtrWillBeMember<CSSValueList> m_list;
97 }; 97 };
98 98
99 // Wrapper that can be used to iterate over any CSSValue. Non-list values and 0 behave as zero-length lists. 99 // Wrapper that can be used to iterate over any CSSValue. Non-list values and 0 behave as zero-length lists.
100 // Objects of this class are intended to be stack-allocated and scoped to a sing le function. 100 // Objects of this class are intended to be stack-allocated and scoped to a sing le function.
101 // Please take care not to pass these around as they do hold onto a raw pointer. 101 // Please take care not to pass these around as they do hold onto a raw pointer.
102 class CSSValueListIterator { 102 class CSSValueListIterator {
103 STACK_ALLOCATED(); 103 STACK_ALLOCATED();
104 public: 104 public:
105 CSSValueListIterator(CSSValue* value) : m_inspector(value), m_position(0) { } 105 CSSValueListIterator(CSSValue* value) : m_inspector(value), m_position(0) { }
106 bool hasMore() const { return m_position < m_inspector.length(); } 106 bool hasMore() const { return m_position < m_inspector.length(); }
107 CSSValue* value() const { return m_inspector.item(m_position); } 107 CSSValue* value() const { return m_inspector.item(m_position); }
108 bool isPrimitiveValue() const { return value()->isPrimitiveValue(); } 108 bool isPrimitiveValue() const { return value()->isPrimitiveValue(); }
109 void advance() { m_position++; ASSERT(m_position <= m_inspector.length());} 109 void advance() { m_position++; ASSERT(m_position <= m_inspector.length());}
110 size_t index() const { return m_position; } 110 size_t index() const { return m_position; }
111 private: 111 private:
112 CSSValueListInspector m_inspector; 112 CSSValueListInspector m_inspector;
113 size_t m_position; 113 size_t m_position;
114 }; 114 };
115 115
116 } // namespace WebCore 116 } // namespace WebCore
117 117
118 #endif // CSSValueList_h 118 #endif // CSSValueList_h
OLDNEW
« no previous file with comments | « Source/build/scripts/templates/StyleBuilderFunctions.cpp.tmpl ('k') | Source/core/css/CSSValueList.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698