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

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

Issue 1494563005: Oilpan: add missing pointer initialization following r362974. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/css/parser/CSSPropertyParser.h" 6 #include "core/css/parser/CSSPropertyParser.h"
7 7
8 #include "core/StylePropertyShorthand.h" 8 #include "core/StylePropertyShorthand.h"
9 #include "core/css/CSSCalculationValue.h" 9 #include "core/css/CSSCalculationValue.h"
10 #include "core/css/CSSCursorImageValue.h" 10 #include "core/css/CSSCursorImageValue.h"
(...skipping 2195 matching lines...) Expand 10 before | Expand all | Expand 10 after
2206 return nullptr; 2206 return nullptr;
2207 } 2207 }
2208 2208
2209 CSSValueID id = range.peek().id(); 2209 CSSValueID id = range.peek().id();
2210 if (!range.atEnd() && m_context.useCounter()) { 2210 if (!range.atEnd() && m_context.useCounter()) {
2211 if (id == CSSValueWebkitZoomIn) 2211 if (id == CSSValueWebkitZoomIn)
2212 m_context.useCounter()->count(UseCounter::PrefixedCursorZoomIn); 2212 m_context.useCounter()->count(UseCounter::PrefixedCursorZoomIn);
2213 else if (id == CSSValueWebkitZoomOut) 2213 else if (id == CSSValueWebkitZoomOut)
2214 m_context.useCounter()->count(UseCounter::PrefixedCursorZoomOut); 2214 m_context.useCounter()->count(UseCounter::PrefixedCursorZoomOut);
2215 } 2215 }
2216 RefPtrWillBeRawPtr<CSSValue> cursorType; 2216 RefPtrWillBeRawPtr<CSSValue> cursorType = nullptr;
2217 if (id == CSSValueHand) { 2217 if (id == CSSValueHand) {
2218 if (inQuirksMode()) // Non-standard behavior 2218 if (inQuirksMode()) // Non-standard behavior
2219 cursorType = cssValuePool().createIdentifierValue(CSSValuePointer); 2219 cursorType = cssValuePool().createIdentifierValue(CSSValuePointer);
2220 range.consumeIncludingWhitespace(); 2220 range.consumeIncludingWhitespace();
2221 } else if ((id >= CSSValueAuto && id <= CSSValueWebkitZoomOut) || id == CSSV alueCopy || id == CSSValueNone) { 2221 } else if ((id >= CSSValueAuto && id <= CSSValueWebkitZoomOut) || id == CSSV alueCopy || id == CSSValueNone) {
2222 cursorType = consumeIdent(range); 2222 cursorType = consumeIdent(range);
2223 } 2223 }
2224 2224
2225 if (!list) 2225 if (!list)
2226 return cursorType.release(); 2226 return cursorType.release();
(...skipping 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
3035 return consumeShorthandGreedily(flexFlowShorthand(), important); 3035 return consumeShorthandGreedily(flexFlowShorthand(), important);
3036 case CSSPropertyWebkitColumnRule: 3036 case CSSPropertyWebkitColumnRule:
3037 return consumeShorthandGreedily(webkitColumnRuleShorthand(), important); 3037 return consumeShorthandGreedily(webkitColumnRuleShorthand(), important);
3038 default: 3038 default:
3039 m_currentShorthand = oldShorthand; 3039 m_currentShorthand = oldShorthand;
3040 return false; 3040 return false;
3041 } 3041 }
3042 } 3042 }
3043 3043
3044 } // namespace blink 3044 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698