Changeset 66834 in webkit

Timestamp:

Sep 6, 2010 9:14:36 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-09-06 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] Small code cleanup in DumpRenderTreeGtk.cpp
​https://bugs.webkit.org/show_bug.cgi?id=45213

• DumpRenderTree/gtk/DumpRenderTree.cpp: (initializeFonts): Made this function do nothing for non-X11 platforms, so we don't have to surround the invocation with #ifdefs. (useLongRunningServerMode): Added. (runTestingServerLoop): Added. (initializeGlobalsFromCommandLineOptions): Added. (runTest): Removed ifdefs. (main): Use new helper functions.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (7 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-09-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Small code cleanup in DumpRenderTreeGtk.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=45213
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (initializeFonts): Made this function do nothing for non-X11 platforms, so we don't
+        have to surround the invocation with #ifdefs.
+        (useLongRunningServerMode): Added.
+        (runTestingServerLoop): Added.
+        (initializeGlobalsFromCommandLineOptions): Added.
+        (runTest): Removed ifdefs.
+        (main): Use new helper functions.
+
 2010-09-06  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -97 +97 @@
 const unsigned historyItemIndent = 8;
 
+static void runTest(const string& testPathOrURL);
+
 static bool shouldLogFrameLoadDelegates(const string& pathOrURL)
 {
@@ -129 +131 @@
 }
 
+static void initializeFonts()
+{
 #if PLATFORM(X11)
-static void initializeFonts()
-{
     static int numFonts = -1;
+
+    FcInit();
 
     // Some tests may add or remove fonts via the @font-face rule.
@@ -161 +165 @@
     appFontSet = FcConfigGetFonts(config, FcSetApplication);
     numFonts = appFontSet->nfont;
-}
 #endif
+}
 
 static gchar* dumpFramesAsText(WebKitWebFrame* frame)
@@ -358 +362 @@
 }
 
+static bool useLongRunningServerMode(int argc, char *argv[])
+{
+    // This assumes you've already called getopt_long
+    return (argc == optind+1 && !strcmp(argv[optind], "-"));
+}
+
+static void runTestingServerLoop()
+{
+    // When DumpRenderTree runs in server mode, we just wait around for file names
+    // to be passed to us and read each in turn, passing the results back to the client
+    char filenameBuffer[2048];
+    while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
+        char* newLineCharacter = strchr(filenameBuffer, '\n');
+        if (newLineCharacter)
+            *newLineCharacter = '\0';
+
+        if (!strlen(filenameBuffer))
+            continue;
+
+        runTest(filenameBuffer);
+    }
+}
+
+static void initializeGlobalsFromCommandLineOptions(int argc, char *argv[])
+{
+    struct option options[] = {
+        {"notree", no_argument, &dumpTree, false},
+        {"pixel-tests", no_argument, &dumpPixels, true},
+        {"tree", no_argument, &dumpTree, true},
+        {NULL, 0, NULL, 0}
+    };
+    
+    int option;
+    while ((option = getopt_long(argc, (char * const *)argv, "", options, NULL)) != -1) {
+        switch (option) {
+        case '?': // unknown or ambiguous option
+        case ':': // missing argument
+            exit(1);
+            break;
+        }
+    }
+}
+
+
 void dump()
 {
@@ -517 +565 @@
         g_object_ref(prevTestBFItem);
 
-#if PLATFORM(X11)
     initializeFonts();
-#endif
 
     // Focus the web view before loading the test to avoid focusing problems
@@ -942 +988 @@
     g_log_set_default_handler(logHandler, 0);
 
-#if PLATFORM(X11)
-    FcInit();
+    initializeGlobalsFromCommandLineOptions(argc, argv);
     initializeFonts();
-#endif
-
-    struct option options[] = {
-        {"notree", no_argument, &dumpTree, false},
-        {"pixel-tests", no_argument, &dumpPixels, true},
-        {"tree", no_argument, &dumpTree, true},
-        {NULL, 0, NULL, 0}
-    };
-
-    int option;
-    while ((option = getopt_long(argc, (char* const*)argv, "", options, NULL)) != -1)
-        switch (option) {
-            case '?':   // unknown or ambiguous option
-            case ':':   // missing argument
-                exit(1);
-                break;
-        }
 
     window = gtk_window_new(GTK_WINDOW_POPUP);
@@ -981 +1009 @@
     axController = new AccessibilityController();
 
-    if (argc == optind+1 && strcmp(argv[optind], "-") == 0) {
-        char filenameBuffer[2048];
+    if (useLongRunningServerMode(argc, argv)) {
         printSeparators = true;
-        while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
-            char* newLineCharacter = strchr(filenameBuffer, '\n');
-            if (newLineCharacter)
-                *newLineCharacter = '\0';
-
-            if (strlen(filenameBuffer) == 0)
-                continue;
-
-            runTest(filenameBuffer);
-        }
+        runTestingServerLoop();
     } else {
         printSeparators = (optind < argc-1 || (dumpPixels && dumpTree));