Title: [233163] trunk/Source/WebCore
- Revision
- 233163
- Author
- ddkil...@apple.com
- Date
- 2018-06-25 12:23:28 -0700 (Mon, 25 Jun 2018)
Log Message
REGRESSION (r233140): v2: Windows build failure due to incomplete DocumentAnimationScheduler type
<https://webkit.org/b/186997>
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction):
(WebCore::Document::windowScreenDidChange):
* dom/Document.h:
- DocumentAnimationScheduler is behind the
USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) macro, which
is disabled on Windows.
- This also reverts my fix in r233144 since it didn't work.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (233162 => 233163)
--- trunk/Source/WebCore/ChangeLog 2018-06-25 19:19:06 UTC (rev 233162)
+++ trunk/Source/WebCore/ChangeLog 2018-06-25 19:23:28 UTC (rev 233163)
@@ -1,3 +1,17 @@
+2018-06-25 David Kilzer <ddkil...@apple.com>
+
+ REGRESSION (r233140): v2: Windows build failure due to incomplete DocumentAnimationScheduler type
+ <https://webkit.org/b/186997>
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction):
+ (WebCore::Document::windowScreenDidChange):
+ * dom/Document.h:
+ - DocumentAnimationScheduler is behind the
+ USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) macro, which
+ is disabled on Windows.
+ - This also reverts my fix in r233144 since it didn't work.
+
2018-06-25 Youenn Fablet <you...@apple.com>
Add API to control mock media devices
Modified: trunk/Source/WebCore/dom/Document.cpp (233162 => 233163)
--- trunk/Source/WebCore/dom/Document.cpp 2018-06-25 19:19:06 UTC (rev 233162)
+++ trunk/Source/WebCore/dom/Document.cpp 2018-06-25 19:23:28 UTC (rev 233163)
@@ -56,6 +56,7 @@
#include "DOMWindow.h"
#include "DateComponents.h"
#include "DebugPageOverlays.h"
+#include "DocumentAnimationScheduler.h"
#include "DocumentLoader.h"
#include "DocumentMarkerController.h"
#include "DocumentSharedObjectPool.h"
@@ -2443,10 +2444,12 @@
m_timeline = nullptr;
}
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
if (m_animationScheduler) {
m_animationScheduler->detachFromDocument();
m_animationScheduler = nullptr;
}
+#endif
m_hasPreparedForDestruction = true;
@@ -5924,8 +5927,10 @@
void Document::windowScreenDidChange(PlatformDisplayID displayID)
{
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
if (m_animationScheduler)
m_animationScheduler->windowScreenDidChange(displayID);
+#endif
if (RenderView* view = renderView()) {
if (view->usesCompositing())
@@ -7716,6 +7721,7 @@
m_consoleMessageListener = listener;
}
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
DocumentAnimationScheduler& Document::animationScheduler()
{
if (!m_animationScheduler)
@@ -7723,6 +7729,7 @@
return *m_animationScheduler;
}
+#endif
DocumentTimeline& Document::timeline()
{
Modified: trunk/Source/WebCore/dom/Document.h (233162 => 233163)
--- trunk/Source/WebCore/dom/Document.h 2018-06-25 19:19:06 UTC (rev 233162)
+++ trunk/Source/WebCore/dom/Document.h 2018-06-25 19:23:28 UTC (rev 233163)
@@ -30,7 +30,6 @@
#include "Color.h"
#include "ContainerNode.h"
#include "DisabledAdaptations.h"
-#include "DocumentAnimationScheduler.h"
#include "DocumentEventQueue.h"
#include "DocumentIdentifier.h"
#include "DocumentTiming.h"
@@ -81,7 +80,6 @@
namespace WebCore {
-class DocumentAnimationScheduler;
class ApplicationStateChangeListener;
class AXObjectCache;
class Attr;
@@ -105,6 +103,7 @@
class Database;
class DatabaseThread;
class DeferredPromise;
+class DocumentAnimationScheduler;
class DocumentFragment;
class DocumentLoader;
class DocumentMarkerController;
@@ -1408,7 +1407,9 @@
WEBCORE_EXPORT void setConsoleMessageListener(RefPtr<StringCallback>&&); // For testing.
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
DocumentAnimationScheduler& animationScheduler();
+#endif
WEBCORE_EXPORT DocumentTimeline& timeline();
DocumentTimeline* existingTimeline() const { return m_timeline.get(); }
@@ -1924,7 +1925,9 @@
bool m_hasFrameSpecificStorageAccess { false };
bool m_grantStorageAccessOverride { false };
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
RefPtr<DocumentAnimationScheduler> m_animationScheduler;
+#endif
RefPtr<DocumentTimeline> m_timeline;
DocumentIdentifier m_identifier;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
