Changeset 232590 in webkit


Ignore:
Timestamp:
Jun 7, 2018 11:36:47 AM (6 years ago)
Author:
don.olmstead@sony.com
Message:

[CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS)
​https://bugs.webkit.org/show_bug.cgi?id=186374

Reviewed by Žan Doberšek.

Source/WebCore:

No new tests. No change in behavior.

  • page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::reconcileScrollingState):
(WebCore::AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions):

  • page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
  • page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp:
  • page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp:
  • platform/PlatformWheelEvent.h:
  • platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp:
  • platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h:
  • platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
  • platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:

Source/WebKit:

  • Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:

(WebKit::ThreadedCompositor::sceneUpdateFinished):

Location:
trunk/Source
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r232589 r232590  
     12018-06-07  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS)
     4        https://bugs.webkit.org/show_bug.cgi?id=186374
     5
     6        Reviewed by Žan Doberšek.
     7
     8        No new tests. No change in behavior.
     9
     10        * page/scrolling/AsyncScrollingCoordinator.cpp:
     11        (WebCore::AsyncScrollingCoordinator::reconcileScrollingState):
     12        (WebCore::AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions):
     13        * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
     14        * page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp:
     15        * page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp:
     16        * platform/PlatformWheelEvent.h:
     17        * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp:
     18        * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h:
     19        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp:
     20        * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h:
     21
    1222018-06-07  Thibault Saunier  <tsaunier@igalia.com> and Alejandro G. Castro  <alex@igalia.com>
    223

  • trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

    r231043 r232590  
    4747#include "Settings.h"
    4848#include "WheelEventTestTrigger.h"
     49#include <wtf/ProcessID.h>
    4950#include <wtf/text/TextStream.h>
    5051
    … …  
    370371    frameView.setInProgrammaticScroll(programmaticScroll);
    371372
    372     LOG_WITH_STREAM(Scrolling, stream << getpid() << " AsyncScrollingCoordinator " << this << " reconcileScrollingState scrollPosition " << scrollPosition << " programmaticScroll " << programmaticScroll << " stability " << viewportRectStability << " " << scrollingLayerPositionAction);
     373    LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator " << this << " reconcileScrollingState scrollPosition " << scrollPosition << " programmaticScroll " << programmaticScroll << " stability " << viewportRectStability << " " << scrollingLayerPositionAction);
    373374
    374375    std::optional<FloatRect> layoutViewportRect;
    … …  
    493494        return;
    494495
    495     LOG_WITH_STREAM(Scrolling, stream << getpid() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect);
     496    LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect);
    496497
    497498    m_scrollingStateTree->rootStateNode()->reconcileLayerPositionForViewportRect(viewportRect, action);

  • trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp

    r231043 r232590  
    2929#include "ScrollingCoordinatorCoordinatedGraphics.h"
    3030
    31 #if USE(COORDINATED_GRAPHICS)
     31#if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS)
    3232
    3333#include "ScrollingThread.h"
    … …  
    9494} // namespace WebCore
    9595
    96 #endif // USE(COORDINATED_GRAPHICS)
     96#endif // ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS)

  • trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp

    r231043 r232590  
    3131#if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS)
    3232
     33#include "ScrollingTree.h"
     34
    3335namespace WebCore {
    3436

  • trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp

    r231043 r232590  
    3131#if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS)
    3232
     33#include "ScrollingTree.h"
     34
    3335namespace WebCore {
    3436

  • trunk/Source/WebCore/platform/PlatformWheelEvent.h

    r231043 r232590  
    4949};
    5050
    51 #if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
     51#if ENABLE(ASYNC_SCROLLING)
    5252
    5353enum PlatformWheelEventPhase : uint8_t {
    … …  
    147147#endif
    148148
    149 #if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
     149#if ENABLE(ASYNC_SCROLLING)
    150150    PlatformWheelEventPhase phase() const { return m_phase; }
    151151    PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; }
    … …  
    172172    FloatSize m_scrollingVelocity;
    173173
    174 #if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE)
     174#if ENABLE(ASYNC_SCROLLING)
    175175    PlatformWheelEventPhase m_phase { PlatformWheelEventPhaseNone };
    176176    PlatformWheelEventPhase m_momentumPhase { PlatformWheelEventPhaseNone };

  • trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp

    r229460 r232590  
    2929#include "config.h"
    3030#include "NicosiaPaintingEngineThreaded.h"
     31
     32#if USE(COORDINATED_GRAPHICS_THREADED)
    3133
    3234#include "GraphicsContext.h"
    … …  
    103105
    104106} // namespace Nicosia
     107
     108#endif // USE(COORDINATED_GRAPHICS_THREADED)

  • trunk/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h

    r229460 r232590  
    2929#pragma once
    3030
     31#if USE(COORDINATED_GRAPHICS_THREADED)
     32
    3133#include "NicosiaPaintingEngine.h"
    3234
    … …  
    4749
    4850} // namespace Nicosia
     51
     52#endif // USE(COORDINATED_GRAPHICS_THREADED)

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp

    r229895 r232590  
    2626#include "config.h"
    2727#include "TextureMapperPlatformLayerBuffer.h"
     28
     29#if USE(COORDINATED_GRAPHICS_THREADED)
    2830
    2931#include "NotImplemented.h"
    … …  
    8183
    8284} // namespace WebCore
     85
     86#endif // USE(COORDINATED_GRAPHICS_THREADED)

  • trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h

    r229857 r232590  
    2626#pragma once
    2727
     28#if USE(COORDINATED_GRAPHICS_THREADED)
     29
    2830#include "BitmapTextureGL.h"
    2931#include "TextureMapperGLHeaders.h"
    3032#include "TextureMapperPlatformLayer.h"
    3133#include <wtf/MonotonicTime.h>
    32 
    33 #if USE(COORDINATED_GRAPHICS_THREADED)
    3434
    3535namespace WebCore {
    … …  
    8181} // namespace WebCore
    8282
    83 #endif // COORDINATED_GRAPHICS_THREADED
     83#endif // USE(COORDINATED_GRAPHICS_THREADED)

  • trunk/Source/WebKit/ChangeLog

    r232585 r232590  
     12018-06-07  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS)
     4        https://bugs.webkit.org/show_bug.cgi?id=186374
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
     9        (WebKit::ThreadedCompositor::sceneUpdateFinished):
     10
    1112018-06-07  Brent Fulgham  <bfulgham@apple.com>
    212

  • trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp

    r231132 r232590  
    268268        LockHolder locker(m_attributes.lock);
    269269        shouldDispatchDisplayRefreshCallback = m_attributes.clientRendersNextFrame
     270#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
    270271            || m_displayRefreshMonitor->requiresDisplayRefreshCallback();
     272#else
     273            ;
     274#endif
    271275        shouldCoordinateUpdateCompletionWithClient = m_attributes.coordinateUpdateCompletionWithClient;
    272276    }
    … …  
    274278    LockHolder stateLocker(m_compositingRunLoop->stateLock());
    275279
     280#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
    276281    // Schedule the DisplayRefreshMonitor callback, if necessary.
    277282    if (shouldDispatchDisplayRefreshCallback)
    278283        m_displayRefreshMonitor->dispatchDisplayRefreshCallback();
     284#endif
    279285
    280286    // Mark the scene update as completed if no coordination is required and if not in a forced repaint.
Note: See TracChangeset for help on using the changeset viewer.