Title: [262857] trunk/Source/WebCore
- Revision
- 262857
- Author
- commit-qu...@webkit.org
- Date
- 2020-06-10 13:49:16 -0700 (Wed, 10 Jun 2020)
Log Message
Unreviewed, reverting r262718.
https://bugs.webkit.org/show_bug.cgi?id=213047
Broke WPE Debug too
Reverted changeset:
"[WebXR] Pass an unsigned long to cancelAnimationCallback() as
handle"
https://bugs.webkit.org/show_bug.cgi?id=212529
https://trac.webkit.org/changeset/262718
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (262856 => 262857)
--- trunk/Source/WebCore/ChangeLog 2020-06-10 20:37:03 UTC (rev 262856)
+++ trunk/Source/WebCore/ChangeLog 2020-06-10 20:49:16 UTC (rev 262857)
@@ -1,3 +1,17 @@
+2020-06-10 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, reverting r262718.
+ https://bugs.webkit.org/show_bug.cgi?id=213047
+
+ Broke WPE Debug too
+
+ Reverted changeset:
+
+ "[WebXR] Pass an unsigned long to cancelAnimationCallback() as
+ handle"
+ https://bugs.webkit.org/show_bug.cgi?id=212529
+ https://trac.webkit.org/changeset/262718
+
2020-06-10 Antoine Quint <grao...@webkit.org>
Subframes should not autosize independently
Modified: trunk/Source/WebCore/Modules/webxr/WebXRSession.cpp (262856 => 262857)
--- trunk/Source/WebCore/Modules/webxr/WebXRSession.cpp 2020-06-10 20:37:03 UTC (rev 262856)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSession.cpp 2020-06-10 20:49:16 UTC (rev 262857)
@@ -196,11 +196,11 @@
}
// https://immersive-web.github.io/webxr/#dom-xrsession-requestanimationframe
-XRFrameRequestCallback::Identifier WebXRSession::requestAnimationFrame(Ref<XRFrameRequestCallback>&& callback)
+XRFrameRequestCallback::Id WebXRSession::requestAnimationFrame(Ref<XRFrameRequestCallback>&& callback)
{
// 1. Let session be the target XRSession object.
// 2. Increment session's animation frame callback identifier by one.
- XRFrameRequestCallback::Identifier newId = ++m_nextCallbackId;
+ XRFrameRequestCallback::Id newId = ++m_nextCallbackId;
// 3. Append callback to session's list of animation frame callbacks, associated with session's
// animation frame callback identifier's current value.
@@ -214,7 +214,7 @@
}
// https://immersive-web.github.io/webxr/#dom-xrsession-cancelanimationframe
-void WebXRSession::cancelAnimationFrame(XRFrameRequestCallback::Identifier callbackId)
+void WebXRSession::cancelAnimationFrame(int callbackId)
{
// 1. Let session be the target XRSession object.
// 2. Find the entry in session's list of animation frame callbacks or session's list of
Modified: trunk/Source/WebCore/Modules/webxr/WebXRSession.h (262856 => 262857)
--- trunk/Source/WebCore/Modules/webxr/WebXRSession.h 2020-06-10 20:37:03 UTC (rev 262856)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSession.h 2020-06-10 20:49:16 UTC (rev 262857)
@@ -73,8 +73,8 @@
void updateRenderState(const XRRenderStateInit&);
void requestReferenceSpace(XRReferenceSpaceType, RequestReferenceSpacePromise&&);
- XRFrameRequestCallback::Identifier requestAnimationFrame(Ref<XRFrameRequestCallback>&&);
- void cancelAnimationFrame(XRFrameRequestCallback::Identifier handle);
+ XRFrameRequestCallback::Id requestAnimationFrame(Ref<XRFrameRequestCallback>&&);
+ void cancelAnimationFrame(int handle);
void end(EndPromise&&);
@@ -112,7 +112,7 @@
RefPtr<WebXRRenderState> m_activeRenderState;
RefPtr<WebXRRenderState> m_pendingRenderState;
- XRFrameRequestCallback::Identifier m_nextCallbackId { 0 };
+ XRFrameRequestCallback::Id m_nextCallbackId { 0 };
Vector<Ref<XRFrameRequestCallback>> m_callbacks;
Vector<Ref<XRFrameRequestCallback>> m_runningCallbacks;
Modified: trunk/Source/WebCore/Modules/webxr/WebXRSession.idl (262856 => 262857)
--- trunk/Source/WebCore/Modules/webxr/WebXRSession.idl 2020-06-10 20:37:03 UTC (rev 262856)
+++ trunk/Source/WebCore/Modules/webxr/WebXRSession.idl 2020-06-10 20:49:16 UTC (rev 262857)
@@ -43,7 +43,7 @@
[NewObject] Promise<WebXRReferenceSpace> requestReferenceSpace(XRReferenceSpaceType type);
unsigned long requestAnimationFrame(XRFrameRequestCallback callback);
- void cancelAnimationFrame(unsigned long handle);
+ void cancelAnimationFrame(long handle);
Promise<void> end();
Modified: trunk/Source/WebCore/Modules/webxr/XRFrameRequestCallback.h (262856 => 262857)
--- trunk/Source/WebCore/Modules/webxr/XRFrameRequestCallback.h 2020-06-10 20:37:03 UTC (rev 262856)
+++ trunk/Source/WebCore/Modules/webxr/XRFrameRequestCallback.h 2020-06-10 20:49:16 UTC (rev 262857)
@@ -41,14 +41,14 @@
virtual CallbackResult<void> handleEvent(double highResTimeMs, WebXRFrame&) = 0;
- using Identifier = unsigned long;
- Identifier callbackId() { ASSERT(m_id); return m_id; }
- void setCallbackId(Identifier id) { ASSERT(!m_id); m_id = id; }
+ using Id = unsigned long;
+ Id callbackId() { ASSERT(m_id); return m_id; }
+ void setCallbackId(Id id) { ASSERT(!m_id); m_id = id; }
void cancel() { m_cancelled = true; }
bool isCancelled() const { return m_cancelled; }
private:
- Identifier m_id { 0 };
+ Id m_id { 0 };
bool m_cancelled { false };
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
