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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

Issue 1311413004: Merge parseBorderRadius and parseInsetRoundedCorners (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase again 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
index b0a974868c45d7bdab067f659cc5bd0a2fb6b820..34ffd051451379196c8ded60b72e2d4f1d7eebec 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h
@@ -222,7 +222,7 @@ private:
bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageSliceValue>&);
bool parseBorderImageWidth(RefPtrWillBeRawPtr<CSSQuadValue>&);
bool parseBorderImageOutset(RefPtrWillBeRawPtr<CSSQuadValue>&);
- bool parseBorderRadius(CSSPropertyID, bool important);
+ bool parseRadii(RefPtrWillBeRawPtr<CSSPrimitiveValue> radii[4], RefPtrWillBeRawPtr<CSSPrimitiveValue> radii2[4], CSSParserValueList*, CSSPropertyID = CSSPropertyInvalid);
PassRefPtrWillBeRawPtr<CSSValue> parseReflect();
@@ -254,8 +254,6 @@ private:
PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveStringValue(CSSParserValue*);
PassRefPtrWillBeRawPtr<CSSCustomIdentValue> createPrimitiveCustomIdentValue(CSSParserValue*);
- PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue> parseInsetRoundedCorners(PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue>, CSSParserValueList*);
-
class ImplicitScope {
STACK_ALLOCATED();
WTF_MAKE_NONCOPYABLE(ImplicitScope);

Powered by Google App Engine
This is Rietveld 408576698