Merge webkit.org at r54127 : Initial merge by git

Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82

1 files changed, 13 insertions, 3 deletions

diff --git a/WebKitTools/DumpRenderTree/AccessibilityController.h b/WebKitTools/DumpRenderTree/AccessibilityController.h
index a10e8be..de58f84 100644
--- a/WebKitTools/DumpRenderTree/AccessibilityController.h
+++ b/WebKitTools/DumpRenderTree/AccessibilityController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,13 +26,15 @@
 #ifndef AccessibilityController_h
 #define AccessibilityController_h
 
+#include "AccessibilityUIElement.h"
 #include <JavaScriptCore/JSObjectRef.h>
+#include <string>
+#include <wtf/HashMap.h>
+#include <wtf/Platform.h>
 #if PLATFORM(WIN)
 #include <windows.h>
 #endif
 
-class AccessibilityUIElement;
-
 class AccessibilityController {
 public:
     AccessibilityController();
@@ -45,16 +47,24 @@ public:
     AccessibilityUIElement focusedElement();
 
     void setLogFocusEvents(bool);
+    void setLogValueChangeEvents(bool);
     void setLogScrollingStartEvents(bool);
 
     void resetToConsistentState();
 
+    void addNotificationListener(PlatformUIElement, JSObjectRef functionCallback);
+    void notificationReceived(PlatformUIElement, const std::string& eventName);
+
 private:
     static JSClassRef getJSClass();
 
 #if PLATFORM(WIN)
     HWINEVENTHOOK m_focusEventHook;
+    HWINEVENTHOOK m_valueChangeEventHook;
     HWINEVENTHOOK m_scrollingStartEventHook;
+
+    HWINEVENTHOOK m_allEventsHook;
+    HashMap<PlatformUIElement, JSObjectRef> m_notificationListeners;
 #endif
 };