Changeset 35903 in webkit
- Timestamp:
- Aug 24, 2008 5:56:21 AM (16 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 added
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r35880 r35903 1 2008-08-24 Jon Honeycutt <jhoneycutt@apple.com> 2 3 Initial support for accessibility layout tests on Windows. 4 https://bugs.webkit.org/show_bug.cgi?id=20497 5 6 Reviewed by Sam Weinig. 7 8 * DumpRenderTree/AccessibilityController.h: Fix typos. 9 * DumpRenderTree/AccessibilityUIElement.cpp: Change #import to #include. 10 * DumpRenderTree/AccessibilityUIElement.h: Define _WINSOCKAPI_ to 11 prevent oleacc.h, which includes windows.h, from including winsock.h. 12 Fixed typos. 13 * DumpRenderTree/win/AccessibilityControllerWin.cpp: Added. 14 (AccessibilityController::AccessibilityController): 15 (AccessibilityController::~AccessibilityController): 16 (AccessibilityController::focusedElement): Get the root element, and 17 request its focused object. 18 (AccessibilityController::rootElement): Query Windows for the 19 accessible client object for the WebView's window. 20 * DumpRenderTree/win/AccessibilityUIElementWin.cpp: Added. 21 (AccessibilityUIElement::AccessibilityUIElement): 22 (AccessibilityUIElement::~AccessibilityUIElement): 23 (AccessibilityUIElement::getLinkedUIElements): Not implemented. 24 (AccessibilityUIElement::getChildren): Get the child count, and append 25 each child. 26 (AccessibilityUIElement::getChildAtIndex): Get the child at the given 27 index offset by 1. In MSAA, child 0 is the object itself. 28 (AccessibilityUIElement::allAttributes): Not implemented. 29 (AccessibilityUIElement::attributesOfLinkedUIElements): Same. 30 (AccessibilityUIElement::attributesOfChildren): Same. 31 (AccessibilityUIElement::parameterizedAttributeNames): Same. 32 (self): Return a VARIANT representing the "self" object. This is used 33 when calling methods that require a child variant. 34 (AccessibilityUIElement::role): Get the MSAA role, a long value, and 35 convert it into a string with GetRoleText(). 36 (AccessibilityUIElement::title): Get the element's title, and convert 37 it to a JS String. 38 (AccessibilityUIElement::description): Same, for description. 39 (AccessibilityUIElement::width): 40 (AccessibilityUIElement::height): 41 (AccessibilityUIElement::intValue): Get the object's value as a string, 42 and convert the string to a double. 43 (AccessibilityUIElement::minValue): Not implemented. 44 (AccessibilityUIElement::maxValue): Same. 45 (AccessibilityUIElement::insertionPointLineNumber): Same. 46 (AccessibilityUIElement::attributesOfColumnHeaders): Same. 47 (AccessibilityUIElement::attributesOfRowHeaders): Same. 48 (AccessibilityUIElement::attributesOfColumns): Same. 49 (AccessibilityUIElement::attributesOfRows): Same. 50 (AccessibilityUIElement::attributesOfVisibleCells): Same. 51 (AccessibilityUIElement::attributesOfHeader): Same. 52 (AccessibilityUIElement::indexInTable): Same. 53 (AccessibilityUIElement::rowIndexRange): Same. 54 (AccessibilityUIElement::columnIndexRange): Same. 55 (AccessibilityUIElement::lineForIndex): Same. 56 (AccessibilityUIElement::boundsForRange): Same. 57 (AccessibilityUIElement::cellForColumnAndRow): Same. 58 * DumpRenderTree/win/DumpRenderTree.vcproj: Add accessibility files to 59 project. Link to oleacc.lib, the MSAA library. 60 * DumpRenderTree/win/FrameLoadDelegate.cpp: 61 (FrameLoadDelegate::FrameLoadDelegate): Initialize the accessibility 62 controller. 63 (FrameLoadDelegate::didClearWindowObject): Create a new window object 64 for the accessibility controller. 65 * DumpRenderTree/win/FrameLoadDelegate.h: 66 1 67 2008-08-21 Simon Fraser <simon.fraser@apple.com> 2 68 -
trunk/WebKitTools/DumpRenderTree/AccessibilityController.h
r35608 r35903 38 38 void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception); 39 39 40 // Controller Methods - platf rom independant implementations40 // Controller Methods - platform-independent implementations 41 41 AccessibilityUIElement rootElement(); 42 42 AccessibilityUIElement focusedElement(); -
trunk/WebKitTools/DumpRenderTree/AccessibilityUIElement.cpp
r35846 r35903 26 26 #include "AccessibilityUIElement.h" 27 27 28 #i mport<JavaScriptCore/JSRetainPtr.h>28 #include <JavaScriptCore/JSRetainPtr.h> 29 29 30 30 // Static Functions -
trunk/WebKitTools/DumpRenderTree/AccessibilityUIElement.h
r35846 r35903 37 37 typedef struct objc_object* PlatformUIElement; 38 38 #endif 39 #elif PLATFORM(WIN) 40 #undef _WINSOCKAPI_ 41 #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h 42 43 #include <oleacc.h> 44 #include <WebCore/COMPtr.h> 45 46 typedef COMPtr<IAccessible> PlatformUIElement; 39 47 #else 40 48 typedef void* PlatformUIElement; … … 55 63 AccessibilityUIElement getChildAtIndex(unsigned); 56 64 57 // Methods - platf rom independant implementations65 // Methods - platform-independent implementations 58 66 JSStringRef allAttributes(); 59 67 JSStringRef attributesOfLinkedUIElements(); … … 61 69 JSStringRef parameterizedAttributeNames(); 62 70 63 // Attributes - platf rom independant implementations71 // Attributes - platform-independent implementations 64 72 JSStringRef role(); 65 73 JSStringRef title(); … … 72 80 int insertionPointLineNumber(); 73 81 74 // tablespecific attributes82 // Table-specific attributes 75 83 JSStringRef attributesOfColumnHeaders(); 76 84 JSStringRef attributesOfRowHeaders(); … … 83 91 JSStringRef columnIndexRange(); 84 92 85 // parameterized attributes93 // Parameterized attributes 86 94 int lineForIndex(int); 87 95 JSStringRef boundsForRange(unsigned location, unsigned length); 88 96 89 // tablespecific97 // Table-specific 90 98 AccessibilityUIElement cellForColumnAndRow(unsigned column, unsigned row); 91 99 -
trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
r35453 r35903 55 55 <Tool 56 56 Name="VCLinkerTool" 57 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib "57 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib" 58 58 AdditionalLibraryDirectories="" 59 59 DelayLoadDLLs="" … … 129 129 <Tool 130 130 Name="VCLinkerTool" 131 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib "131 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib" 132 132 AdditionalLibraryDirectories="" 133 133 DelayLoadDLLs="" … … 202 202 <Tool 203 203 Name="VCLinkerTool" 204 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib "204 AdditionalDependencies="WebKitGUID$(WebKitConfigSuffix).lib WebKit$(WebKitDLLConfigSuffix).lib WTF$(WebKitConfigSuffix).lib CoreGraphics$(LibraryConfigSuffix).lib CoreFoundation$(LibraryConfigSuffix).lib CFNetwork$(LibraryConfigSuffix).lib pthreadVC2$(LibraryConfigSuffix).lib gdi32.lib ole32.lib oleaut32.lib user32.lib shlwapi.lib oleacc.lib" 205 205 AdditionalLibraryDirectories="" 206 206 DelayLoadDLLs="" … … 243 243 > 244 244 <File 245 RelativePath="..\AccessibilityController.cpp" 246 > 247 </File> 248 <File 249 RelativePath="..\AccessibilityController.h" 250 > 251 </File> 252 <File 253 RelativePath=".\AccessibilityControllerWin.cpp" 254 > 255 </File> 256 <File 245 257 RelativePath=".\EventSender.cpp" 246 258 > … … 319 331 </File> 320 332 </Filter> 333 <File 334 RelativePath="..\AccessibilityUIElement.cpp" 335 > 336 </File> 337 <File 338 RelativePath="..\AccessibilityUIElement.h" 339 > 340 </File> 341 <File 342 RelativePath=".\AccessibilityUIElementWin.cpp" 343 > 344 </File> 321 345 <File 322 346 RelativePath=".\DraggingInfo.h" -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.cpp
r33549 r35903 30 30 #include "FrameLoadDelegate.h" 31 31 32 #include "AccessibilityController.h" 32 33 #include "EventSender.h" 33 34 #include "GCController.h" … … 83 84 : m_refCount(1) 84 85 , m_gcController(new GCController) 86 , m_accessibilityController(new AccessibilityController) 85 87 { 86 88 } … … 262 264 263 265 m_gcController->makeWindowObject(context, windowObject, &exception); 266 ASSERT(!exception); 267 268 m_accessibilityController->makeWindowObject(context, windowObject, &exception); 264 269 ASSERT(!exception); 265 270 -
trunk/WebKitTools/DumpRenderTree/win/FrameLoadDelegate.h
r30181 r35903 33 33 #include <wtf/OwnPtr.h> 34 34 35 class AccessibilityController; 35 36 class GCController; 36 37 … … 133 134 ULONG m_refCount; 134 135 OwnPtr<GCController> m_gcController; 136 OwnPtr<AccessibilityController> m_accessibilityController; 135 137 }; 136 138
Note: See TracChangeset
for help on using the changeset viewer.