Changeset 54942 in webkit

Timestamp:

Feb 18, 2010 12:17:39 AM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-02-16 Chris Jerdonek <Chris Jerdonek>

Reviewed by Shinichiro Hamaji.

Refactored check-webkit-style's ProcessorOptions class into two
classes. This revision contains no new functionality.

​https://bugs.webkit.org/show_bug.cgi?id=34674

Divided the ProcessorOptions class into a CommandOptionValues
class (the result of parsing the command-line options) and
a StyleCheckerConfiguration class (which configures the main
StyleChecker).

• Scripts/check-webkit-style:
  • Updated main() to convert the parsed command option values to a StyleCheckConfiguration instance prior to constructing a StyleChecker.

• Scripts/webkitpy/style/checker.py:
  • Added check_webkit_style_configuration() to convert a CommandOptionValues instance into a StyleCheckerConfiguration instance.
  • Renamed the ProcessorOptions class to CommandOptionValues.
  • In the CommandOptionValues class--
    • Replaced the filter_configuration attribute with the simpler filter_rules attribute.
    • Removed the max_reports_per_error attribute.
    • Moved the is_reportable() method to the new StyleCheckerConfiguration class.
  • Removed the base_filter_rules attribute from the DefaultCommandOptionValues class.
  • In the ArgumentParser class--
    • Added base_filter_rules to the constructor.
    • Changed the parse() method to return a CommandOptionValues instance instead of a ProcessorOptions instance.
  • Created a StyleCheckerConfiguration class.
    • Added the data attributes max_reports_per_category, stderr_write, and verbosity.
    • Added is_reportable() (moved from the ProcessorOptions class) and write_style_error() (moved from the DefaultStyleErrorHandler class).
  • In the StyleChecker class--
    • Replaced the ProcessorOptions options attribute with the StyleCheckerConfiguration _configuration attribute.
    • Removed the _stderr_write attribute.

• Scripts/webkitpy/style/checker_unittest.py:
  • Updated the existing unit test classes as necessary.
  • Added a StyleCheckerConfigurationTest class.

• Scripts/webkitpy/style/error_handlers.py:
  • Updated the DefaultStyleErrorHandler class to accept a StyleCheckerConfiguration instance instead of a ProcessorOptions instance and an stderr_write method.

• Scripts/webkitpy/style/error_handlers_unittest.py:
  • Updated the unit test classes as necessary.

• Scripts/webkitpy/style/filter.py:
  • Addressed the FIXME in the FilterConfiguration class to change the user_rules attribute to _user_rules (since it is now accessed only internally).

• Scripts/webkitpy/style/filter_unittest.py:
  • Updated to reflect the change from user_rules to _user_rules.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/LayoutTestController.cpp (modified) (2 diffs)
