Diff
Modified: trunk/Source/WTF/ChangeLog (261332 => 261333)
--- trunk/Source/WTF/ChangeLog 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WTF/ChangeLog 2020-05-07 20:57:42 UTC (rev 261333)
@@ -1,3 +1,14 @@
+2020-05-07 Don Olmstead <don.olmst...@sony.com>
+
+ Remove unused USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+ https://bugs.webkit.org/show_bug.cgi?id=211582
+
+ Reviewed by Fujii Hironori.
+
+ After r261264 all ports implemented USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR.
+
+ * wtf/PlatformUse.h:
+
2020-05-07 Mark Lam <mark....@apple.com>
Give the DFG and FTL WorkList threads more stack space on ASAN builds.
Modified: trunk/Source/WTF/wtf/PlatformUse.h (261332 => 261333)
--- trunk/Source/WTF/wtf/PlatformUse.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WTF/wtf/PlatformUse.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -187,8 +187,6 @@
#define USE_AV_SAMPLE_BUFFER_DISPLAY_LAYER 1
#endif
-#define USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
-
#if !defined(USE_ZLIB)
#define USE_ZLIB 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (261332 => 261333)
--- trunk/Source/WebCore/ChangeLog 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/ChangeLog 2020-05-07 20:57:42 UTC (rev 261333)
@@ -1,3 +1,45 @@
+2020-05-07 Don Olmstead <don.olmst...@sony.com>
+
+ Remove unused USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+ https://bugs.webkit.org/show_bug.cgi?id=211582
+
+ Reviewed by Fujii Hironori.
+
+ After r261264 all ports implemented USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR.
+
+ * page/ChromeClient.h:
+ (WebCore::ChromeClient::createDisplayRefreshMonitor const):
+ * page/Page.cpp:
+ (WebCore::Page::windowScreenDidChange):
+ * page/RenderingUpdateScheduler.cpp:
+ (WebCore::RenderingUpdateScheduler::RenderingUpdateScheduler):
+ (WebCore::RenderingUpdateScheduler::adjustRenderingUpdateFrequency):
+ (WebCore::RenderingUpdateScheduler::scheduleTimedRenderingUpdate):
+ (WebCore::RenderingUpdateScheduler::windowScreenDidChange):
+ * page/RenderingUpdateScheduler.h:
+ * platform/graphics/DisplayRefreshMonitor.cpp:
+ * platform/graphics/DisplayRefreshMonitor.h:
+ * platform/graphics/DisplayRefreshMonitorClient.cpp:
+ * platform/graphics/DisplayRefreshMonitorClient.h:
+ * platform/graphics/DisplayRefreshMonitorManager.cpp:
+ * platform/graphics/DisplayRefreshMonitorManager.h:
+ * platform/graphics/GraphicsLayerUpdater.cpp:
+ (WebCore::GraphicsLayerUpdater::GraphicsLayerUpdater):
+ (WebCore::GraphicsLayerUpdater::scheduleUpdate):
+ (WebCore::GraphicsLayerUpdater::screenDidChange):
+ (WebCore::GraphicsLayerUpdater::displayRefreshFired):
+ (WebCore::GraphicsLayerUpdater::createDisplayRefreshMonitor const):
+ * platform/graphics/GraphicsLayerUpdater.h:
+ * platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp:
+ * platform/graphics/gtk/DisplayRefreshMonitorGtk.h:
+ * platform/graphics/ios/DisplayRefreshMonitorIOS.h:
+ * platform/graphics/ios/DisplayRefreshMonitorIOS.mm:
+ * platform/graphics/mac/DisplayRefreshMonitorMac.cpp:
+ * platform/graphics/mac/DisplayRefreshMonitorMac.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::createDisplayRefreshMonitor const):
+ * rendering/RenderLayerCompositor.h:
+
2020-05-07 Antoine Quint <grao...@apple.com>
Add watchOS media controls assets
Modified: trunk/Source/WebCore/page/ChromeClient.h (261332 => 261333)
--- trunk/Source/WebCore/page/ChromeClient.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/page/ChromeClient.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -305,9 +305,7 @@
// Allows ports to customize the type of graphics layers created by this page.
virtual GraphicsLayerFactory* graphicsLayerFactory() const { return nullptr; }
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const { return nullptr; }
-#endif
virtual std::unique_ptr<ImageBuffer> createImageBuffer(const FloatSize&, ShouldAccelerate, ShouldUseDisplayList, RenderingPurpose, float, ColorSpace) const { return nullptr; }
virtual std::unique_ptr<ImageBuffer> createImageBuffer(const FloatSize&, RenderingMode, float, ColorSpace) const { return nullptr; }
Modified: trunk/Source/WebCore/page/Page.cpp (261332 => 261333)
--- trunk/Source/WebCore/page/Page.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/page/Page.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -1119,9 +1119,7 @@
frame->document()->windowScreenDidChange(displayID);
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
renderingUpdateScheduler().windowScreenDidChange(displayID);
-#endif
setNeedsRecalcStyleInAllFrames();
}
Modified: trunk/Source/WebCore/page/RenderingUpdateScheduler.cpp (261332 => 261333)
--- trunk/Source/WebCore/page/RenderingUpdateScheduler.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/page/RenderingUpdateScheduler.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -37,13 +37,9 @@
RenderingUpdateScheduler::RenderingUpdateScheduler(Page& page)
: m_page(page)
{
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
windowScreenDidChange(page.chrome().displayID());
-#endif
}
-
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
void RenderingUpdateScheduler::setPreferredFramesPerSecond(FramesPerSecond preferredFramesPerSecond)
{
if (m_preferredFramesPerSecond == preferredFramesPerSecond)
@@ -64,17 +60,15 @@
setPreferredFramesPerSecond(preferredFramesPerSecond);
return DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this);
}
-#endif
void RenderingUpdateScheduler::adjustRenderingUpdateFrequency()
{
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Seconds interval = m_page.preferredRenderingUpdateInterval();
// PreferredFramesPerSecond is an integer and should be > 0.
if (interval <= 1_s)
setPreferredFramesPerSecond(preferredFramesPerSecond(interval));
-#endif
+
if (isScheduled()) {
clearScheduled();
scheduleTimedRenderingUpdate();
@@ -96,11 +90,9 @@
Seconds interval = m_page.preferredRenderingUpdateInterval();
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
// PreferredFramesPerSecond is an integer and should be > 0.
if (interval <= 1_s)
m_scheduled = scheduleAnimation(preferredFramesPerSecond(interval));
-#endif
if (!isScheduled())
startTimer(interval);
@@ -126,7 +118,6 @@
m_refreshTimer = nullptr;
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> RenderingUpdateScheduler::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
{
if (auto monitor = m_page.chrome().client().createDisplayRefreshMonitor(displayID))
@@ -139,7 +130,6 @@
{
DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
}
-#endif
void RenderingUpdateScheduler::displayRefreshFired()
{
Modified: trunk/Source/WebCore/page/RenderingUpdateScheduler.h (261332 => 261333)
--- trunk/Source/WebCore/page/RenderingUpdateScheduler.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/page/RenderingUpdateScheduler.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -34,10 +34,7 @@
class Page;
class Timer;
-class RenderingUpdateScheduler
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
- : public DisplayRefreshMonitorClient
-#endif
+class RenderingUpdateScheduler : public DisplayRefreshMonitorClient
{
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -53,19 +50,13 @@
void scheduleImmediateRenderingUpdate();
void scheduleRenderingUpdate();
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
void windowScreenDidChange(PlatformDisplayID);
-#endif
private:
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
void setPreferredFramesPerSecond(FramesPerSecond);
bool scheduleAnimation(FramesPerSecond);
RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const final;
void displayRefreshFired() final;
-#else
- void displayRefreshFired();
-#endif
bool isScheduled() const;
void startTimer(Seconds);
@@ -74,9 +65,7 @@
Page& m_page;
bool m_scheduled { false };
std::unique_ptr<Timer> m_refreshTimer;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
FramesPerSecond m_preferredFramesPerSecond { FullSpeedFramesPerSecond };
-#endif
};
}
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,8 +26,6 @@
#include "config.h"
#include "DisplayRefreshMonitor.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "DisplayRefreshMonitorClient.h"
#include "DisplayRefreshMonitorManager.h"
#include "Logging.h"
@@ -135,5 +133,3 @@
}
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitor.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,8 +25,6 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "AnimationFrameRate.h"
#include "PlatformScreen.h"
#include <wtf/HashSet.h>
@@ -103,6 +101,3 @@
};
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,8 +26,6 @@
#include "config.h"
#include "DisplayRefreshMonitorClient.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "DisplayRefreshMonitor.h"
#include "DisplayRefreshMonitorManager.h"
@@ -52,5 +50,3 @@
}
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorClient.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,8 +25,6 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "PlatformScreen.h"
#include <wtf/Forward.h>
#include <wtf/Optional.h>
@@ -60,5 +58,3 @@
};
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,8 +26,6 @@
#include "config.h"
#include "DisplayRefreshMonitorManager.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "DisplayRefreshMonitor.h"
#include "DisplayRefreshMonitorClient.h"
#include "Logging.h"
@@ -138,5 +136,3 @@
}
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/DisplayRefreshMonitorManager.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,8 +25,6 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "AnimationFrameRate.h"
#include "DisplayRefreshMonitor.h"
#include "PlatformScreen.h"
@@ -75,5 +73,3 @@
};
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -31,7 +31,6 @@
namespace WebCore {
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
GraphicsLayerUpdater::GraphicsLayerUpdater(GraphicsLayerUpdaterClient& client, PlatformDisplayID displayID)
: m_client(client)
{
@@ -38,11 +37,6 @@
DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this);
}
-#else
-GraphicsLayerUpdater::GraphicsLayerUpdater(GraphicsLayerUpdaterClient&, PlatformDisplayID)
-{
-}
-#endif
GraphicsLayerUpdater::~GraphicsLayerUpdater()
{
@@ -54,34 +48,24 @@
if (m_scheduled)
return;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
DisplayRefreshMonitorManager::sharedManager().scheduleAnimation(*this);
-#endif
m_scheduled = true;
}
void GraphicsLayerUpdater::screenDidChange(PlatformDisplayID displayID)
{
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
DisplayRefreshMonitorManager::sharedManager().windowScreenDidChange(displayID, *this);
-#else
- UNUSED_PARAM(displayID);
-#endif
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
void GraphicsLayerUpdater::displayRefreshFired()
{
m_scheduled = false;
m_client.flushLayersSoon(*this);
}
-#endif
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> GraphicsLayerUpdater::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
{
return m_client.createDisplayRefreshMonitor(displayID);
}
-#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/GraphicsLayerUpdater.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -36,15 +36,10 @@
public:
virtual ~GraphicsLayerUpdaterClient() = default;
virtual void flushLayersSoon(GraphicsLayerUpdater&) = 0;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
virtual RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const = 0;
-#endif
};
-class GraphicsLayerUpdater
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
- : public DisplayRefreshMonitorClient
-#endif
+class GraphicsLayerUpdater : public DisplayRefreshMonitorClient
{
WTF_MAKE_FAST_ALLOCATED;
public:
@@ -54,15 +49,11 @@
void scheduleUpdate();
void screenDidChange(PlatformDisplayID);
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
-#endif
private:
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
void displayRefreshFired() override;
GraphicsLayerUpdaterClient& m_client;
-#endif
bool m_scheduled { false };
};
Modified: trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,7 +26,7 @@
#include "config.h"
#include "DisplayRefreshMonitorGtk.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !USE(GTK4)
+#if !USE(GTK4)
#include <gtk/gtk.h>
#include <wtf/RunLoop.h>
@@ -94,4 +94,4 @@
} // namespace WebCore
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !USE(GTK4)
+#endif // !USE(GTK4)
Modified: trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/gtk/DisplayRefreshMonitorGtk.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !USE(GTK4)
+#if !USE(GTK4)
#include "DisplayRefreshMonitor.h"
@@ -53,4 +53,4 @@
} // namespace WebCore
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !USE(GTK4)
+#endif // !USE(GTK4)
Modified: trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY)
#include "DisplayRefreshMonitor.h"
#include <wtf/RetainPtr.h>
@@ -53,4 +53,4 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/ios/DisplayRefreshMonitorIOS.mm 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,7 +26,7 @@
#import "config.h"
#import "DisplayRefreshMonitorIOS.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY)
#import "WebCoreThread.h"
#import <QuartzCore/CADisplayLink.h>
@@ -123,4 +123,4 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,7 +26,7 @@
#include "config.h"
#include "DisplayRefreshMonitorMac.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
+#if PLATFORM(MAC)
#include <QuartzCore/QuartzCore.h>
#include <wtf/RunLoop.h>
@@ -103,4 +103,4 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h (261332 => 261333)
--- trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/platform/graphics/mac/DisplayRefreshMonitorMac.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,7 +25,7 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
+#if PLATFORM(MAC)
#include "DisplayRefreshMonitor.h"
#include <wtf/WeakPtr.h>
@@ -55,4 +55,4 @@
}
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && PLATFORM(MAC)
+#endif // PLATFORM(MAC)
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (261332 => 261333)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -4826,7 +4826,6 @@
return page().chrome().client().graphicsLayerFactory();
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> RenderLayerCompositor::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
{
if (auto monitor = page().chrome().client().createDisplayRefreshMonitor(displayID))
@@ -4834,7 +4833,6 @@
return DisplayRefreshMonitor::createDefaultDisplayRefreshMonitor(displayID);
}
-#endif
#if ENABLE(CSS_SCROLL_SNAP)
void RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView(const FrameView& frameView) const
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (261332 => 261333)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -477,9 +477,7 @@
GraphicsLayerFactory* graphicsLayerFactory() const;
ScrollingCoordinator* scrollingCoordinator() const;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> createDisplayRefreshMonitor(PlatformDisplayID) const override;
-#endif
// Non layout-dependent
bool requiresCompositingForAnimation(RenderLayerModelObject&) const;
Modified: trunk/Source/WebKit/ChangeLog (261332 => 261333)
--- trunk/Source/WebKit/ChangeLog 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/ChangeLog 2020-05-07 20:57:42 UTC (rev 261333)
@@ -1,3 +1,37 @@
+2020-05-07 Don Olmstead <don.olmst...@sony.com>
+
+ Remove unused USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+ https://bugs.webkit.org/show_bug.cgi?id=211582
+
+ Reviewed by Fujii Hironori.
+
+ After r261264 all ports implemented USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp:
+ (WebKit::ThreadedCompositor::ThreadedCompositor):
+ (WebKit::m_displayRefreshMonitor):
+ (WebKit::ThreadedCompositor::invalidate):
+ (WebKit::ThreadedCompositor::sceneUpdateFinished):
+ (WebKit::ThreadedCompositor::displayRefreshMonitor):
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp:
+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h:
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::createDisplayRefreshMonitor const):
+ * WebProcess/WebCoreSupport/WebChromeClient.h:
+ * WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp:
+ (WebKit::DrawingAreaCoordinatedGraphics::createDisplayRefreshMonitor):
+ * WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h:
+ * WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp:
+ (WebKit::LayerTreeHost::createDisplayRefreshMonitor):
+ * WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
+ (WebKit::LayerTreeHost::deviceOrPageScaleFactorChanged):
+ * WebProcess/WebPage/DrawingArea.cpp:
+ * WebProcess/WebPage/DrawingArea.h:
+ * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.h:
+ * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm:
+ * WebProcess/WebPage/mac/DrawingAreaMac.cpp:
+
2020-05-07 Darin Adler <da...@apple.com>
Add some missing null checks for DocumentLoader
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp (261332 => 261333)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -54,9 +54,7 @@
: m_client(client)
, m_paintFlags(paintFlags)
, m_compositingRunLoop(makeUnique<CompositingRunLoop>([this] { renderLayerTree(); }))
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
, m_displayRefreshMonitor(ThreadedDisplayRefreshMonitor::create(displayID, displayRefreshMonitorClient))
-#endif
{
{
// Locking isn't really necessary here, but it's done for consistency.
@@ -95,9 +93,7 @@
{
m_scene->detach();
m_compositingRunLoop->stopUpdates();
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
m_displayRefreshMonitor->invalidate();
-#endif
m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] {
if (!m_context || !m_context->makeContextCurrent())
return;
@@ -242,20 +238,14 @@
{
LockHolder locker(m_attributes.lock);
shouldDispatchDisplayRefreshCallback = m_attributes.clientRendersNextFrame
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
|| m_displayRefreshMonitor->requiresDisplayRefreshCallback();
-#else
- ;
-#endif
}
LockHolder stateLocker(m_compositingRunLoop->stateLock());
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
// Schedule the DisplayRefreshMonitor callback, if necessary.
if (shouldDispatchDisplayRefreshCallback)
m_displayRefreshMonitor->dispatchDisplayRefreshCallback();
-#endif
// Mark the scene update as completed.
m_compositingRunLoop->updateCompleted(stateLocker);
@@ -273,12 +263,10 @@
m_compositingRunLoop->scheduleUpdate();
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<WebCore::DisplayRefreshMonitor> ThreadedCompositor::displayRefreshMonitor(PlatformDisplayID)
{
return m_displayRefreshMonitor.copyRef();
}
-#endif
void ThreadedCompositor::frameComplete()
{
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h (261332 => 261333)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -29,6 +29,7 @@
#include "CompositingRunLoop.h"
#include "CoordinatedGraphicsScene.h"
+#include "ThreadedDisplayRefreshMonitor.h"
#include <WebCore/CoordinatedGraphicsState.h>
#include <WebCore/GLContext.h>
#include <WebCore/IntSize.h>
@@ -38,10 +39,6 @@
#include <wtf/Noncopyable.h>
#include <wtf/ThreadSafeRefCounted.h>
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-#include "ThreadedDisplayRefreshMonitor.h"
-#endif
-
namespace WebKit {
class CoordinatedGraphicsScene;
@@ -75,9 +72,7 @@
void forceRepaint();
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<WebCore::DisplayRefreshMonitor> displayRefreshMonitor(WebCore::PlatformDisplayID);
-#endif
void frameComplete();
@@ -116,9 +111,7 @@
bool clientRendersNextFrame { false };
} m_attributes;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Ref<ThreadedDisplayRefreshMonitor> m_displayRefreshMonitor;
-#endif
};
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp (261332 => 261333)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,7 +26,7 @@
#include "config.h"
#include "ThreadedDisplayRefreshMonitor.h"
-#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(COORDINATED_GRAPHICS)
#include "CompositingRunLoop.h"
#include "ThreadedCompositor.h"
@@ -124,4 +124,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h (261332 => 261333)
--- trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedDisplayRefreshMonitor.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -27,7 +27,7 @@
#include <WebCore/DisplayRefreshMonitor.h>
-#if USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#if USE(COORDINATED_GRAPHICS)
#include <wtf/RunLoop.h>
namespace WebKit {
@@ -64,4 +64,4 @@
} // namespace WebKit
-#endif // USE(COORDINATED_GRAPHICS) && USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
+#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -890,7 +890,6 @@
return nullptr;
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> WebChromeClient::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
{
if (auto* drawingArea = m_page.drawingArea())
@@ -897,7 +896,6 @@
return drawingArea->createDisplayRefreshMonitor(displayID);
return nullptr;
}
-#endif
#if ENABLE(GPU_PROCESS)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -230,9 +230,7 @@
void AXFinishFrameLoad() final { }
#endif
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID) const final;
-#endif
#if ENABLE(GPU_PROCESS)
RemoteRenderingBackend& ensureRemoteRenderingBackend() const;
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -370,7 +370,6 @@
}
#endif
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> DrawingAreaCoordinatedGraphics::createDisplayRefreshMonitor(PlatformDisplayID displayID)
{
if (!m_layerTreeHost || m_wantsToExitAcceleratedCompositingMode || exitAcceleratedCompositingModePending())
@@ -377,7 +376,6 @@
return nullptr;
return m_layerTreeHost->createDisplayRefreshMonitor(displayID);
}
-#endif
void DrawingAreaCoordinatedGraphics::activityStateDidChange(OptionSet<ActivityState::Flag> changed, ActivityStateChangeID, const Vector<CallbackID>&)
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/DrawingAreaCoordinatedGraphics.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -76,9 +76,7 @@
void layerHostDidFlushLayers() override;
#endif
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID) override;
-#endif
void activityStateDidChange(OptionSet<WebCore::ActivityState::Flag>, ActivityStateChangeID, const Vector<CallbackID>& /* callbackIDs */) override;
void attachViewOverlayGraphicsLayer(WebCore::GraphicsLayer*) override;
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -338,12 +338,10 @@
m_compositor->setScaleFactor(m_webPage.deviceScaleFactor() * m_viewportController.pageScaleFactor());
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DisplayRefreshMonitor> LayerTreeHost::createDisplayRefreshMonitor(PlatformDisplayID displayID)
{
return m_compositor->displayRefreshMonitor(displayID);
}
-#endif
void LayerTreeHost::didFlushRootLayer(const FloatRect& visibleContentRect)
{
Modified: trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -91,9 +91,7 @@
void deviceOrPageScaleFactorChanged();
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID);
-#endif
WebCore::PlatformDisplayID displayID() const { return m_displayID; }
@@ -221,9 +219,7 @@
inline void LayerTreeHost::didChangeViewportAttributes(WebCore::ViewportAttributes&&) { }
inline void LayerTreeHost::setIsDiscardable(bool) { }
inline void LayerTreeHost::deviceOrPageScaleFactorChanged() { }
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
inline RefPtr<WebCore::DisplayRefreshMonitor> LayerTreeHost::createDisplayRefreshMonitor(WebCore::PlatformDisplayID) { return nullptr; }
#endif
-#endif
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -82,7 +82,7 @@
function();
}
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && !(PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING))
+#if !(PLATFORM(MAC) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING))
RefPtr<WebCore::DisplayRefreshMonitor> DrawingArea::createDisplayRefreshMonitor(PlatformDisplayID)
{
return nullptr;
Modified: trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -116,9 +116,7 @@
virtual void scheduleRenderingUpdate() = 0;
virtual void scheduleImmediateRenderingUpdate() = 0;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
virtual RefPtr<WebCore::DisplayRefreshMonitor> createDisplayRefreshMonitor(WebCore::PlatformDisplayID);
-#endif
virtual void dispatchAfterEnsuringUpdatedScrollPosition(WTF::Function<void ()>&&);
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.h (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.h 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.h 2020-05-07 20:57:42 UTC (rev 261333)
@@ -25,8 +25,6 @@
#pragma once
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
#include "RemoteLayerTreeDrawingArea.h"
#include <WebCore/AnimationFrameRate.h>
#include <WebCore/DisplayRefreshMonitor.h>
@@ -55,5 +53,3 @@
};
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDisplayRefreshMonitor.mm 2020-05-07 20:57:42 UTC (rev 261333)
@@ -26,8 +26,6 @@
#import "config.h"
#import "RemoteLayerTreeDisplayRefreshMonitor.h"
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
-
namespace WebKit {
using namespace WebCore;
@@ -79,5 +77,3 @@
}
}
-
-#endif // USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp (261332 => 261333)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp 2020-05-07 20:15:58 UTC (rev 261332)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/DrawingAreaMac.cpp 2020-05-07 20:57:42 UTC (rev 261333)
@@ -36,7 +36,7 @@
namespace WebKit {
using namespace WebCore;
-#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) && ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
+#if ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
class DisplayRefreshMonitorMac : public DisplayRefreshMonitor {
public:
@@ -109,6 +109,6 @@
{
return DisplayRefreshMonitorMac::create(displayID);
}
-#endif
+#endif // ENABLE(WEBPROCESS_WINDOWSERVER_BLOCKING)
}
