-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port PlatformCAAnimationRemote::Properties to the new IPC serializati…
…on format https://bugs.webkit.org/show_bug.cgi?id=264597 Reviewed by Alex Christensen. * Source/WebKit/DerivedSources-input.xcfilelist: * Source/WebKit/DerivedSources.make: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.h: * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemote.mm: (WebKit::PlatformCAAnimationRemote::Properties::encode const): Deleted. (WebKit::PlatformCAAnimationRemote::Properties::decode): Deleted. * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemoteProperties.h: Added. * Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemoteProperties.serialization.in: Added. Canonical link: https://commits.webkit.org/270559@main
- Loading branch information
Showing
7 changed files
with
122 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
Source/WebKit/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemoteProperties.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * Copyright (C) 2014-2023 Apple 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: | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. 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. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <WebCore/PlatformCAAnimation.h> | ||
| #include <wtf/Forward.h> | ||
|
|
||
| namespace WebKit { | ||
|
|
||
| struct PlatformCAAnimationRemoteProperties { | ||
| String keyPath; | ||
| WebCore::PlatformCAAnimation::AnimationType animationType { WebCore::PlatformCAAnimation::Basic }; | ||
|
|
||
| CFTimeInterval beginTime { 0 }; | ||
| double duration { 0 }; | ||
| double timeOffset { 0 }; | ||
| float repeatCount { 1 }; | ||
| float speed { 1 }; | ||
|
|
||
| WebCore::PlatformCAAnimation::FillModeType fillMode { WebCore::PlatformCAAnimation::NoFillMode }; | ||
| WebCore::PlatformCAAnimation::ValueFunctionType valueFunction { WebCore::PlatformCAAnimation::NoValueFunction }; | ||
| RefPtr<WebCore::TimingFunction> timingFunction; | ||
|
|
||
| bool autoReverses { false }; | ||
| bool removedOnCompletion { true }; | ||
| bool additive { false }; | ||
| bool reverseTimingFunctions { false }; | ||
| bool hasExplicitBeginTime { false }; | ||
|
|
||
| // For basic animations, these vectors have two entries. For keyframe animations, two or more. | ||
| // timingFunctions has n-1 entries. | ||
| using KeyframeValue = std::variant<float, WebCore::Color, WebCore::FloatPoint3D, WebCore::TransformationMatrix, RefPtr<WebCore::FilterOperation>>; | ||
| Vector<KeyframeValue> keyValues; | ||
| Vector<float> keyTimes; | ||
| Vector<Ref<WebCore::TimingFunction>> timingFunctions; | ||
|
|
||
| Vector<PlatformCAAnimationRemoteProperties> animations; | ||
| }; | ||
|
|
||
| } // namespace WebKit |
48 changes: 48 additions & 0 deletions
48
...t/WebProcess/WebPage/RemoteLayerTree/PlatformCAAnimationRemoteProperties.serialization.in
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| # Copyright (C) 2022 Apple 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: | ||
| # 1. Redistributions of source code must retain the above copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # 2. 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. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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. | ||
|
|
||
| struct WebKit::PlatformCAAnimationRemoteProperties { | ||
| String keyPath; | ||
| WebCore::PlatformCAAnimation::AnimationType animationType; | ||
|
|
||
| CFTimeInterval beginTime; | ||
| double duration; | ||
| double timeOffset; | ||
| float repeatCount; | ||
| float speed; | ||
|
|
||
| WebCore::PlatformCAAnimation::FillModeType fillMode; | ||
| WebCore::PlatformCAAnimation::ValueFunctionType valueFunction; | ||
| RefPtr<WebCore::TimingFunction> timingFunction; | ||
|
|
||
| bool autoReverses; | ||
| bool removedOnCompletion; | ||
| bool additive; | ||
| bool reverseTimingFunctions; | ||
| bool hasExplicitBeginTime; | ||
|
|
||
| Vector<WebKit::PlatformCAAnimationRemoteProperties::KeyframeValue> keyValues; | ||
| Vector<float> keyTimes; | ||
| Vector<Ref<WebCore::TimingFunction>> timingFunctions; | ||
|
|
||
| Vector<WebKit::PlatformCAAnimationRemoteProperties> animations; | ||
| }; |