diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp b/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp deleted file mode 100644 index 8f0e2b0e3e7..00000000000 --- a/chromium/third_party/WebKit/Source/core/platform/graphics/transforms/InterpolatedTransformOperation.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2013 Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "core/platform/graphics/transforms/InterpolatedTransformOperation.h" - -#include "core/platform/graphics/transforms/IdentityTransformOperation.h" - -namespace WebCore { - -bool InterpolatedTransformOperation::operator==(const TransformOperation& o) const -{ - if (!isSameType(o)) - return false; - const InterpolatedTransformOperation* t = static_cast<const InterpolatedTransformOperation*>(&o); - return progress == t->progress && from == t->from && to == t->to; -} - -bool InterpolatedTransformOperation::apply(TransformationMatrix& transform, const FloatSize& borderBoxSize) const -{ - TransformationMatrix fromTransform; - TransformationMatrix toTransform; - from.apply(borderBoxSize, fromTransform); - to.apply(borderBoxSize, toTransform); - - toTransform.blend(fromTransform, progress); - transform.multiply(toTransform); - return true; -} - -PassRefPtr<TransformOperation> InterpolatedTransformOperation::blend(const TransformOperation* from, double progress, bool blendToIdentity) -{ - if (from && !from->isSameType(*this)) - return this; - - TransformOperations thisOperations; - thisOperations.operations().append(this); - TransformOperations fromOperations; - if (blendToIdentity) - fromOperations.operations().append(IdentityTransformOperation::create()); - else - fromOperations.operations().append(const_cast<TransformOperation*>(from)); - return InterpolatedTransformOperation::create(thisOperations, fromOperations, progress); -} - -} // namespace WebCore - |