Backed out changeset 79686836f1f7 "(bug 1005089) r=bz" for bustage on…

… a CLOSED TREE --HG-- extra : amend_source : 5170a31dc799f4401d30c8d6c4423dad2e84535f
dothq · May 5, 2014 · 30a96f1 · 30a96f1
1 parent 11b8924
commit 30a96f1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/dom/events/Touch.cpp b/dom/events/Touch.cpp
@@ -90,7 +90,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(Touch)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Touch)
 
 EventTarget*
-Touch::GetTarget() const
+Touch::Target() const
 {
   nsCOMPtr<nsIContent> content = do_QueryInterface(mTarget);
   if (content && content->ChromeOnlyAccess() &&

diff --git a/dom/events/Touch.h b/dom/events/Touch.h
@@ -62,7 +62,7 @@ class Touch MOZ_FINAL : public nsISupports
 
   // WebIDL
   int32_t Identifier() const { return mIdentifier; }
-  EventTarget* GetTarget() const;
+  EventTarget* Target() const;
   int32_t ScreenX() const { return mScreenPoint.x; }
   int32_t ScreenY() const { return mScreenPoint.y; }
   int32_t ClientX() const { return mClientPoint.x; }

diff --git a/dom/webidl/Touch.webidl b/dom/webidl/Touch.webidl
@@ -12,16 +12,16 @@
 
 [Func="mozilla::dom::Touch::PrefEnabled"]
 interface Touch {
-  readonly    attribute long         identifier;
-  readonly    attribute EventTarget? target;
-  readonly    attribute long         screenX;
-  readonly    attribute long         screenY;
-  readonly    attribute long         clientX;
-  readonly    attribute long         clientY;
-  readonly    attribute long         pageX;
-  readonly    attribute long         pageY;
-  readonly    attribute long         radiusX;
-  readonly    attribute long         radiusY;
-  readonly    attribute float        rotationAngle;
-  readonly    attribute float        force;
+  readonly    attribute long        identifier;
+  readonly    attribute EventTarget target;
+  readonly    attribute long        screenX;
+  readonly    attribute long        screenY;
+  readonly    attribute long        clientX;
+  readonly    attribute long        clientY;
+  readonly    attribute long        pageX;
+  readonly    attribute long        pageY;
+  readonly    attribute long        radiusX;
+  readonly    attribute long        radiusY;
+  readonly    attribute float       rotationAngle;
+  readonly    attribute float       force;
 };