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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: Source/platform/transforms/TransformOperations.cpp

diff --git a/Source/platform/transforms/TransformOperations.cpp b/Source/platform/transforms/TransformOperations.cpp

index b9d4ade92b71d593bcc4b3580f3cf7c497881dfc..a0664f7d71439d9f48642e4150e4e74c81ba613d 100644

--- a/Source/platform/transforms/TransformOperations.cpp

+++ b/Source/platform/transforms/TransformOperations.cpp

@@ -75,7 +75,7 @@ TransformOperations TransformOperations::blendByMatchingOperations(const Transfo

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

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

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

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

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

if (blendedOperation)

result.operations().append(blendedOperation);

else {

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