Changeset 233163 in webkit

Timestamp:

Jun 25, 2018 12:23:28 PM (6 years ago)

Author:

ddkilzer@apple.com

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (5 diffs)
• dom/Document.h (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-06-25  David Kilzer  <ddkilzer@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  <youenn@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -57 +57 @@
 #include "DateComponents.h"
 #include "DebugPageOverlays.h"
+#include "DocumentAnimationScheduler.h"
 #include "DocumentLoader.h"
 #include "DocumentMarkerController.h"
@@ -2444 +2445 @@
     }
 
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     if (m_animationScheduler) {
         m_animationScheduler->detachFromDocument();
         m_animationScheduler = nullptr;
     }
+#endif
 
     m_hasPreparedForDestruction = true;
@@ -5925 +5928 @@
 void Document::windowScreenDidChange(PlatformDisplayID displayID)
 {
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     if (m_animationScheduler)
         m_animationScheduler->windowScreenDidChange(displayID);
+#endif
 
     if (RenderView* view = renderView()) {
@@ -7717 +7722 @@
 }
 
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
 DocumentAnimationScheduler& Document::animationScheduler()
 {
@@ -7724 +7730 @@
     return *m_animationScheduler;
 }
+#endif
 
 DocumentTimeline& Document::timeline()

trunk/Source/WebCore/dom/Document.h

@@ -31 +31 @@
 #include "ContainerNode.h"
 #include "DisabledAdaptations.h"
-#include "DocumentAnimationScheduler.h"
 #include "DocumentEventQueue.h"
 #include "DocumentIdentifier.h"
@@ -82 +81 @@
 namespace WebCore {
 
-class DocumentAnimationScheduler;
 class ApplicationStateChangeListener;
 class AXObjectCache;
@@ -106 +104 @@
 class DatabaseThread;
 class DeferredPromise;
+class DocumentAnimationScheduler;
 class DocumentFragment;
 class DocumentLoader;
@@ -1409 +1408 @@
     WEBCORE_EXPORT void setConsoleMessageListener(RefPtr<StringCallback>&&); // For testing.
 
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     DocumentAnimationScheduler& animationScheduler();
+#endif
 
     WEBCORE_EXPORT DocumentTimeline& timeline();
@@ -1925 +1926 @@
     bool m_grantStorageAccessOverride { false };
 
+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
     RefPtr<DocumentAnimationScheduler> m_animationScheduler;
+#endif
     RefPtr<DocumentTimeline> m_timeline;
     DocumentIdentifier m_identifier;