3 files changed, 8 insertions, 6 deletions
diff --git a/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm b/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm
index 9d7edef..1a9f9c9 100644
--- a/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm
+++ b/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm
@@ -28,8 +28,10 @@
 #import "AccessibilityController.h"
 
 #import "AccessibilityUIElement.h"
+#import <AppKit/NSColor.h>
 #import <Foundation/Foundation.h>
 #import <WebKit/WebFrame.h>
+#import <WebKit/WebFramePrivate.h>
 #import <WebKit/WebHTMLView.h>
 
 AccessibilityController::AccessibilityController()
@@ -49,14 +51,14 @@ AccessibilityUIElement AccessibilityController::elementAtPoint(int x, int y)
 AccessibilityUIElement AccessibilityController::focusedElement()
 {
     // FIXME: we could do some caching here.
-    id accessibilityObject = [[[mainFrame frameView] documentView] accessibilityFocusedUIElement];
+    id accessibilityObject = [[mainFrame accessibilityRoot] accessibilityFocusedUIElement];
     return AccessibilityUIElement(accessibilityObject);
 }
 
 AccessibilityUIElement AccessibilityController::rootElement()
 {
     // FIXME: we could do some caching here.
-    id accessibilityObject = [[mainFrame frameView] documentView];
+    id accessibilityObject = [mainFrame accessibilityRoot];
     return AccessibilityUIElement(accessibilityObject);
 }
 
diff --git a/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm b/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
index 9170ab6..18ddb85 100644
--- a/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
+++ b/Tools/DumpRenderTree/mac/AccessibilityTextMarkerMac.mm
@@ -28,7 +28,7 @@
 #import "AccessibilityTextMarker.h"
 #import "DumpRenderTree.h"
 
-#pragma mark AccessibilityTextMarker
+// MARK: AccessibilityTextMarker
 
 AccessibilityTextMarker::AccessibilityTextMarker(PlatformTextMarker marker)
     : m_textMarker(marker)
@@ -54,7 +54,7 @@ PlatformTextMarker AccessibilityTextMarker::platformTextMarker() const
     return m_textMarker.get();
 }
 
-#pragma mark AccessibilityTextMarkerRange
+// MARK: AccessibilityTextMarkerRange
 
 AccessibilityTextMarkerRange::AccessibilityTextMarkerRange(PlatformTextMarkerRange markerRange)
     : m_textMarkerRange(markerRange)
diff --git a/Tools/DumpRenderTree/mac/ObjCController.m b/Tools/DumpRenderTree/mac/ObjCController.m
index f1d1c10..ba866f8 100644
--- a/Tools/DumpRenderTree/mac/ObjCController.m
+++ b/Tools/DumpRenderTree/mac/ObjCController.m
@@ -270,8 +270,8 @@ static void* runJavaScriptThread(void* arg)
     return nil;
 }
 
-#pragma mark -
-#pragma mark Testing Objective-C DOM HTML Bindings
+// MARK: -
+// MARK: Testing Objective-C DOM HTML Bindings
 
 - (void)setSelectElement:(WebScriptObject *)element selectedIndex:(int)index allowingMultiple:(BOOL)allowingMultiple
 {