Attachment 373227 Details for Bug 199358 – Patch

[patch] Patch

bug-199358-20190701150852.patch (text/plain), 4.27 KB, created by Miguel Gomez on 2019-07-01 06:08:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Gomez

Created: 2019-07-01 06:08:54 PDT

Size: 4.27 KB

patch

obsolete

>Subversion Revision: 247005
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1fb5a9c54294f12ca63ebc28ff6539a358bb039e..ea5ad68f97dbbd8746f3809c6badd39c01bb3e0d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-01  Miguel Gomez  <magomez@igalia.com>
>+
>+        REGRESSION(r246963) GTK's debug build is broken
>+        https://bugs.webkit.org/show_bug.cgi?id=199358
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        Add traits to be able to downcast AnimatedBackingStoreClient.
>+
>+        * platform/graphics/nicosia/NicosiaAnimatedBackingStoreClient.h:
>+        (Nicosia::AnimatedBackingStoreClient::AnimatedBackingStoreClient):
>+        (Nicosia::AnimatedBackingStoreClient::type const):
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
>+        (WebCore::CoordinatedGraphicsLayer::updateContentBuffers):
>+
> 2019-07-01  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix GTK build with GSTREAMER_GL disabled after r246710
>diff --git a/Source/WebCore/platform/graphics/nicosia/NicosiaAnimatedBackingStoreClient.h b/Source/WebCore/platform/graphics/nicosia/NicosiaAnimatedBackingStoreClient.h
>index 21de15ecd54151c06795537be954cfa9e8160bfe..4d03a3261b9413c73edd028890f46f6699c26f02 100644
>--- a/Source/WebCore/platform/graphics/nicosia/NicosiaAnimatedBackingStoreClient.h
>+++ b/Source/WebCore/platform/graphics/nicosia/NicosiaAnimatedBackingStoreClient.h
>@@ -40,10 +40,28 @@ namespace Nicosia {
> 
> class AnimatedBackingStoreClient : public ThreadSafeRefCounted<AnimatedBackingStoreClient> {
> public:
>+    enum class Type {
>+        Coordinated
>+    };
>+
>+    explicit AnimatedBackingStoreClient(Type type)
>+        : m_type(type)
>+    {
>+    }
>+
>+    Type type() const { return m_type; }
>     virtual ~AnimatedBackingStoreClient() = default;
>     virtual void requestBackingStoreUpdateIfNeeded(const WebCore::TransformationMatrix&) = 0;
>+
>+private:
>+    Type m_type;
> };
> 
> } // namespace Nicosia
> 
>+#define SPECIALIZE_TYPE_TRAITS_ANIMATEDBACKINGSTORECLIENT(ToValueTypeName, predicate) \
>+SPECIALIZE_TYPE_TRAITS_BEGIN(ToValueTypeName) \
>+    static bool isType(const Nicosia::AnimatedBackingStoreClient& client) { return client.predicate; } \
>+SPECIALIZE_TYPE_TRAITS_END()
>+
> #endif // USE(COORDINATED_GRAPHICS)
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>index 0b051a9be58f9b01434535f691df9bf0800473e8..367d8a53cf370d2202d6f3401cdcb3a02ff42c2b 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>@@ -699,7 +699,8 @@ public:
> 
> private:
>     CoordinatedAnimatedBackingStoreClient(RefPtr<CoordinatedGraphicsLayer::AnimatedBackingStoreHost>&& host, const FloatRect& visibleRect, const FloatRect& coverRect, const FloatSize& size, float contentsScale)
>-        : m_host(WTFMove(host))
>+        : Nicosia::AnimatedBackingStoreClient(Type::Coordinated)
>+        , m_host(WTFMove(host))
>         , m_visibleRect(visibleRect)
>         , m_coverRect(coverRect)
>         , m_size(size)
>@@ -1004,9 +1005,9 @@ void CoordinatedGraphicsLayer::updateContentBuffers()
>         layerState.mainBackingStore->createTilesIfNeeded(transformedVisibleRect(), IntRect(0, 0, m_size.width(), m_size.height()));
>     }
> 
>-    if (m_nicosia.animatedBackingStoreClient) {
>+    if (is<CoordinatedAnimatedBackingStoreClient>(m_nicosia.animatedBackingStoreClient)) {
>         // Determine the coverRect and set it to the client.
>-        downcast<CoordinatedAnimatedBackingStoreClient>(m_nicosia.animatedBackingStoreClient.get())->setCoverRect(layerState.mainBackingStore->coverRect());
>+        downcast<CoordinatedAnimatedBackingStoreClient>(*m_nicosia.animatedBackingStoreClient).setCoverRect(layerState.mainBackingStore->coverRect());
>     }
> 
>     ASSERT(m_coordinator && m_coordinator->isFlushingLayerChanges());
>@@ -1303,4 +1304,6 @@ bool CoordinatedGraphicsLayer::usesContentsLayer() const
> 
> } // namespace WebCore
> 
>+SPECIALIZE_TYPE_TRAITS_ANIMATEDBACKINGSTORECLIENT(WebCore::CoordinatedAnimatedBackingStoreClient, type() == Nicosia::AnimatedBackingStoreClient::Type::Coordinated)
>+
> #endif // USE(COORDINATED_GRAPHICS)

Actions: View | Formatted Diff | Diff

Attachments on bug 199358: 373220 | 373221 | 373222 | 373227