2 files changed, 15 insertions, 5 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index 6572a8e..8fd5298 100644
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -135,6 +135,7 @@ static int dumpPixels;
 static int threaded;
 static int dumpTree = YES;
 static int forceComplexText;
+static int useHTML5Parser;
 static BOOL printSeparators;
 static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
 
@@ -440,6 +441,7 @@ static void resetDefaultsToConsistentValues()
     [preferences setDeveloperExtrasEnabled:NO];
     [preferences setLoadsImagesAutomatically:YES];
     [preferences setFrameFlatteningEnabled:NO];
+    [preferences setEditingBehavior:WebKitEditingMacBehavior];
     if (persistentUserStyleSheetLocation) {
         [preferences setUserStyleSheetLocation:[NSURL URLWithString:(NSString *)(persistentUserStyleSheetLocation.get())]];
         [preferences setUserStyleSheetEnabled:YES];
@@ -451,6 +453,7 @@ static void resetDefaultsToConsistentValues()
     [preferences setUsesPageCache:NO];
     [preferences setAcceleratedCompositingEnabled:YES];
     [preferences setWebGLEnabled:NO];
+    [preferences setHTML5ParserEnabled:useHTML5Parser];
 
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
 
@@ -557,6 +560,7 @@ static void initializeGlobalsFromCommandLineOptions(int argc, const char *argv[]
         {"tree", no_argument, &dumpTree, YES},
         {"threaded", no_argument, &threaded, YES},
         {"complex-text", no_argument, &forceComplexText, YES},
+        {"html5-parser", no_argument, &useHTML5Parser, YES},
         {NULL, 0, NULL, 0}
     };
     
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index 44aea81..898235b 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -66,10 +66,6 @@
 #import <wtf/HashMap.h>
 #import <wtf/RetainPtr.h>
 
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#include <Foundation/NSPrivateDecls.h>
-#endif
-
 @interface CommandValidationTarget : NSObject <NSValidatedUserInterfaceItem>
 {
     SEL _action;
@@ -762,7 +758,7 @@ void LayoutTestController::setWebViewEditable(bool editable)
 #ifndef BUILDING_ON_TIGER
 static NSString *SynchronousLoaderRunLoopMode = @"DumpRenderTreeSynchronousLoaderRunLoopMode";
 
-#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) || !defined(__COCOA_FORMAL_PROTOCOLS_2__)
+#if defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD)
 @protocol NSURLConnectionDelegate <NSObject>
 @end
 #endif
@@ -849,3 +845,13 @@ void LayoutTestController::authenticateSession(JSStringRef url, JSStringRef user
     [SynchronousLoader makeRequest:request withUsername:(NSString *)usernameCF.get() password:(NSString *)passwordCF.get()];
 #endif
 }
+
+void LayoutTestController::setEditingBehavior(const char* editingBehavior)
+{
+    NSString* editingBehaviorNS = [[NSString alloc] initWithUTF8String:editingBehavior];
+    if ([editingBehaviorNS isEqualToString:@"mac"])
+        [[WebPreferences standardPreferences] setEditingBehavior:WebKitEditingMacBehavior];
+    if ([editingBehaviorNS isEqualToString:@"win"])
+        [[WebPreferences standardPreferences] setEditingBehavior:WebKitEditingWinBehavior];
+    [editingBehaviorNS release];
+}