diff options
Diffstat (limited to 'WebKitTools/DumpRenderTree/mac')
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm | 3 | ||||
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm index 51ea004..ce02081 100644 --- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm +++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm @@ -137,6 +137,7 @@ static int threaded; static int dumpTree = YES; static int forceComplexText; static int useHTML5Parser = YES; +static int useHTML5TreeBuilder = NO; // Temporary, will be removed. static BOOL printSeparators; static RetainPtr<CFStringRef> persistentUserStyleSheetLocation; @@ -456,6 +457,7 @@ static void resetDefaultsToConsistentValues() [preferences setAcceleratedCompositingEnabled:YES]; [preferences setWebGLEnabled:NO]; [preferences setHTML5ParserEnabled:useHTML5Parser]; + [preferences setHTML5TreeBuilderEnabled:useHTML5TreeBuilder]; // Temporary, will be removed. [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain]; @@ -563,6 +565,7 @@ static void initializeGlobalsFromCommandLineOptions(int argc, const char *argv[] {"threaded", no_argument, &threaded, YES}, {"complex-text", no_argument, &forceComplexText, YES}, {"legacy-parser", no_argument, &useHTML5Parser, NO}, + {"html5-treebuilder", no_argument, &useHTML5TreeBuilder, YES}, {NULL, 0, NULL, 0} }; diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm index d0599e0..9b044c3 100644 --- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm +++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm @@ -223,15 +223,9 @@ bool LayoutTestController::isPageBoxVisible(int pageNumber) const return [mainFrame isPageBoxVisible:pageNumber]; } -JSRetainPtr<JSStringRef> LayoutTestController::pageAreaRectInPixels(int pageNumber) const +JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) const { - JSRetainPtr<JSStringRef> propertyValue(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame pageAreaRectInPixels:pageNumber])); - return propertyValue; -} - -JSRetainPtr<JSStringRef> LayoutTestController::preferredPageSizeInPixels(int pageNumber) const -{ - JSRetainPtr<JSStringRef> propertyValue(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame preferredPageSizeInPixels:pageNumber])); + JSRetainPtr<JSStringRef> propertyValue(Adopt, JSStringCreateWithCFString((CFStringRef)[mainFrame pageSizeAndMarginsInPixels:pageNumber:width:height:marginTop:marginRight:marginBottom:marginLeft])); return propertyValue; } |