diff -r 000000000000 -r 6474c204b198 gfx/layers/apz/public/GeckoContentController.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/layers/apz/public/GeckoContentController.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,165 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=4 ts=8 et tw=80 : */
+/* 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/. */
+
+#ifndef mozilla_layers_GeckoContentController_h
+#define mozilla_layers_GeckoContentController_h
+
+#include "FrameMetrics.h"               // for FrameMetrics, etc
+#include "Units.h"                      // for CSSPoint, CSSRect, etc
+#include "mozilla/Assertions.h"         // for MOZ_ASSERT_HELPER2
+#include "nsISupportsImpl.h"
+
+class Task;
+
+namespace mozilla {
+namespace layers {
+
+class GeckoContentController
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(GeckoContentController)
+
+  /**
+   * Requests a paint of the given FrameMetrics |aFrameMetrics| from Gecko.
+   * Implementations per-platform are responsible for actually handling this.
+   */
+  virtual void RequestContentRepaint(const FrameMetrics& aFrameMetrics) = 0;
+
+  /**
+   * Acknowledges the recipt of a scroll offset update for the scrollable
+   * frame with the given scroll id. This is used to maintain consistency
+   * between APZ and other sources of scroll changes.
+   */
+  virtual void AcknowledgeScrollUpdate(const FrameMetrics::ViewID& aScrollId,
+                                       const uint32_t& aScrollGeneration) = 0;
+
+  /**
+   * Requests handling of a double tap. |aPoint| is in CSS pixels, relative to
+   * the current scroll offset. This should eventually round-trip back to
+   * AsyncPanZoomController::ZoomToRect with the dimensions that we want to zoom
+   * to.
+   */
+  virtual void HandleDoubleTap(const CSSPoint& aPoint,
+                               int32_t aModifiers,
+                               const ScrollableLayerGuid& aGuid) = 0;
+
+  /**
+   * Requests handling a single tap. |aPoint| is in CSS pixels, relative to the
+   * current scroll offset. This should simulate and send to content a mouse
+   * button down, then mouse button up at |aPoint|.
+   */
+  virtual void HandleSingleTap(const CSSPoint& aPoint,
+                               int32_t aModifiers,
+                               const ScrollableLayerGuid& aGuid) = 0;
+
+  /**
+   * Requests handling a long tap. |aPoint| is in CSS pixels, relative to the
+   * current scroll offset.
+   */
+  virtual void HandleLongTap(const CSSPoint& aPoint,
+                             int32_t aModifiers,
+                             const ScrollableLayerGuid& aGuid) = 0;
+
+  /**
+   * Requests handling of releasing a long tap. |aPoint| is in CSS pixels,
+   * relative to the current scroll offset. HandleLongTapUp will always be
+   * preceeded by HandleLongTap
+   */
+  virtual void HandleLongTapUp(const CSSPoint& aPoint,
+                               int32_t aModifiers,
+                               const ScrollableLayerGuid& aGuid) = 0;
+
+  /**
+   * Requests sending a mozbrowserasyncscroll domevent to embedder.
+   * |aContentRect| is in CSS pixels, relative to the current cssPage.
+   * |aScrollableSize| is the current content width/height in CSS pixels.
+   */
+  virtual void SendAsyncScrollDOMEvent(bool aIsRoot,
+                                       const CSSRect &aContentRect,
+                                       const CSSSize &aScrollableSize) = 0;
+
+  /**
+   * Schedules a runnable to run on the controller/UI thread at some time
+   * in the future.
+   */
+  virtual void PostDelayedTask(Task* aTask, int aDelayMs) = 0;
+
+  /**
+   * Retrieves the last known zoom constraints for the root scrollable layer
+   * for this layers tree. This function should return false if there are no
+   * last known zoom constraints.
+   */
+  virtual bool GetRootZoomConstraints(ZoomConstraints* aOutConstraints)
+  {
+    return false;
+  }
+
+  /**
+   * APZ uses |FrameMetrics::mCompositionBounds| for hit testing. Sometimes,
+   * widget code has knowledge of a touch-sensitive region that should
+   * additionally constrain hit testing for all frames associated with the
+   * controller. This method allows APZ to query the controller for such a
+   * region. A return value of true indicates that the controller has such a
+   * region, and it is returned in |aOutRegion|.
+   * TODO: once bug 928833 is implemented, this should be removed, as
+   * APZ can then get the correct touch-sensitive region for each frame
+   * directly from the layer.
+   */
+  virtual bool GetTouchSensitiveRegion(CSSRect* aOutRegion)
+  {
+    return false;
+  }
+
+  MOZ_BEGIN_NESTED_ENUM_CLASS(APZStateChange, int8_t)
+    /**
+     * APZ started modifying the view (including panning, zooming, and fling).
+     */
+    TransformBegin,
+    /**
+     * APZ finished modifying the view.
+     */
+    TransformEnd,
+    /**
+     * APZ started a touch.
+     * |aArg| is 1 if touch can be a pan, 0 otherwise.
+     */
+    StartTouch,
+    /**
+     * APZ started a pan.
+     */
+    StartPanning,
+    /**
+     * APZ finished processing a touch.
+     * |aArg| is 1 if touch was a click, 0 otherwise.
+     */
+    EndTouch,
+    APZStateChangeSentinel
+  MOZ_END_NESTED_ENUM_CLASS(APZStateChange)
+
+  /**
+   * General notices of APZ state changes for consumers.
+   * |aGuid| identifies the APZC originating the state change.
+   * |aChange| identifies the type of state change
+   * |aArg| is used by some state changes to pass extra information (see
+   *        the documentation for each state change above)
+   */
+  virtual void NotifyAPZStateChange(const ScrollableLayerGuid& aGuid,
+                                    APZStateChange aChange,
+                                    int aArg = 0) {}
+
+  GeckoContentController() {}
+
+protected:
+  // Protected destructor, to discourage deletion outside of Release():
+  virtual ~GeckoContentController() {}
+};
+
+MOZ_FINISH_NESTED_ENUM_CLASS(GeckoContentController::APZStateChange)
+
+}
+}
+
+#endif // mozilla_layers_GeckoContentController_h