Bug 759817 - Repair an inheritance issue, r=surkov
authorMark Capella <markcapella@twcny.rr.com>
Tue, 12 Jun 2012 19:18:04 -0400
changeset 96535 5387220c0609850b533bba269ed449d4b8f3eeb6
parent 96534 a41fd66f124530dc07856ea67da4067b843f268b
child 96536 451ed5328312eef52bd4c7b762fbbed6a6dafc7c
push id22911
push useremorley@mozilla.com
push dateWed, 13 Jun 2012 12:49:30 +0000
treeherdermozilla-central@efbb6480e98e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssurkov
bugs759817
milestone16.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 759817 - Repair an inheritance issue, r=surkov
accessible/src/html/HTMLCanvasAccessible.cpp
accessible/src/html/HTMLCanvasAccessible.h
--- a/accessible/src/html/HTMLCanvasAccessible.cpp
+++ b/accessible/src/html/HTMLCanvasAccessible.cpp
@@ -6,17 +6,19 @@
 #include "HTMLCanvasAccessible.h"
 
 #include "Role.h"
 
 using namespace mozilla::a11y;
 
 HTMLCanvasAccessible::
   HTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc) :
-  HyperTextAccessible(aContent, aDoc)
+  HyperTextAccessibleWrap(aContent, aDoc)
 {
 }
 
+NS_IMPL_ISUPPORTS_INHERITED0(HTMLCanvasAccessible, HyperTextAccessible)
+
 role
 HTMLCanvasAccessible::NativeRole()
 {
   return roles::CANVAS;
 }
--- a/accessible/src/html/HTMLCanvasAccessible.h
+++ b/accessible/src/html/HTMLCanvasAccessible.h
@@ -1,30 +1,33 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
-#include "HyperTextAccessible.h"
-
 #ifndef mozilla_a11y_HTMLCanvasAccessible_h__
 #define mozilla_a11y_HTMLCanvasAccessible_h__
 
+#include "HyperTextAccessibleWrap.h"
+
 namespace mozilla {
 namespace a11y {
 
 /**
  * HTML canvas accessible (html:canvas).
  */
-class HTMLCanvasAccessible : public HyperTextAccessible
+class HTMLCanvasAccessible : public HyperTextAccessibleWrap
 {
 public:
   HTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc);
   virtual ~HTMLCanvasAccessible() { }
 
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
   // Accessible
   virtual a11y::role NativeRole();
 };
 
 } // namespace a11y
 } // namespace mozilla
 
 #endif