• DumpRenderTree/LayoutTestController.h (modified) (1 diff)
• DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (2 diffs)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (3 diffs)
• DumpRenderTree/win/DumpRenderTree.cpp (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ -65 +65 @@
         * Scripts/webkitpy/style/filter_unittest.py:
           - Updated to reflect the change from user_rules to _user_rules.
+
+2010-02-17  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Share the DRT values maxViewWidth/Height among ports
+        https://bugs.webkit.org/show_bug.cgi?id=34474
+
+        * DumpRenderTree/LayoutTestController.cpp:
+        (pageNumberForElementByIdCallback):
+        * DumpRenderTree/LayoutTestController.h:
+        (LayoutTestController::maxViewWidth):
+        (LayoutTestController::maxViewHeight):
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (runTest):
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (createWebViewAndOffscreenWindow):
+        (sizeWebViewForCurrentTest):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (dump):
+        (createWebViewAndOffscreenWindow):
 
 2010-02-17  Shinichiro Hamaji  <hamaji@chromium.org>

trunk/WebKitTools/DumpRenderTree/LayoutTestController.cpp

@@ -468 +468 @@
 static bool parsePageParameters(JSContextRef context, int argumentCount, const JSValueRef* arguments, JSValueRef* exception, float& pageWidthInPixels, float& pageHeightInPixels)
 {
-    // FIXME: These values should sync with maxViewWidth/Height in
-    //        DumpRenderTree.mm. Factor these values out to somewhere.
-    pageWidthInPixels = 800;
-    pageHeightInPixels = 600;
+    pageWidthInPixels = LayoutTestController::maxViewWidth;
+    pageHeightInPixels = LayoutTestController::maxViewHeight;
     switch (argumentCount) {
     case 2:
@@ -1506 +1504 @@
     setlocale(LC_ALL, localeBuf);
 }
+
+const unsigned LayoutTestController::maxViewWidth = 800;
+const unsigned LayoutTestController::maxViewHeight = 600;

trunk/WebKitTools/DumpRenderTree/LayoutTestController.h

@@ -235 +235 @@
     void setPOSIXLocale(JSStringRef locale);
 
+    static const unsigned maxViewWidth;
+    static const unsigned maxViewHeight;
+
 private:
     bool m_dumpAsPDF;

trunk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -95 +95 @@
 static WebKitWebHistoryItem* prevTestBFItem = NULL;
 
-const unsigned maxViewHeight = 600;
-const unsigned maxViewWidth = 800;
 const unsigned historyItemIndent = 8;
 
@@ -480 +478 @@
     GtkAllocation size;
     size.x = size.y = 0;
-    size.width = isSVGW3CTest ? 480 : maxViewWidth;
-    size.height = isSVGW3CTest ? 360 : maxViewHeight;
+    size.width = isSVGW3CTest ? 480 : LayoutTestController::maxViewWidth;
+    size.height = isSVGW3CTest ? 360 : LayoutTestController::maxViewHeight;
     gtk_window_resize(GTK_WINDOW(window), size.width, size.height);
     gtk_widget_size_allocate(container, &size);

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -135 +135 @@
 static WebHistoryItem *prevTestBFItem = nil;  // current b/f item at the end of the previous test
 
-const unsigned maxViewHeight = 600;
-const unsigned maxViewWidth = 800;
-
 #if __OBJC2__
 static void swizzleAllMethods(Class imposter, Class original)
@@ -280 +277 @@
 WebView *createWebViewAndOffscreenWindow()
 {
-    NSRect rect = NSMakeRect(0, 0, maxViewWidth, maxViewHeight);
+    NSRect rect = NSMakeRect(0, 0, LayoutTestController::maxViewWidth, LayoutTestController::maxViewHeight);
     WebView *webView = [[WebView alloc] initWithFrame:rect frameName:nil groupName:@"org.webkit.DumpRenderTree"];
         
@@ -1022 +1019 @@
         [[mainFrame webView] setFrameSize:NSMakeSize(480, 360)];
     else
-        [[mainFrame webView] setFrameSize:NSMakeSize(maxViewWidth, maxViewHeight)];
+        [[mainFrame webView] setFrameSize:NSMakeSize(LayoutTestController::maxViewWidth, LayoutTestController::maxViewHeight)];
 }
 

trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -107 +107 @@
 
 UINT_PTR waitToDumpWatchdog = 0;
-
-const unsigned maxViewWidth = 800;
-const unsigned maxViewHeight = 600;
 
 void setPersistentUserStyleSheetLocation(CFStringRef url)
@@ -668 +665 @@
                 height = 360;
             } else {
-                width = maxViewWidth;
-                height = maxViewHeight;
+                width = LayoutTestController::maxViewWidth;
+                height = LayoutTestController::maxViewHeight;
             }
 
@@ -1099 +1096 @@
 IWebView* createWebViewAndOffscreenWindow(HWND* webViewWindow)
 {
+    unsigned maxViewWidth = LayoutTestController::maxViewWidth;
+    unsigned maxViewHeight = LayoutTestController::maxViewHeight;
     HWND hostWindow = CreateWindowEx(WS_EX_TOOLWINDOW, kDumpRenderTreeClassName, TEXT("DumpRenderTree"), WS_POPUP,
       -maxViewWidth, -maxViewHeight, maxViewWidth, maxViewHeight, 0, 0, GetModuleHandle(0), 0);