--- a/gfx/layers/ipc/PUiCompositorController.ipdl
+++ b/gfx/layers/ipc/PUiCompositorController.ipdl
@@ -1,29 +1,46 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * vim: sw=2 ts=8 et :
  */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+using CSSRect from "Units.h";
+using CSSToScreenScale from "Units.h";
+using ScreenIntSize from "Units.h";
+using ScreenPoint from "Units.h";
+
 namespace mozilla {
 namespace layers {
 
 /**
  * The PUiCompositorController protocol is used to pause and resume the
  * compositor from the UI thread. Primarily used on Android to coordinate registering and
  * releasing the surface with the compositor.
  */
 sync protocol PUiCompositorController
 {
 
 parent:
   // Pause/resume the compositor. These are intended to be used on mobile, when
   // the compositor needs to pause/resume in lockstep with the application.
-  sync Pause(uint64_t layersId);
-  sync Resume(uint64_t layersId);
-  sync ResumeAndResize(uint64_t layersId, int32_t height, int32_t width);
-  async InvalidateAndRender(uint64_t layersId);
+  sync Pause();
+  sync Resume();
+  sync ResumeAndResize(int32_t aWidth, int32_t aHeight);
+
+  async InvalidateAndRender();
+  async MaxToolbarHeight(int32_t aHeight);
+  async Pinned(bool aPinned, int32_t aReason);
+  async ToolbarAnimatorMessageFromUI(int32_t aMessage);
+  async DefaultClearColor(uint32_t aColor);
+  async RequestScreenPixels();
+  async EnableLayerUpdateNotifications(bool aEnable);
+  async ToolbarPixelsToCompositor(Shmem aMem, ScreenIntSize aSize);
+child:
+  async ToolbarAnimatorMessageFromCompositor(int32_t aMessage);
+  async RootFrameMetrics(ScreenPoint aScrollOffset, CSSToScreenScale aZoom, CSSRect aPage);
+  async ScreenPixels(Shmem aMem, ScreenIntSize aSize);
 };
 
 } // layers
 } // mozilla