Minor cleanup in TestInvocation
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Nov 2012 14:12:30 +0000 (14:12 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 28 Nov 2012 14:12:30 +0000 (14:12 +0000)
https://bugs.webkit.org/show_bug.cgi?id=103512

Patch by Yael Aharon <yael.aharon@intel.com> on 2012-11-28
Reviewed by Kenneth Rohde Christiansen.

Remove a function declaration that is not defined and not used.
Fix spelling error in m_webProcessIsUnresponsive.

* WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::TestInvocation):
(WTR::TestInvocation::invoke):
* WebKitTestRunner/TestInvocation.h:
(TestInvocation):
* WebKitTestRunner/cairo/TestInvocationCairo.cpp:
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
* WebKitTestRunner/qt/TestInvocationQt.cpp:
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136004 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/WebKitTestRunner/TestInvocation.cpp
Tools/WebKitTestRunner/TestInvocation.h
Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp
Tools/WebKitTestRunner/qt/TestInvocationQt.cpp

index c949cdc..0e19de1 100644 (file)
@@ -1,3 +1,23 @@
+2012-11-28  Yael Aharon  <yael.aharon@intel.com>
+
+        Minor cleanup in TestInvocation
+        https://bugs.webkit.org/show_bug.cgi?id=103512
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Remove a function declaration that is not defined and not used.
+        Fix spelling error in m_webProcessIsUnresponsive.
+
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::TestInvocation):
+        (WTR::TestInvocation::invoke):
+        * WebKitTestRunner/TestInvocation.h:
+        (TestInvocation):
+        * WebKitTestRunner/cairo/TestInvocationCairo.cpp:
+        (WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
+        * WebKitTestRunner/qt/TestInvocationQt.cpp:
+        (WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
+
 2012-11-28  Thiago Marcos P. Santos  <thiago.santos@intel.com>
 
         Unreviewed. Use my personal email as bugzilla email.
index bad24fa..8f66cc0 100644 (file)
@@ -105,7 +105,7 @@ TestInvocation::TestInvocation(const std::string& pathOrURL)
     , m_gotFinalMessage(false)
     , m_gotRepaint(false)
     , m_error(false)
-    , m_webProcessIsUnrensponsive(false)
+    , m_webProcessIsUnresponsive(false)
 {
 }
 
@@ -213,7 +213,7 @@ void TestInvocation::invoke()
     TestController::shared().runUntil(m_gotInitialResponse, TestController::ShortTimeout);
     if (!m_gotInitialResponse) {
         m_errorMessage = "Timed out waiting for initial response from web process\n";
-        m_webProcessIsUnrensponsive = true;
+        m_webProcessIsUnresponsive = true;
         goto end;
     }
     if (m_error)
@@ -229,7 +229,7 @@ void TestInvocation::invoke()
     TestController::shared().runUntil(m_gotFinalMessage, TestController::shared().useWaitToDumpWatchdogTimer() ? TestController::LongTimeout : TestController::NoTimeout);
     if (!m_gotFinalMessage) {
         m_errorMessage = "Timed out waiting for final message from web process\n";
-        m_webProcessIsUnrensponsive = true;
+        m_webProcessIsUnresponsive = true;
         goto end;
     }
     if (m_error)
@@ -243,7 +243,7 @@ end:
         WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
 #endif // ENABLE(INSPECTOR)
 
-    if (m_webProcessIsUnrensponsive)
+    if (m_webProcessIsUnresponsive)
         dumpWebProcessUnresponsiveness();
     else if (!TestController::shared().resetStateToConsistentValues()) {
         m_errorMessage = "Timed out loading about:blank before the next test";
index 8f6a8b3..e49d9fd 100644 (file)
@@ -53,7 +53,6 @@ private:
 
 #if PLATFORM(QT) || PLATFORM(EFL)
     static void forceRepaintDoneCallback(WKErrorRef, void* context);
-    void forceRepaintDone();
 #endif
     
     WKRetainPtr<WKURLRef> m_url;
@@ -72,7 +71,7 @@ private:
     WKRetainPtr<WKImageRef> m_pixelResult;
     WKRetainPtr<WKArrayRef> m_repaintRects;
     std::string m_errorMessage;
-    bool m_webProcessIsUnrensponsive;
+    bool m_webProcessIsUnresponsive;
 
 };
 
index 0a1161b..eb3a0d3 100644 (file)
@@ -129,7 +129,7 @@ void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef wkImage, WKArra
     if (!m_gotRepaint) {
         m_error = true;
         m_errorMessage = "Timed out waiting for repaint\n";
-        m_webProcessIsUnrensponsive = true;
+        m_webProcessIsUnresponsive = true;
         return;
     }
 
index 682a637..99d5d0e 100644 (file)
@@ -85,7 +85,7 @@ void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef imageRef, WKArr
         else {
             m_error = true;
             m_errorMessage = "Timed out waiting for repaint\n";
-            m_webProcessIsUnrensponsive = true;
+            m_webProcessIsUnresponsive = true;
             return;
         }
     } else