Changeset 139850 in webkit
- Timestamp:
- Jan 16, 2013 1:42:33 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r139841 r139850 1 2013-01-16 Jochen Eisinger <jochen@chromium.org> 2 3 [chromium] add title text direction attribute to TestRunner 4 https://bugs.webkit.org/show_bug.cgi?id=106907 5 6 Reviewed by Adam Barth. 7 8 * DumpRenderTree/chromium/DRTTestRunner.cpp: 9 (DRTTestRunner::DRTTestRunner): 10 (DRTTestRunner::reset): 11 * DumpRenderTree/chromium/DRTTestRunner.h: 12 * DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h: 13 (WebTestRunner::WebTestRunner::setTitleTextDirection): 14 * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp: 15 (WebTestRunner::TestRunner::TestRunner): 16 (WebTestRunner::TestRunner::reset): 17 (WebTestRunner::TestRunner::setTitleTextDirection): 18 (WebTestRunner): 19 * DumpRenderTree/chromium/TestRunner/src/TestRunner.h: 20 (TestRunner): 21 * DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp: 22 (WebTestRunner::WebTestProxyBase::didReceiveTitle): 23 * DumpRenderTree/chromium/WebViewHost.cpp: 24 (WebViewHost::didReceiveTitle): 25 1 26 2013-01-16 Jussi Kukkonen <jussi.kukkonen@intel.com> 2 27 -
trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp
r139821 r139850 153 153 // webHistoryItemCount is used by tests in LayoutTests\http\tests\history 154 154 bindProperty("webHistoryItemCount", &m_webHistoryItemCount); 155 bindProperty("titleTextDirection", &m_titleTextDirection);156 155 bindProperty("interceptPostMessage", &m_interceptPostMessage); 157 156 } … … 395 394 m_waitUntilDone = false; 396 395 m_webHistoryItemCount.set(0); 397 m_titleTextDirection.set("ltr");398 396 m_interceptPostMessage.set(false); 399 397 -
trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h
r139821 r139850 45 45 #include "TestRunner/src/TestRunner.h" 46 46 #include "WebTask.h" 47 #include "WebTextDirection.h"48 47 #include "platform/WebArrayBufferView.h" 49 48 #include "platform/WebString.h" … … 174 173 175 174 void setShowDebugLayerTree(bool value) { m_showDebugLayerTree = value; } 176 void setTitleTextDirection(WebKit::WebTextDirection dir)177 {178 m_titleTextDirection.set(dir == WebKit::WebTextDirectionLeftToRight ? "ltr" : "rtl");179 }180 175 181 176 bool shouldInterceptPostMessage() … … 269 264 CppVariant m_webHistoryItemCount; 270 265 271 // Bound variable tracking the directionality of the <title> tag.272 CppVariant m_titleTextDirection;273 274 266 // Bound variable to set whether postMessages should be intercepted or not 275 267 CppVariant m_interceptPostMessage; -
trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h
r139795 r139850 31 31 #ifndef WebTestRunner_h 32 32 #define WebTestRunner_h 33 34 #include "WebKit/chromium/public/WebTextDirection.h" 33 35 34 36 namespace WebKit { … … 73 75 virtual bool isPrinting() const { return false; } 74 76 virtual bool shouldStayOnPageAfterHandlingBeforeUnload() const { return false; } 77 virtual void setTitleTextDirection(WebKit::WebTextDirection) { } 75 78 }; 76 79 -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp
r139821 r139850 185 185 bindProperty("workerThreadCount", &TestRunner::workerThreadCount); 186 186 bindProperty("globalFlag", &m_globalFlag); 187 bindProperty("titleTextDirection", &m_titleTextDirection); 187 188 bindProperty("platformName", &m_platformName); 188 189 … … 276 277 277 278 m_globalFlag.set(false); 279 m_titleTextDirection.set("ltr"); 278 280 m_platformName.set("chromium"); 279 281 … … 431 433 { 432 434 return m_shouldStayOnPageAfterHandlingBeforeUnload; 435 } 436 437 void TestRunner::setTitleTextDirection(WebKit::WebTextDirection dir) 438 { 439 m_titleTextDirection.set(dir == WebKit::WebTextDirectionLeftToRight ? "ltr" : "rtl"); 433 440 } 434 441 -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h
r139821 r139850 91 91 virtual bool isPrinting() const OVERRIDE; 92 92 virtual bool shouldStayOnPageAfterHandlingBeforeUnload() const OVERRIDE; 93 virtual void setTitleTextDirection(WebKit::WebTextDirection) OVERRIDE; 93 94 94 95 protected: … … 371 372 CppVariant m_platformName; 372 373 374 // Bound variable tracking the directionality of the <title> tag. 375 CppVariant m_titleTextDirection; 376 373 377 // If true, the test_shell will write a descriptive line for each editing 374 378 // command. -
trunk/Tools/DumpRenderTree/chromium/TestRunner/src/WebTestProxy.cpp
r139795 r139850 581 581 } 582 582 583 void WebTestProxyBase::didReceiveTitle(WebFrame* frame, const WebString& title, WebTextDirection )583 void WebTestProxyBase::didReceiveTitle(WebFrame* frame, const WebString& title, WebTextDirection direction) 584 584 { 585 585 WebCString title8 = title.utf8(); … … 593 593 m_delegate->printMessage(string("TITLE CHANGED: '") + title8.data() + "'\n"); 594 594 595 if (m_testInterfaces->testRunner()) 596 m_testInterfaces->testRunner()->setTitleTextDirection(direction); 595 597 } 596 598 -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp
r139821 r139850 855 855 { 856 856 setPageTitle(title); 857 testRunner()->setTitleTextDirection(direction);858 857 } 859 858
Note: See TracChangeset
for help on using the changeset viewer.