Bug 1436190: Fixed render frame notification in wake_up(). r=nical

MozReview-Commit-ID: JHBKpAh4YDD

gfx/webrender_bindings/RenderThread.cpp

@@ -463,6 +463,12 @@ static void NewFrameReady(mozilla::wr::WrWindowId aWindowId)
   mozilla::wr::RenderThread::Get()->NewFrameReady(mozilla::wr::WindowId(aWindowId));
 }
 
+void wr_notifier_wake_up(mozilla::wr::WrWindowId aWindowId)
+{
+  //TODO?
+  mozilla::Unused << aWindowId;
+}
+
 void wr_notifier_new_frame_ready(mozilla::wr::WrWindowId aWindowId)
 {
   NewFrameReady(aWindowId);

gfx/webrender_bindings/WebRenderAPI.cpp

@@ -539,7 +539,6 @@ WebRenderAPI::Capture()
   const char* border = "--------------------------\n";
   printf("%s Capturing WR state to: %s\n%s", border, path, border);
   wr_api_capture(mDocHandle, path, bits);
-  RenderThread::Get()->IncPendingFrameCount(GetId());
 }
 
 

gfx/webrender_bindings/src/bindings.rs

@@ -454,6 +454,7 @@ struct CppNotifier {
 unsafe impl Send for CppNotifier {}
 
 extern "C" {
+    fn wr_notifier_wake_up(window_id: WrWindowId);
     fn wr_notifier_new_frame_ready(window_id: WrWindowId);
     fn wr_notifier_new_scroll_frame_ready(window_id: WrWindowId,
                                           composite_needed: bool);
@@ -470,7 +471,7 @@ impl RenderNotifier for CppNotifier {
 
     fn wake_up(&self) {
         unsafe {
-            wr_notifier_new_frame_ready(self.window_id);
+            wr_notifier_wake_up(self.window_id);
         }
     }
 

gfx/webrender_bindings/webrender_ffi_generated.h

@@ -1356,6 +1356,8 @@ extern void wr_notifier_new_frame_ready(WrWindowId aWindowId);
 extern void wr_notifier_new_scroll_frame_ready(WrWindowId aWindowId,
                                                bool aCompositeNeeded);
 
+extern void wr_notifier_wake_up(WrWindowId aWindowId);
+
 WR_INLINE
 void wr_program_cache_delete(WrProgramCache *aProgramCache)
 WR_DESTRUCTOR_SAFE_FUNC;