Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)

New snapshot with prospective Mountain Lion build fix

1 files changed, 6 insertions, 1 deletions

diff --git a/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.h b/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.h
index 8cf4cb824..4e65e922f 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.h
+++ b/Tools/DumpRenderTree/chromium/TestRunner/GamepadController.h
@@ -34,6 +34,8 @@
 #include "CppBoundClass.h"
 #include "platform/WebGamepads.h"
 
+class TestDelegate;
+
 namespace WebKit {
 class WebGamepads;
 class WebFrame;
@@ -44,6 +46,7 @@ public:
     GamepadController();
 
     void bindToJavascript(WebKit::WebFrame*, const WebKit::WebString& classname);
+    void setDelegate(TestDelegate*);
     void reset();
 
 private:
@@ -57,7 +60,9 @@ private:
     void setAxisData(const CppArgumentList&, CppVariant*);
     void fallbackCallback(const CppArgumentList&, CppVariant*);
 
-    WebKit::WebGamepads internalData;
+    WebKit::WebGamepads m_gamepads;
+
+    TestDelegate* m_delegate;
 };
 
 #endif // GamepadController_h