Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-02-28 09:58:00 UTC (rev 213145)
@@ -1,3 +1,19 @@
+2017-02-26 Zan Dobersek <zdober...@igalia.com>
+
+ [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
+ https://bugs.webkit.org/show_bug.cgi?id=168903
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the GraphicsContext pointer member from the TextureMapper class
+ since the getter and setter methods are not used anywhere.
+
+ * platform/graphics/texmap/TextureMapper.cpp:
+ (WebCore::TextureMapper::TextureMapper):
+ * platform/graphics/texmap/TextureMapper.h:
+ (WebCore::TextureMapper::setGraphicsContext): Deleted.
+ (WebCore::TextureMapper::graphicsContext): Deleted.
+
2017-02-25 Zalan Bujtas <za...@apple.com>
Simple line layout: Move coverage functions out of SimpleLineLayout.cpp
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.cpp 2017-02-28 09:58:00 UTC (rev 213145)
@@ -41,8 +41,7 @@
}
TextureMapper::TextureMapper()
- : m_context(0)
- , m_interpolationQuality(InterpolationDefault)
+ : m_interpolationQuality(InterpolationDefault)
, m_textDrawingMode(TextModeFill)
, m_isMaskMode(false)
, m_wrapMode(StretchWrap)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/texmap/TextureMapper.h 2017-02-28 09:58:00 UTC (rev 213145)
@@ -74,8 +74,6 @@
// makes a surface the target for the following drawTexture calls.
virtual void bindSurface(BitmapTexture* surface) = 0;
- void setGraphicsContext(GraphicsContext* context) { m_context = context; }
- GraphicsContext* graphicsContext() { return m_context; }
virtual void beginClip(const TransformationMatrix&, const FloatRect&) = 0;
virtual void endClip() = 0;
virtual IntRect clipBounds() = 0;
@@ -100,7 +98,6 @@
void setWrapMode(WrapMode m) { m_wrapMode = m; }
protected:
- GraphicsContext* m_context;
std::unique_ptr<BitmapTexturePool> m_texturePool;
bool isInMaskMode() const { return m_isMaskMode; }
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:58:00 UTC (rev 213145)
@@ -1,3 +1,18 @@
+2017-02-26 Zan Dobersek <zdober...@igalia.com>
+
+ [CoordinatedGraphics] Remove CoordinatedGraphicsScene::paintToGraphicsContext()
+ https://bugs.webkit.org/show_bug.cgi?id=168903
+
+ Reviewed by Carlos Garcia Campos.
+
+ Remove the CoordinatedGraphicsScene::paintToGraphicsContext() method as it
+ is not used anywhere. Also enables removing the GraphicsContext pointer
+ member from the TextureMapper class.
+
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp:
+ (WebKit::CoordinatedGraphicsScene::paintToGraphicsContext): Deleted.
+ * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h:
+
2017-02-25 Michael Catanzaro <mcatanz...@igalia.com>
[GTK] Unreviewed, document deficiency in webkit_website_data_manager_clear() API
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-02-28 09:58:00 UTC (rev 213145)
@@ -125,32 +125,6 @@
updateViewport();
}
-void CoordinatedGraphicsScene::paintToGraphicsContext(PlatformGraphicsContext* platformContext, const Color& backgroundColor, bool drawsBackground)
-{
- if (!m_textureMapper)
- m_textureMapper = TextureMapper::create();
- syncRemoteContent();
- TextureMapperLayer* layer = rootLayer();
-
- if (!layer)
- return;
-
- GraphicsContext graphicsContext(platformContext);
- m_textureMapper->setGraphicsContext(&graphicsContext);
- m_textureMapper->beginPainting();
-
- IntRect clipRect = graphicsContext.clipBounds();
- if (drawsBackground)
- m_textureMapper->drawSolidColor(clipRect, TransformationMatrix(), backgroundColor);
- else
- m_textureMapper->drawSolidColor(clipRect, TransformationMatrix(), m_viewBackgroundColor);
-
- layer->paint();
- m_fpsCounter.updateFPSAndDisplay(*m_textureMapper, clipRect.location());
- m_textureMapper->endPainting();
- m_textureMapper->setGraphicsContext(0);
-}
-
void CoordinatedGraphicsScene::updateViewport()
{
if (!m_client)
Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h (213144 => 213145)
--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-28 09:53:01 UTC (rev 213144)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.h 2017-02-28 09:58:00 UTC (rev 213145)
@@ -65,7 +65,6 @@
explicit CoordinatedGraphicsScene(CoordinatedGraphicsSceneClient*);
virtual ~CoordinatedGraphicsScene();
void paintToCurrentGLContext(const WebCore::TransformationMatrix&, float, const WebCore::FloatRect&, const WebCore::Color& backgroundColor, bool drawsBackground, const WebCore::FloatPoint&, WebCore::TextureMapper::PaintFlags = 0);
- void paintToGraphicsContext(PlatformGraphicsContext*, const WebCore::Color& backgroundColor, bool drawsBackground);
void detach();
void appendUpdate(std::function<void()>&&);
