diff --git a/engine/core/core.gni b/engine/core/core.gni index 4d9bf74e20f562baa377d920b90662d9b5a28551..49cc70893c2bdd54a9b12ad83113e2ce10dac59d 100644 --- a/engine/core/core.gni +++ b/engine/core/core.gni @@ -915,8 +915,8 @@ sky_core_files = [ "script/dom_dart_state.cc", "script/dom_dart_state.h", "script/monitor.h", - "view/BeginFrameCallback.h", "view/EventCallback.h", + "view/FrameCallback.h", "view/View.cpp", "view/View.h", ] @@ -999,8 +999,8 @@ core_idl_files = get_path_info([ "painting/PictureRecorder.idl", "painting/RRect.idl", "painting/Shader.idl", - "view/BeginFrameCallback.idl", "view/EventCallback.idl", + "view/FrameCallback.idl", "view/View.idl", ], "abspath") diff --git a/engine/core/view/BeginFrameCallback.h b/engine/core/view/FrameCallback.h similarity index 53% rename from engine/core/view/BeginFrameCallback.h rename to engine/core/view/FrameCallback.h index 8b1faee1241b22f768bd603e4a5d101283f75a32..21d811eef4bab5c07dd7796865c8cd5bcbaaabaa 100644 --- a/engine/core/view/BeginFrameCallback.h +++ b/engine/core/view/FrameCallback.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SKY_ENGINE_CORE_VIEW_BEGINFRAMECALLBACK_H_ -#define SKY_ENGINE_CORE_VIEW_BEGINFRAMECALLBACK_H_ +#ifndef SKY_ENGINE_CORE_VIEW_FRAMECALLBACK_H_ +#define SKY_ENGINE_CORE_VIEW_FRAMECALLBACK_H_ namespace blink { -class BeginFrameCallback { +class FrameCallback { public: - virtual ~BeginFrameCallback() { } + virtual ~FrameCallback() { } virtual bool handleEvent(double highResTime) = 0; }; } -#endif // SKY_ENGINE_CORE_VIEW_BEGINFRAMECALLBACK_H_ +#endif // SKY_ENGINE_CORE_VIEW_FRAMECALLBACK_H_ diff --git a/engine/core/view/BeginFrameCallback.idl b/engine/core/view/FrameCallback.idl similarity index 84% rename from engine/core/view/BeginFrameCallback.idl rename to engine/core/view/FrameCallback.idl index eb8b9aebea593dd6c9ee56231ae46378baba3afb..0f4a19525ba363511dbd8e876b3c9cdf868a657b 100644 --- a/engine/core/view/BeginFrameCallback.idl +++ b/engine/core/view/FrameCallback.idl @@ -2,6 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -callback interface BeginFrameCallback { +callback interface FrameCallback { boolean handleEvent(double highResTime); }; diff --git a/engine/core/view/View.cpp b/engine/core/view/View.cpp index 3dcd5419a4b4bd697d213bf0c9abd40d594deb85..c9dbc07d6e9ee8bb1f12fa4d386119e737dd4a3e 100644 --- a/engine/core/view/View.cpp +++ b/engine/core/view/View.cpp @@ -42,9 +42,9 @@ void View::setMetricsChangedCallback(PassOwnPtr callback) m_metricsChangedCallback = callback; } -void View::setBeginFrameCallback(PassOwnPtr callback) +void View::setFrameCallback(PassOwnPtr callback) { - m_beginFrameCallback = callback; + m_frameCallback = callback; } void View::scheduleFrame() @@ -67,10 +67,10 @@ void View::handleInputEvent(PassRefPtr event) void View::beginFrame(base::TimeTicks frameTime) { - if (!m_beginFrameCallback) + if (!m_frameCallback) return; double frameTimeMS = (frameTime - base::TimeTicks()).InMillisecondsF(); - m_beginFrameCallback->handleEvent(frameTimeMS); + m_frameCallback->handleEvent(frameTimeMS); } } // namespace blink diff --git a/engine/core/view/View.h b/engine/core/view/View.h index 5297cf66959afa34221bf6cfa585593e141ece08..b5a5599fbec19da521ebb900282874b9a836fccf 100644 --- a/engine/core/view/View.h +++ b/engine/core/view/View.h @@ -9,8 +9,8 @@ #include "base/time/time.h" #include "sky/engine/core/html/VoidCallback.h" #include "sky/engine/core/painting/Picture.h" -#include "sky/engine/core/view/BeginFrameCallback.h" #include "sky/engine/core/view/EventCallback.h" +#include "sky/engine/core/view/FrameCallback.h" #include "sky/engine/public/platform/sky_display_metrics.h" #include "sky/engine/tonic/dart_wrappable.h" #include "sky/engine/wtf/PassRefPtr.h" @@ -35,7 +35,7 @@ public: void setMetricsChangedCallback(PassOwnPtr callback); - void setBeginFrameCallback(PassOwnPtr callback); + void setFrameCallback(PassOwnPtr callback); void scheduleFrame(); void setDisplayMetrics(const SkyDisplayMetrics& metrics); @@ -49,7 +49,7 @@ private: SkyDisplayMetrics m_displayMetrics; OwnPtr m_eventCallback; OwnPtr m_metricsChangedCallback; - OwnPtr m_beginFrameCallback; + OwnPtr m_frameCallback; RefPtr m_picture; }; diff --git a/engine/core/view/View.idl b/engine/core/view/View.idl index 4c4987adb2f50d86226f6d9c18c659ca7a1d61a7..97f075fae5508aae4686c792b4a7484a1322de8c 100644 --- a/engine/core/view/View.idl +++ b/engine/core/view/View.idl @@ -14,6 +14,6 @@ interface View { void setEventCallback(EventCallback callback); void setMetricsChangedCallback(VoidCallback callback); - void setBeginFrameCallback(BeginFrameCallback callback); + void setFrameCallback(FrameCallback callback); void scheduleFrame(); }; diff --git a/sdk/example/raw/painting.dart b/sdk/example/raw/painting.dart index 8d94b62b6449bf48ed0cc0ac38c4f64c4ff3986e..90a7b467ad4977611f849d7ec2bf6174cf501f1e 100644 --- a/sdk/example/raw/painting.dart +++ b/sdk/example/raw/painting.dart @@ -88,6 +88,6 @@ void beginFrame(double timeStamp) { } void main() { - sky.view.setBeginFrameCallback(beginFrame); + sky.view.setFrameCallback(beginFrame); sky.view.scheduleFrame(); } diff --git a/sdk/example/raw/shadow.dart b/sdk/example/raw/shadow.dart index defcb2a60c0bf409b050e247b43c3448832f9ace..73a5053c2549d27147dd47aa1661669291871aff 100644 --- a/sdk/example/raw/shadow.dart +++ b/sdk/example/raw/shadow.dart @@ -35,6 +35,6 @@ void beginFrame(double timeStamp) { } void main() { - view.setBeginFrameCallback(beginFrame); + view.setFrameCallback(beginFrame); view.scheduleFrame(); } diff --git a/sdk/example/raw/spinning_arabic.dart b/sdk/example/raw/spinning_arabic.dart index c9c70e0b0ecd774a9bccdd1b9e1c4fb45c57d20a..bb49ed34b0c81304ba2deb6319dca2e6c6cdf4de 100644 --- a/sdk/example/raw/spinning_arabic.dart +++ b/sdk/example/raw/spinning_arabic.dart @@ -43,6 +43,6 @@ void main() { layoutRoot.rootElement = block; - view.setBeginFrameCallback(beginFrame); + view.setFrameCallback(beginFrame); view.scheduleFrame(); } diff --git a/sdk/example/raw/spinning_image.dart b/sdk/example/raw/spinning_image.dart index eca7059f549ef6feff43ba86e4e82bd57d11d77b..7b8c28d119e8d149950976fcacba603df1ff09b6 100644 --- a/sdk/example/raw/spinning_image.dart +++ b/sdk/example/raw/spinning_image.dart @@ -69,5 +69,5 @@ bool handleEvent(Event event) { void main() { image_cache.load(url1).then(handleImageLoad); view.setEventCallback(handleEvent); - view.setBeginFrameCallback(beginFrame); + view.setFrameCallback(beginFrame); } diff --git a/sdk/example/raw/spinning_square.dart b/sdk/example/raw/spinning_square.dart index 3c3633839d959ac152884e5cd523ed79cc3641be..c64d40e590670bdcaa9b657527959f97a4ad498e 100644 --- a/sdk/example/raw/spinning_square.dart +++ b/sdk/example/raw/spinning_square.dart @@ -24,6 +24,6 @@ void beginFrame(double timeStamp) { } void main() { - view.setBeginFrameCallback(beginFrame); + view.setFrameCallback(beginFrame); view.scheduleFrame(); } diff --git a/sdk/lib/base/scheduler.dart b/sdk/lib/base/scheduler.dart index 96dbfd09f0219461dc9eecf2eab35752b31c2f5f..272217d879b766fc22c8276272952d16e08f40f5 100644 --- a/sdk/lib/base/scheduler.dart +++ b/sdk/lib/base/scheduler.dart @@ -27,18 +27,14 @@ void _beginFrame(double timeStamp) { } void init() { - assert(sky.window == null); - sky.view.setBeginFrameCallback(_beginFrame); + sky.view.setFrameCallback(_beginFrame); } void addPersistentFrameCallback(Callback callback) { - assert(sky.window == null); _persistentCallbacks.add(callback); } int requestAnimationFrame(Callback callback) { - if (sky.window != null) - return sky.window.requestAnimationFrame(callback); int id = _nextCallbackId++; _transientCallbacks[id] = callback; ensureVisualUpdate(); @@ -46,13 +42,10 @@ int requestAnimationFrame(Callback callback) { } void cancelAnimationFrame(int id) { - if (sky.window != null) - return sky.window.cancelAnimationFrame(id); _transientCallbacks.remove(id); } void ensureVisualUpdate() { - assert(sky.window == null); if (_haveScheduledVisualUpdate) return; sky.view.scheduleFrame();