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

Side by Side Diff: ui/gfx/interpolated_transform.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 | « ui/gfx/interpolated_transform.h ('k') | ui/gfx/interpolated_transform_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/interpolated_transform.h" 5 #include "ui/gfx/interpolated_transform.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #ifndef M_PI 9 #ifndef M_PI
10 #define M_PI 3.14159265358979323846 10 #define M_PI 3.14159265358979323846
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 return gfx::Transform(); 323 return gfx::Transform();
324 } 324 }
325 325
326 void InterpolatedTransformAboutPivot::Init(const gfx::Point& pivot, 326 void InterpolatedTransformAboutPivot::Init(const gfx::Point& pivot,
327 InterpolatedTransform* xform) { 327 InterpolatedTransform* xform) {
328 gfx::Transform to_pivot; 328 gfx::Transform to_pivot;
329 gfx::Transform from_pivot; 329 gfx::Transform from_pivot;
330 to_pivot.Translate(SkIntToMScalar(-pivot.x()), SkIntToMScalar(-pivot.y())); 330 to_pivot.Translate(SkIntToMScalar(-pivot.x()), SkIntToMScalar(-pivot.y()));
331 from_pivot.Translate(SkIntToMScalar(pivot.x()), SkIntToMScalar(pivot.y())); 331 from_pivot.Translate(SkIntToMScalar(pivot.x()), SkIntToMScalar(pivot.y()));
332 332
333 scoped_ptr<InterpolatedTransform> pre_transform( 333 std::unique_ptr<InterpolatedTransform> pre_transform(
334 new InterpolatedConstantTransform(to_pivot)); 334 new InterpolatedConstantTransform(to_pivot));
335 scoped_ptr<InterpolatedTransform> post_transform( 335 std::unique_ptr<InterpolatedTransform> post_transform(
336 new InterpolatedConstantTransform(from_pivot)); 336 new InterpolatedConstantTransform(from_pivot));
337 337
338 pre_transform->SetChild(xform); 338 pre_transform->SetChild(xform);
339 xform->SetChild(post_transform.release()); 339 xform->SetChild(post_transform.release());
340 transform_.reset(pre_transform.release()); 340 transform_.reset(pre_transform.release());
341 } 341 }
342 342
343 InterpolatedMatrixTransform::InterpolatedMatrixTransform( 343 InterpolatedMatrixTransform::InterpolatedMatrixTransform(
344 const gfx::Transform& start_transform, 344 const gfx::Transform& start_transform,
345 const gfx::Transform& end_transform) 345 const gfx::Transform& end_transform)
346 : InterpolatedTransform() { 346 : InterpolatedTransform() {
(...skipping 24 matching lines...) Expand all
371 371
372 void InterpolatedMatrixTransform::Init(const gfx::Transform& start_transform, 372 void InterpolatedMatrixTransform::Init(const gfx::Transform& start_transform,
373 const gfx::Transform& end_transform) { 373 const gfx::Transform& end_transform) {
374 bool success = gfx::DecomposeTransform(&start_decomp_, start_transform); 374 bool success = gfx::DecomposeTransform(&start_decomp_, start_transform);
375 DCHECK(success); 375 DCHECK(success);
376 success = gfx::DecomposeTransform(&end_decomp_, end_transform); 376 success = gfx::DecomposeTransform(&end_decomp_, end_transform);
377 DCHECK(success); 377 DCHECK(success);
378 } 378 }
379 379
380 } // namespace ui 380 } // namespace ui
OLDNEW
« no previous file with comments | « ui/gfx/interpolated_transform.h ('k') | ui/gfx/interpolated_transform_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698