Source/platform/transforms/TransformOperations.cpp - Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr.

Side by Side Diff: Source/platform/transforms/TransformOperations.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Final rebase Created 6 years, 10 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 | Annotate | Revision Log

« no previous file with comments | « Source/platform/scroll/ScrollView.cpp ('k') | Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)	2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)

3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.	3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 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 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 TransformOperations TransformOperations::blendByMatchingOperations(const Transfo rmOperations& from, const double& progress) const	68 TransformOperations TransformOperations::blendByMatchingOperations(const Transfo rmOperations& from, const double& progress) const

69 {	69 {

70 TransformOperations result;	70 TransformOperations result;

71	71

72 unsigned fromSize = from.operations().size();	72 unsigned fromSize = from.operations().size();

73 unsigned toSize = operations().size();	73 unsigned toSize = operations().size();

74 unsigned size = max(fromSize, toSize);	74 unsigned size = max(fromSize, toSize);

75 for (unsigned i = 0; i < size; i++) {	75 for (unsigned i = 0; i < size; i++) {

76 RefPtr<TransformOperation> fromOperation = (i < fromSize) ? from.operati ons()[i].get() : 0;	76 RefPtr<TransformOperation> fromOperation = (i < fromSize) ? from.operati ons()[i].get() : 0;

77 RefPtr<TransformOperation> toOperation = (i < toSize) ? operations()[i]. get() : 0;	77 RefPtr<TransformOperation> toOperation = (i < toSize) ? operations()[i]. get() : 0;

78 RefPtr<TransformOperation> blendedOperation = toOperation ? toOperation- >blend(fromOperation.get(), progress) : (fromOperation ? fromOperation->blend(0, progress, true) : 0);	78 RefPtr<TransformOperation> blendedOperation = toOperation ? toOperation- >blend(fromOperation.get(), progress) : (fromOperation ? fromOperation->blend(0, progress, true) : nullptr);

79 if (blendedOperation)	79 if (blendedOperation)

80 result.operations().append(blendedOperation);	80 result.operations().append(blendedOperation);

81 else {	81 else {

82 RefPtr<TransformOperation> identityOperation = IdentityTransformOper ation::create();	82 RefPtr<TransformOperation> identityOperation = IdentityTransformOper ation::create();

83 if (progress > 0.5)	83 if (progress > 0.5)

84 result.operations().append(toOperation ? toOperation : identityO peration);	84 result.operations().append(toOperation ? toOperation : identityO peration);

85 else	85 else

86 result.operations().append(fromOperation ? fromOperation : ident ityOperation);	86 result.operations().append(fromOperation ? fromOperation : ident ityOperation);

87 }	87 }

88 }	88 }

(...skipping 22 matching lines...) Expand all Loading...
111	111

112 TransformOperations TransformOperations::add(const TransformOperations& addend) const	112 TransformOperations TransformOperations::add(const TransformOperations& addend) const

113 {	113 {

114 TransformOperations result;	114 TransformOperations result;

115 result.m_operations = operations();	115 result.m_operations = operations();

116 result.m_operations.appendVector(addend.operations());	116 result.m_operations.appendVector(addend.operations());

117 return result;	117 return result;

118 }	118 }

119	119

120 } // namespace WebCore	120 } // namespace WebCore

OLD	NEW