Changeset 202484 in webkit


Ignore:
Timestamp:
Jun 27, 2016 3:57:09 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK][EFL] Build with threaded compositor enabled is broken
https://bugs.webkit.org/show_bug.cgi?id=159138

Patch by Miguel Gomez <magomez@igalia.com> 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:
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r202482 r202484  
     12016-06-27  Miguel Gomez  <magomez@igalia.com>
     2
     3        [GTK][EFL] Build with threaded compositor enabled is broken
     4        https://bugs.webkit.org/show_bug.cgi?id=159138
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        No need to set the device scale. The compositor buffer is only used for the accelerated
     9        canvas scenario, and the device scale is always 1 there.
     10        This change was introduced in r202421.
     11
     12        Covered by existing tests.
     13
     14        * platform/graphics/cairo/ImageBufferCairo.cpp:
     15        (WebCore::ImageBufferData::createCompositorBuffer):
     16
    1172016-06-27  Philippe Normand  <philn@igalia.com>
    218
  • trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp

    r202421 r202484  
    122122    cairo_device_t* device = GLContext::sharingContext()->cairoDevice();
    123123    m_compositorSurface = adoptRef(cairo_gl_surface_create_for_texture(device, CAIRO_CONTENT_COLOR_ALPHA, m_compositorTexture, m_size.width(), m_size.height()));
    124     cairoSurfaceSetDeviceScale(m_compositorSurface.get(), m_resolutionScale, m_resolutionScale);
    125124    m_compositorCr = adoptRef(cairo_create(m_compositorSurface.get()));
    126125    cairo_set_antialias(m_compositorCr.get(), CAIRO_ANTIALIAS_NONE);
  • trunk/Source/WebKit2/ChangeLog

    r202464 r202484  
     12016-06-27  Miguel Gomez  <magomez@igalia.com>
     2
     3        [GTK][EFL] Build with threaded compositor enabled is broken
     4        https://bugs.webkit.org/show_bug.cgi?id=159138
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Replace the usage of NoncopyableFunction with Function, to follow the changes in r202439.
     9
     10        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
     11        (WebKit::CompositingRunLoop::performTask):
     12        (WebKit::CompositingRunLoop::performTaskSync):
     13        * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
     14
    1152016-06-24  Brian Burg  <bburg@apple.com>
    216
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp

    r202040 r202484  
    4141}
    4242
    43 void CompositingRunLoop::performTask(NoncopyableFunction<void ()>&& function)
     43void CompositingRunLoop::performTask(Function<void ()>&& function)
    4444{
    4545    ASSERT(isMainThread());
     
    4747}
    4848
    49 void CompositingRunLoop::performTaskSync(NoncopyableFunction<void ()>&& function)
     49void CompositingRunLoop::performTaskSync(Function<void ()>&& function)
    5050{
    5151    ASSERT(isMainThread());
  • trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h

    r202040 r202484  
    4747    CompositingRunLoop(std::function<void ()>&&);
    4848
    49     void performTask(NoncopyableFunction<void ()>&&);
    50     void performTaskSync(NoncopyableFunction<void ()>&&);
     49    void performTask(Function<void ()>&&);
     50    void performTaskSync(Function<void ()>&&);
    5151
    5252    void startUpdateTimer(UpdateTiming = Immediate);
Note: See TracChangeset for help on using the changeset viewer.