third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp - Issue 1780603002: blink: Rename bindings/ methods to prefix with get when they collide.

Side by Side Diff: third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.cpp

Issue 1780603002: blink: Rename bindings/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-bindings: rebase 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

« no previous file with comments | « third_party/WebKit/Source/core/animation/animatable/AnimatableClipPathOperation.h ('k') | third_party/WebKit/Source/core/animation/animatable/AnimatableShadow.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 21 matching lines...) Expand all Loading...
32	32

33 namespace blink {	33 namespace blink {

34	34

35 bool AnimatableClipPathOperation::usesDefaultInterpolationWith(const AnimatableV alue* value) const	35 bool AnimatableClipPathOperation::usesDefaultInterpolationWith(const AnimatableV alue* value) const

36 {	36 {

37 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati on(value);	37 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati on(value);

38	38

39 if (m_operation->type() != ClipPathOperation::SHAPE \|\| toOperation->m_operat ion->type() != ClipPathOperation::SHAPE)	39 if (m_operation->type() != ClipPathOperation::SHAPE \|\| toOperation->m_operat ion->type() != ClipPathOperation::SHAPE)

40 return true;	40 return true;

41	41

42 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())- >basicShape();	42 const BasicShape* fromShape = toShapeClipPathOperation(getClipPathOperation( ))->basicShape();

43 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp eration())->basicShape();	43 const BasicShape* toShape = toShapeClipPathOperation(toOperation->getClipPat hOperation())->basicShape();

44	44

45 return !fromShape->canBlend(toShape);	45 return !fromShape->canBlend(toShape);

46 }	46 }

47	47

48 PassRefPtr<AnimatableValue> AnimatableClipPathOperation::interpolateTo(const Ani matableValue* value, double fraction) const	48 PassRefPtr<AnimatableValue> AnimatableClipPathOperation::interpolateTo(const Ani matableValue* value, double fraction) const

49 {	49 {

50 if (usesDefaultInterpolationWith(value))	50 if (usesDefaultInterpolationWith(value))

51 return defaultInterpolateTo(this, value, fraction);	51 return defaultInterpolateTo(this, value, fraction);

52	52

53 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati on(value);	53 const AnimatableClipPathOperation* toOperation = toAnimatableClipPathOperati on(value);

54 const BasicShape* fromShape = toShapeClipPathOperation(clipPathOperation())- >basicShape();	54 const BasicShape* fromShape = toShapeClipPathOperation(getClipPathOperation( ))->basicShape();

55 const BasicShape* toShape = toShapeClipPathOperation(toOperation->clipPathOp eration())->basicShape();	55 const BasicShape* toShape = toShapeClipPathOperation(toOperation->getClipPat hOperation())->basicShape();

56	56

57 return AnimatableClipPathOperation::create(ShapeClipPathOperation::create(to Shape->blend(fromShape, fraction)).get());	57 return AnimatableClipPathOperation::create(ShapeClipPathOperation::create(to Shape->blend(fromShape, fraction)).get());

58 }	58 }

59	59

60 bool AnimatableClipPathOperation::equalTo(const AnimatableValue* value) const	60 bool AnimatableClipPathOperation::equalTo(const AnimatableValue* value) const

61 {	61 {

62 const ClipPathOperation* operation = toAnimatableClipPathOperation(value)->m _operation.get();	62 const ClipPathOperation* operation = toAnimatableClipPathOperation(value)->m _operation.get();

63 return m_operation == operation \|\| (m_operation && operation && m_operation == operation);	63 return m_operation == operation \|\| (m_operation && operation && m_operation == operation);

64 }	64 }

65	65

66 } // namespace blink	66 } // namespace blink

OLD	NEW