Title: [202484] trunk/Source
- Revision
- 202484
- Author
- [email protected]
- Date
- 2016-06-27 03:57:09 -0700 (Mon, 27 Jun 2016)
Log Message
[GTK][EFL] Build with threaded compositor enabled is broken
https://bugs.webkit.org/show_bug.cgi?id=159138
Patch by Miguel Gomez <[email protected]> on 2016-06-27
Reviewed by Carlos Garcia Campos.
Source/WebCore:
No need to set the device scale. The compositor buffer is only used for the accelerated
canvas scenario, and the device scale is always 1 there.
This change was introduced in r202421.
Covered by existing tests.
* platform/graphics/cairo/ImageBufferCairo.cpp:
(WebCore::ImageBufferData::createCompositorBuffer):
Source/WebKit2:
Replace the usage of NoncopyableFunction with Function, to follow the changes in r202439.
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
(WebKit::CompositingRunLoop::performTask):
(WebKit::CompositingRunLoop::performTaskSync):
* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202483 => 202484)
--- trunk/Source/WebCore/ChangeLog 2016-06-27 09:22:08 UTC (rev 202483)
+++ trunk/Source/WebCore/ChangeLog 2016-06-27 10:57:09 UTC (rev 202484)
@@ -1,3 +1,19 @@
+2016-06-27 Miguel Gomez <[email protected]>
+
+ [GTK][EFL] Build with threaded compositor enabled is broken
+ https://bugs.webkit.org/show_bug.cgi?id=159138
+
+ Reviewed by Carlos Garcia Campos.
+
+ No need to set the device scale. The compositor buffer is only used for the accelerated
+ canvas scenario, and the device scale is always 1 there.
+ This change was introduced in r202421.
+
+ Covered by existing tests.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+ (WebCore::ImageBufferData::createCompositorBuffer):
+
2016-06-27 Philippe Normand <[email protected]>
[GStreamer] top/bottom black bars added needlessly in fullscreen
Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (202483 => 202484)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-06-27 09:22:08 UTC (rev 202483)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2016-06-27 10:57:09 UTC (rev 202484)
@@ -121,7 +121,6 @@
cairo_device_t* device = GLContext::sharingContext()->cairoDevice();
m_compositorSurface = adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, m_compositorTexture, m_size.width(), m_size.height()));
- cairoSurfaceSetDeviceScale(m_compositorSurface.get(), m_resolutionScale, m_resolutionScale);
m_compositorCr = adoptRef(cairo_create(m_compositorSurface.get()));
cairo_set_antialias(m_compositorCr.get(), CAIRO_ANTIALIAS_NONE);
}
Modified: trunk/Source/WebKit2/ChangeLog (202483 => 202484)
--- trunk/Source/WebKit2/ChangeLog 2016-06-27 09:22:08 UTC (rev 202483)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-27 10:57:09 UTC (rev 202484)
@@ -1,3 +1,17 @@
+2016-06-27 Miguel Gomez <[email protected]>
+
+ [GTK][EFL] Build with threaded compositor enabled is broken
+ https://bugs.webkit.org/show_bug.cgi?id=159138
+
+ Reviewed by Carlos Garcia Campos.
+
+ Replace the usage of NoncopyableFunction with Function, to follow the changes in r202439.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::CompositingRunLoop::performTask):
+ (WebKit::CompositingRunLoop::performTaskSync):
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
+
2016-06-24 Brian Burg <[email protected]>
REGRESSION(r201171): CRASH at WebKit::WebInspectorProxy::open() + 31 when running inspector layout tests
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (202483 => 202484)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2016-06-27 09:22:08 UTC (rev 202483)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2016-06-27 10:57:09 UTC (rev 202484)
@@ -40,13 +40,13 @@
{
}
-void CompositingRunLoop::performTask(NoncopyableFunction<void ()>&& function)
+void CompositingRunLoop::performTask(Function<void ()>&& function)
{
ASSERT(isMainThread());
m_runLoop.dispatch(WTFMove(function));
}
-void CompositingRunLoop::performTaskSync(NoncopyableFunction<void ()>&& function)
+void CompositingRunLoop::performTaskSync(Function<void ()>&& function)
{
ASSERT(isMainThread());
LockHolder locker(m_dispatchSyncConditionMutex);
Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (202483 => 202484)
--- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-27 09:22:08 UTC (rev 202483)
+++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2016-06-27 10:57:09 UTC (rev 202484)
@@ -46,8 +46,8 @@
CompositingRunLoop(std::function<void ()>&&);
- void performTask(NoncopyableFunction<void ()>&&);
- void performTaskSync(NoncopyableFunction<void ()>&&);
+ void performTask(Function<void ()>&&);
+ void performTaskSync(Function<void ()>&&);
void startUpdateTimer(UpdateTiming = Immediate);
void stopUpdateTimer();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
