Skip to content

Commit 86e67f1

Browse files
Minor cleanup in TestInvocation
https://bugs.webkit.org/show_bug.cgi?id=103512 Patch by Yael Aharon <[email protected]> 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: http://svn.webkit.org/repository/webkit/trunk@136004 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 91451b1 commit 86e67f1

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

Tools/ChangeLog

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
2012-11-28 Yael Aharon <[email protected]>
2+
3+
Minor cleanup in TestInvocation
4+
https://bugs.webkit.org/show_bug.cgi?id=103512
5+
6+
Reviewed by Kenneth Rohde Christiansen.
7+
8+
Remove a function declaration that is not defined and not used.
9+
Fix spelling error in m_webProcessIsUnresponsive.
10+
11+
* WebKitTestRunner/TestInvocation.cpp:
12+
(WTR::TestInvocation::TestInvocation):
13+
(WTR::TestInvocation::invoke):
14+
* WebKitTestRunner/TestInvocation.h:
15+
(TestInvocation):
16+
* WebKitTestRunner/cairo/TestInvocationCairo.cpp:
17+
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
18+
* WebKitTestRunner/qt/TestInvocationQt.cpp:
19+
(WTR::TestInvocation::dumpPixelsAndCompareWithExpected):
20+
121
2012-11-28 Thiago Marcos P. Santos <[email protected]>
222

323
Unreviewed. Use my personal email as bugzilla email.

Tools/WebKitTestRunner/TestInvocation.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ TestInvocation::TestInvocation(const std::string& pathOrURL)
105105
, m_gotFinalMessage(false)
106106
, m_gotRepaint(false)
107107
, m_error(false)
108-
, m_webProcessIsUnrensponsive(false)
108+
, m_webProcessIsUnresponsive(false)
109109
{
110110
}
111111

@@ -213,7 +213,7 @@ void TestInvocation::invoke()
213213
TestController::shared().runUntil(m_gotInitialResponse, TestController::ShortTimeout);
214214
if (!m_gotInitialResponse) {
215215
m_errorMessage = "Timed out waiting for initial response from web process\n";
216-
m_webProcessIsUnrensponsive = true;
216+
m_webProcessIsUnresponsive = true;
217217
goto end;
218218
}
219219
if (m_error)
@@ -229,7 +229,7 @@ void TestInvocation::invoke()
229229
TestController::shared().runUntil(m_gotFinalMessage, TestController::shared().useWaitToDumpWatchdogTimer() ? TestController::LongTimeout : TestController::NoTimeout);
230230
if (!m_gotFinalMessage) {
231231
m_errorMessage = "Timed out waiting for final message from web process\n";
232-
m_webProcessIsUnrensponsive = true;
232+
m_webProcessIsUnresponsive = true;
233233
goto end;
234234
}
235235
if (m_error)
@@ -243,7 +243,7 @@ void TestInvocation::invoke()
243243
WKInspectorClose(WKPageGetInspector(TestController::shared().mainWebView()->page()));
244244
#endif // ENABLE(INSPECTOR)
245245

246-
if (m_webProcessIsUnrensponsive)
246+
if (m_webProcessIsUnresponsive)
247247
dumpWebProcessUnresponsiveness();
248248
else if (!TestController::shared().resetStateToConsistentValues()) {
249249
m_errorMessage = "Timed out loading about:blank before the next test";

Tools/WebKitTestRunner/TestInvocation.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class TestInvocation {
5353

5454
#if PLATFORM(QT) || PLATFORM(EFL)
5555
static void forceRepaintDoneCallback(WKErrorRef, void* context);
56-
void forceRepaintDone();
5756
#endif
5857

5958
WKRetainPtr<WKURLRef> m_url;
@@ -72,7 +71,7 @@ class TestInvocation {
7271
WKRetainPtr<WKImageRef> m_pixelResult;
7372
WKRetainPtr<WKArrayRef> m_repaintRects;
7473
std::string m_errorMessage;
75-
bool m_webProcessIsUnrensponsive;
74+
bool m_webProcessIsUnresponsive;
7675

7776
};
7877

Tools/WebKitTestRunner/cairo/TestInvocationCairo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef wkImage, WKArra
129129
if (!m_gotRepaint) {
130130
m_error = true;
131131
m_errorMessage = "Timed out waiting for repaint\n";
132-
m_webProcessIsUnrensponsive = true;
132+
m_webProcessIsUnresponsive = true;
133133
return;
134134
}
135135

Tools/WebKitTestRunner/qt/TestInvocationQt.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void TestInvocation::dumpPixelsAndCompareWithExpected(WKImageRef imageRef, WKArr
8585
else {
8686
m_error = true;
8787
m_errorMessage = "Timed out waiting for repaint\n";
88-
m_webProcessIsUnrensponsive = true;
88+
m_webProcessIsUnresponsive = true;
8989
return;
9090
}
9191
} else

0 commit comments

Comments
 (0)