Bug 1109873 - Extract HitTestResult into a helper header. r=botond

gfx/layers/apz/src/APZCTreeManager.h

@@ -21,6 +21,7 @@
 #include "mozilla/Vector.h"             // for mozilla::Vector
 #include "nsTArrayForwardDeclare.h"     // for nsTArray, nsTArray_Impl, etc
 #include "mozilla/gfx/Logging.h"        // for gfx::TreeLog
+#include "mozilla/layers/APZUtils.h"    // for HitTestResult
 
 class nsIntRegion;
 
@@ -399,13 +400,6 @@ public:
      about it going away. These are public for testing code and generally should not be
      used by other production code.
   */
-  enum HitTestResult {
-    NoApzcHit,
-    ApzcHitRegion,
-    ApzcContentRegion,
-    OverscrolledApzc,
-  };
-
   nsRefPtr<HitTestingTreeNode> GetRootNode() const;
   already_AddRefed<AsyncPanZoomController> GetTargetAPZC(const ScreenPoint& aPoint,
                                                          HitTestResult* aOutHitResult);

gfx/layers/apz/src/APZUtils.h

@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 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_APZUtils_h
+#define mozilla_layers_APZUtils_h
+
+namespace mozilla {
+namespace layers {
+
+enum HitTestResult {
+  NoApzcHit,
+  ApzcHitRegion,
+  ApzcContentRegion,
+  OverscrolledApzc,
+};
+
+}
+}
+
+#endif // mozilla_layers_APZUtils_h

gfx/layers/moz.build

@@ -108,6 +108,7 @@ EXPORTS.mozilla.layers += [
     # exporting things from apz/src is temporary until we extract a
     # proper interface for the code there
     'apz/src/APZCTreeManager.h',
+    'apz/src/APZUtils.h',
     'apz/testutil/APZTestData.h',
     'apz/util/ActiveElementManager.h',
     'apz/util/APZCCallbackHelper.h',