Title: [198730] trunk/Source/WebKit2
- Revision
- 198730
- Author
- zandober...@gmail.com
- Date
- 2016-03-28 01:02:45 -0700 (Mon, 28 Mar 2016)
Log Message
Unreviewed GTK build fix for the threaded compositor feature after r198655.
Adjust the first parameter of ThreadSafeCoordinatedSurface::copyToTexture().
* Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
(WebKit::ThreadSafeCoordinatedSurface::copyToTexture):
* Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (198729 => 198730)
--- trunk/Source/WebKit2/ChangeLog 2016-03-28 06:47:34 UTC (rev 198729)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-28 08:02:45 UTC (rev 198730)
@@ -1,3 +1,12 @@
+2016-03-28 Zan Dobersek <zdober...@igalia.com>
+
+ Unreviewed GTK build fix for the threaded compositor feature after r198655.
+ Adjust the first parameter of ThreadSafeCoordinatedSurface::copyToTexture().
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp:
+ (WebKit::ThreadSafeCoordinatedSurface::copyToTexture):
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h:
+
2016-03-27 Hunseop Jeong <hs85.je...@samsung.com>
[EFL] REGRESSION(r188793): It made 200 layout tests and Bindings/event-target-wrapper.html performance test fail
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp (198729 => 198730)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2016-03-28 06:47:34 UTC (rev 198729)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp 2016-03-28 08:02:45 UTC (rev 198730)
@@ -77,10 +77,8 @@
m_imageBuffer->context().restore();
}
-void ThreadSafeCoordinatedSurface::copyToTexture(PassRefPtr<BitmapTexture> passTexture, const IntRect& target, const IntPoint& sourceOffset)
+void ThreadSafeCoordinatedSurface::copyToTexture(RefPtr<BitmapTexture> texture, const IntRect& target, const IntPoint& sourceOffset)
{
- RefPtr<BitmapTexture> texture(passTexture);
-
ASSERT(m_imageBuffer);
RefPtr<Image> image = m_imageBuffer->copyImage(DontCopyBackingStore);
texture->updateContents(image.get(), target, sourceOffset, BitmapTexture::UpdateCanModifyOriginalImageData);
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h (198729 => 198730)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h 2016-03-28 06:47:34 UTC (rev 198729)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.h 2016-03-28 08:02:45 UTC (rev 198730)
@@ -40,7 +40,7 @@
static Ref<ThreadSafeCoordinatedSurface> create(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags);
void paintToSurface(const WebCore::IntRect&, WebCore::CoordinatedSurface::Client*) override;
- void copyToTexture(PassRefPtr<WebCore::BitmapTexture>, const WebCore::IntRect& target, const WebCore::IntPoint& sourceOffset) override;
+ void copyToTexture(RefPtr<WebCore::BitmapTexture>, const WebCore::IntRect& target, const WebCore::IntPoint& sourceOffset) override;
private:
ThreadSafeCoordinatedSurface(const WebCore::IntSize&, WebCore::CoordinatedSurface::Flags, std::unique_ptr<WebCore::ImageBuffer>);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
