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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/CSSToStyleMap.cpp

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . Created 4 years, 9 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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 411
412 if (value.isCubicBezierTimingFunctionValue()) { 412 if (value.isCubicBezierTimingFunctionValue()) {
413 const CSSCubicBezierTimingFunctionValue& cubicTimingFunction = toCSSCubi cBezierTimingFunctionValue(value); 413 const CSSCubicBezierTimingFunctionValue& cubicTimingFunction = toCSSCubi cBezierTimingFunctionValue(value);
414 return CubicBezierTimingFunction::create(cubicTimingFunction.x1(), cubic TimingFunction.y1(), cubicTimingFunction.x2(), cubicTimingFunction.y2()); 414 return CubicBezierTimingFunction::create(cubicTimingFunction.x1(), cubic TimingFunction.y1(), cubicTimingFunction.x2(), cubicTimingFunction.y2());
415 } 415 }
416 416
417 if (value.isInitialValue()) 417 if (value.isInitialValue())
418 return CSSTimingData::initialTimingFunction(); 418 return CSSTimingData::initialTimingFunction();
419 419
420 const CSSStepsTimingFunctionValue& stepsTimingFunction = toCSSStepsTimingFun ctionValue(value); 420 const CSSStepsTimingFunctionValue& stepsTimingFunction = toCSSStepsTimingFun ctionValue(value);
421 if (stepsTimingFunction.stepAtPosition() == StepsTimingFunction::Middle && ! allowStepMiddle) 421 if (stepsTimingFunction.getStepAtPosition() == StepsTimingFunction::Middle & & !allowStepMiddle)
422 return CSSTimingData::initialTimingFunction(); 422 return CSSTimingData::initialTimingFunction();
423 return StepsTimingFunction::create(stepsTimingFunction.numberOfSteps(), step sTimingFunction.stepAtPosition()); 423 return StepsTimingFunction::create(stepsTimingFunction.numberOfSteps(), step sTimingFunction.getStepAtPosition());
424 } 424 }
425 425
426 void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID p roperty, const CSSValue& value, NinePieceImage& image) 426 void CSSToStyleMap::mapNinePieceImage(StyleResolverState& state, CSSPropertyID p roperty, const CSSValue& value, NinePieceImage& image)
427 { 427 {
428 // If we're not a value list, then we are "none" and don't need to alter the empty image at all. 428 // If we're not a value list, then we are "none" and don't need to alter the empty image at all.
429 if (!value.isValueList()) 429 if (!value.isValueList())
430 return; 430 return;
431 431
432 // Retrieve the border image value. 432 // Retrieve the border image value.
433 const CSSValueList& borderImage = toCSSValueList(value); 433 const CSSValueList& borderImage = toCSSValueList(value);
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 verticalRule = SpaceImageRule; 575 verticalRule = SpaceImageRule;
576 break; 576 break;
577 default: // CSSValueRepeat 577 default: // CSSValueRepeat
578 verticalRule = RepeatImageRule; 578 verticalRule = RepeatImageRule;
579 break; 579 break;
580 } 580 }
581 image.setVerticalRule(verticalRule); 581 image.setVerticalRule(verticalRule);
582 } 582 }
583 583
584 } // namespace blink 584 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698