Changeset 212703 in webkit


Ignore:
Timestamp:
Feb 20, 2017 11:12:17 PM (7 years ago)
Author:
Carlos Garcia Campos
Message:

Remove ENABLE_THREADED_COMPOSITOR build option
​https://bugs.webkit.org/show_bug.cgi?id=168606

Reviewed by Michael Catanzaro.

.:

  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/WebKitFeatures.cmake:

Source/WebCore:

  • platform/TextureMapper.cmake:

Source/WebKit2:

Now that we have AC mode on demand with the threaded compositor there's no reason to keep the old AC code.

  • PlatformGTK.cmake:
  • WebProcess/WebPage/LayerTreeHost.cpp:

(WebKit::LayerTreeHost::create):

  • WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp: Removed.
  • WebProcess/WebPage/gtk/LayerTreeHostGtk.h: Removed.

Tools:

  • Scripts/webkitperl/FeatureList.pm:
Location:
trunk
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r212629 r212703  
     12017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Remove ENABLE_THREADED_COMPOSITOR build option
     4        https://bugs.webkit.org/show_bug.cgi?id=168606
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Source/cmake/OptionsGTK.cmake:
     9        * Source/cmake/WebKitFeatures.cmake:
     10
    1112017-02-20  Manuel Rego Casasnovas  <rego@igalia.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r212701 r212703  
     12017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Remove ENABLE_THREADED_COMPOSITOR build option
     4        https://bugs.webkit.org/show_bug.cgi?id=168606
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * platform/TextureMapper.cmake:
     9
    1102017-02-20  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Source/WebCore/platform/TextureMapper.cmake

    r212638 r212703  
    55    platform/graphics/texmap/BitmapTexture.cpp
    66    platform/graphics/texmap/BitmapTexturePool.cpp
    7     platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
    87    platform/graphics/texmap/TextureMapper.cpp
    98    platform/graphics/texmap/TextureMapperAnimation.cpp
    … …  
    1312    platform/graphics/texmap/TextureMapperLayer.cpp
    1413    platform/graphics/texmap/TextureMapperTile.cpp
    15     platform/graphics/texmap/TextureMapperTiledBackingStore.cpp
    1614)
    1715
    … …  
    3432        page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
    3533
     34        platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp
     35        platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp
     36
    3637        platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
    3738        platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
    … …  
    4041        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
    4142    )
    42 endif ()
    43 
    44 if (ENABLE_THREADED_COMPOSITOR)
     43else ()
    4544    list(APPEND WebCore_SOURCES
    46         platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp
    47         platform/graphics/texmap/TextureMapperPlatformLayerProxy.cpp
     45        platform/graphics/texmap/GraphicsLayerTextureMapper.cpp
     46        platform/graphics/texmap/TextureMapperBackingStore.cpp
    4847    )
    4948endif ()

  • trunk/Source/WebKit2/ChangeLog

    r212699 r212703  
     12017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Remove ENABLE_THREADED_COMPOSITOR build option
     4        https://bugs.webkit.org/show_bug.cgi?id=168606
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        Now that we have AC mode on demand with the threaded compositor there's no reason to keep the old AC code.
     9
     10        * PlatformGTK.cmake:
     11        * WebProcess/WebPage/LayerTreeHost.cpp:
     12        (WebKit::LayerTreeHost::create):
     13        * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp: Removed.
     14        * WebProcess/WebPage/gtk/LayerTreeHostGtk.h: Removed.
     15
    1162017-02-20  Youenn Fablet  <youenn@apple.com>
    217

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r212691 r212703  
    5959
    6060    Shared/Authentication/soup/AuthenticationManagerSoup.cpp
     61
     62    Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp
     63    Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
     64    Shared/CoordinatedGraphics/SimpleViewportController.cpp
     65
     66    Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp
     67    Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp
     68    Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
    6169
    6270    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
    … …  
    472480
    473481    WebProcess/WebPage/AcceleratedDrawingArea.cpp
     482
     483    WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
     484    WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
     485    WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
     486    WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
     487    WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
     488
    474489    WebProcess/WebPage/DrawingAreaImpl.cpp
    475490
    … …  
    854869    "${WEBKIT2_DIR}/Platform/IPC/glib"
    855870    "${WEBKIT2_DIR}/Shared/API/c/gtk"
     871    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
     872    "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
    856873    "${WEBKIT2_DIR}/Shared/Plugins/unix"
    857874    "${WEBKIT2_DIR}/Shared/glib"
    … …  
    880897    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/gtk"
    881898    "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
     899    "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
    882900    "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
    883901    "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
    … …  
    11801198    PluginProcess/EntryPoint/unix/PluginProcessMain.cpp
    11811199)
    1182 
    1183 if (ENABLE_THREADED_COMPOSITOR)
    1184     list(APPEND WebKit2_SOURCES
    1185         Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp
    1186         Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp
    1187         Shared/CoordinatedGraphics/SimpleViewportController.cpp
    1188 
    1189         Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp
    1190         Shared/CoordinatedGraphics/threadedcompositor/ThreadSafeCoordinatedSurface.cpp
    1191         Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
    1192 
    1193         WebProcess/WebPage/CoordinatedGraphics/AreaAllocator.cpp
    1194         WebProcess/WebPage/CoordinatedGraphics/CompositingCoordinator.cpp
    1195         WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp
    1196         WebProcess/WebPage/CoordinatedGraphics/ThreadedCoordinatedLayerTreeHost.cpp
    1197         WebProcess/WebPage/CoordinatedGraphics/UpdateAtlas.cpp
    1198     )
    1199     list(APPEND WebKit2_INCLUDE_DIRECTORIES
    1200         "${WEBKIT2_DIR}/Shared/CoordinatedGraphics"
    1201         "${WEBKIT2_DIR}/Shared/CoordinatedGraphics/threadedcompositor"
    1202         "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
    1203     )
    1204 else (ENABLE_THREADED_COMPOSITOR)
    1205     list(APPEND WebKit2_SOURCES
    1206         WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
    1207     )
    1208 endif ()
    12091200
    12101201# Commands for building the built-in injected bundle.

  • trunk/Source/WebKit2/WebProcess/WebPage/LayerTreeHost.cpp

    r212608 r212703  
    3232#if USE(COORDINATED_GRAPHICS_THREADED)
    3333#include "ThreadedCoordinatedLayerTreeHost.h"
    34 #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
    35 #include "LayerTreeHostGtk.h"
    3634#endif
    3735
    … …  
    4442#if USE(COORDINATED_GRAPHICS_THREADED)
    4543    return ThreadedCoordinatedLayerTreeHost::create(webPage);
    46 #elif PLATFORM(GTK) && USE(TEXTURE_MAPPER_GL)
    47     return LayerTreeHostGtk::create(webPage);
    4844#else
    4945    UNUSED_PARAM(webPage);

  • trunk/Source/cmake/OptionsGTK.cmake

    r211813 r212703  
    109109WEBKIT_OPTION_DEPEND(ENABLE_NETSCAPE_PLUGIN_API ENABLE_X11_TARGET)
    110110WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)
    111 WEBKIT_OPTION_DEPEND(ENABLE_THREADED_COMPOSITOR ENABLE_OPENGL)
    112111WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
    113112WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL)
    … …  
    145144WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SAMPLING_PROFILER PUBLIC ON)
    146145WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPELLCHECK PUBLIC ON)
    147 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THREADED_COMPOSITOR PUBLIC ON)
    148146WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_TOUCH_EVENTS PUBLIC ON)
    149147WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO PUBLIC ON)
    … …  
    312310    endif ()
    313311
    314     SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
    315     SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
     312    SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS TRUE)
     313    SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED TRUE)
    316314endif ()
    317315

  • trunk/Source/cmake/WebKitFeatures.cmake

    r212629 r212703  
    173173    WEBKIT_OPTION_DEFINE(ENABLE_TELEPHONE_NUMBER_DETECTION "Toggle telephone number detection support" PRIVATE OFF)
    174174    WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle automatic text size adjustment support" PRIVATE OFF)
    175     WEBKIT_OPTION_DEFINE(ENABLE_THREADED_COMPOSITOR "Toggle threaded compositor support" PRIVATE OFF)
    176175    WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" PRIVATE OFF)
    177176    WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_SLIDER "Toggle Touch Slider support" PRIVATE OFF)

  • trunk/Tools/ChangeLog

    r212699 r212703  
     12017-02-20  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Remove ENABLE_THREADED_COMPOSITOR build option
     4        https://bugs.webkit.org/show_bug.cgi?id=168606
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9
    1102017-02-20  Youenn Fablet  <youenn@apple.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r212629 r212703  
    366366      define => "USE_SYSTEM_MALLOC", default => 0, value => \$systemMallocSupport },
    367367
    368     { option => "threaded-compositor", desc => "Toggle threaded compositor support",
    369       define => "ENABLE_THREADED_COMPOSITOR", default => isGtk(), value => \$threadedCompositorSupport },
    370 
    371368    { option => "touch-events", desc => "Toggle Touch Events support",
    372369      define => "ENABLE_TOUCH_EVENTS", default => (isIOSWebKit() || isEfl() || isGtk()), value => \$touchEventsSupport },
Note: See TracChangeset for help on using the changeset viewer.