Diff
Modified: trunk/Source/WebCore/ChangeLog (229621 => 229622)
--- trunk/Source/WebCore/ChangeLog 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebCore/ChangeLog 2018-03-15 07:34:16 UTC (rev 229622)
@@ -1,5 +1,25 @@
2018-03-15 Zan Dobersek <[email protected]>
+ [TexMap] Remove TextureMapperLayer::texture()
+ https://bugs.webkit.org/show_bug.cgi?id=183635
+
+ Reviewed by Michael Catanzaro.
+
+ Remove the unused TextureMapperLayer::texture() method. This enables
+ removing the virtual TextureMapperBackingStore::texture() method, as
+ well as the implementations of it in TextureMapperTiledBackingStore and
+ CoordinatedBackingStore classes.
+
+ No change in behavior.
+
+ * platform/graphics/texmap/TextureMapperBackingStore.h:
+ * platform/graphics/texmap/TextureMapperLayer.h:
+ * platform/graphics/texmap/TextureMapperTiledBackingStore.cpp:
+ (WebCore::TextureMapperTiledBackingStore::texture const): Deleted.
+ * platform/graphics/texmap/TextureMapperTiledBackingStore.h:
+
+2018-03-15 Zan Dobersek <[email protected]>
+
[TexMap] Don't bother caching pattern transform matrix
https://bugs.webkit.org/show_bug.cgi?id=183633
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h (229621 => 229622)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperBackingStore.h 2018-03-15 07:34:16 UTC (rev 229622)
@@ -31,7 +31,6 @@
class TextureMapperBackingStore : public TextureMapperPlatformLayer, public RefCounted<TextureMapperBackingStore> {
public:
- virtual RefPtr<BitmapTexture> texture() const = 0;
void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix&, float) override = 0;
virtual void drawRepaintCounter(TextureMapper&, int /* repaintCount */, const Color&, const FloatRect&, const TransformationMatrix&) { }
virtual ~TextureMapperBackingStore() = default;
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h (229621 => 229622)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.h 2018-03-15 07:34:16 UTC (rev 229622)
@@ -125,7 +125,6 @@
static void sortByZOrder(Vector<TextureMapperLayer* >& array);
- RefPtr<BitmapTexture> texture() { return m_backingStore ? m_backingStore->texture() : 0; }
FloatPoint adjustedPosition() const { return m_state.pos + m_scrollPositionDelta; }
bool isAncestorFixedToViewport() const;
TransformationMatrix replicaTransform();
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp (229621 => 229622)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.cpp 2018-03-15 07:34:16 UTC (rev 229622)
@@ -163,14 +163,4 @@
tile.updateContents(textureMapper, sourceLayer, dirtyRect, updateContentsFlag, m_contentsScale);
}
-RefPtr<BitmapTexture> TextureMapperTiledBackingStore::texture() const
-{
- for (const auto& tile : m_tiles) {
- if (auto texture = tile.texture())
- return texture;
- }
-
- return nullptr;
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h (229621 => 229622)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperTiledBackingStore.h 2018-03-15 07:34:16 UTC (rev 229622)
@@ -35,7 +35,6 @@
static Ref<TextureMapperTiledBackingStore> create() { return adoptRef(*new TextureMapperTiledBackingStore); }
virtual ~TextureMapperTiledBackingStore() = default;
- RefPtr<BitmapTexture> texture() const override;
void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix&, float) override;
void drawBorder(TextureMapper&, const Color&, float borderWidth, const FloatRect&, const TransformationMatrix&) override;
void drawRepaintCounter(TextureMapper&, int repaintCount, const Color&, const FloatRect&, const TransformationMatrix&) override;
Modified: trunk/Source/WebKit/ChangeLog (229621 => 229622)
--- trunk/Source/WebKit/ChangeLog 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebKit/ChangeLog 2018-03-15 07:34:16 UTC (rev 229622)
@@ -1,3 +1,17 @@
+2018-03-15 Zan Dobersek <[email protected]>
+
+ [TexMap] Remove TextureMapperLayer::texture()
+ https://bugs.webkit.org/show_bug.cgi?id=183635
+
+ Reviewed by Michael Catanzaro.
+
+ Remove the CoordinatedBackingStore::texture() override since the virtual
+ method is also being removed.
+
+ * Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp:
+ (WebKit::CoordinatedBackingStore::texture const): Deleted.
+ * Shared/CoordinatedGraphics/CoordinatedBackingStore.h:
+
2018-03-14 John Wilander <[email protected]>
Resource Load Statistics: Add clearing of storage access to WebResourceLoadStatisticsStore::clearInMemory()
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp (229621 => 229622)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp 2018-03-15 07:34:16 UTC (rev 229622)
@@ -84,17 +84,6 @@
it->value.setBackBuffer(tileRect, sourceRect, WTFMove(buffer), offset);
}
-RefPtr<BitmapTexture> CoordinatedBackingStore::texture() const
-{
- for (auto& tile : m_tiles.values()) {
- RefPtr<BitmapTexture> texture = tile.texture();
- if (texture)
- return texture;
- }
-
- return RefPtr<BitmapTexture>();
-}
-
void CoordinatedBackingStore::setSize(const FloatSize& size)
{
m_pendingSize = size;
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.h (229621 => 229622)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.h 2018-03-15 07:14:28 UTC (rev 229621)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/CoordinatedBackingStore.h 2018-03-15 07:34:16 UTC (rev 229622)
@@ -63,7 +63,6 @@
void updateTile(uint32_t tileID, const WebCore::IntRect&, const WebCore::IntRect&, RefPtr<Nicosia::Buffer>&&, const WebCore::IntPoint&);
static Ref<CoordinatedBackingStore> create() { return adoptRef(*new CoordinatedBackingStore); }
void commitTileOperations(WebCore::TextureMapper&);
- RefPtr<WebCore::BitmapTexture> texture() const override;
void setSize(const WebCore::FloatSize&);
void paintToTextureMapper(WebCore::TextureMapper&, const WebCore::FloatRect&, const WebCore::TransformationMatrix&, float) override;
void drawBorder(WebCore::TextureMapper&, const WebCore::Color&, float borderWidth, const WebCore::FloatRect&, const WebCore::TransformationMatrix&) override;
