Title: [151047] trunk/Tools
- Revision
- 151047
- Author
- [email protected]
- Date
- 2013-05-31 15:14:28 -0700 (Fri, 31 May 2013)
Log Message
[Windows] Use WinLauncher to display LayoutTest results
https://bugs.webkit.org/show_bug.cgi?id=117085
Reviewed by Oliver Hunt.
* Scripts/webkitdirs.pm:
(runSafari): Use WinLauncher to display content
* WinLauncher/WinLauncher.cpp:
(dllLauncherEntryPoint): Check for URL argument.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151046 => 151047)
--- trunk/Tools/ChangeLog 2013-05-31 22:13:45 UTC (rev 151046)
+++ trunk/Tools/ChangeLog 2013-05-31 22:14:28 UTC (rev 151047)
@@ -1,3 +1,15 @@
+2013-05-31 Brent Fulgham <[email protected]>
+
+ [Windows] Use WinLauncher to display LayoutTest results
+ https://bugs.webkit.org/show_bug.cgi?id=117085
+
+ Reviewed by Oliver Hunt.
+
+ * Scripts/webkitdirs.pm:
+ (runSafari): Use WinLauncher to display content
+ * WinLauncher/WinLauncher.cpp:
+ (dllLauncherEntryPoint): Check for URL argument.
+
2013-05-31 Roger Fong <[email protected]>
Unreviewed. Modify AssembleBuildLogs project to WebKit solution in preparation for moving buildbots to VCExpress 2010.
Modified: trunk/Tools/Scripts/webkitdirs.pm (151046 => 151047)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-05-31 22:13:45 UTC (rev 151046)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-05-31 22:14:28 UTC (rev 151047)
@@ -2552,7 +2552,7 @@
if (isAppleWinWebKit()) {
my $result;
my $productDir = productDir();
- my $webKitLauncherPath = File::Spec->catfile(productDir(), "WebKit.exe");
+ my $webKitLauncherPath = File::Spec->catfile(productDir(), "WinLauncher.exe");
return system { $webKitLauncherPath } $webKitLauncherPath, @ARGV;
}
Modified: trunk/Tools/WinLauncher/WinLauncher.cpp (151046 => 151047)
--- trunk/Tools/WinLauncher/WinLauncher.cpp 2013-05-31 22:13:45 UTC (rev 151046)
+++ trunk/Tools/WinLauncher/WinLauncher.cpp 2013-05-31 22:14:28 UTC (rev 151047)
@@ -274,6 +274,7 @@
InitCtrlEx.dwICC = 0x00004000; //ICC_STANDARD_CLASSES;
InitCommonControlsEx(&InitCtrlEx);
+ BSTR requestedURL = 0;
int argc = 0;
WCHAR** argv = CommandLineToArgvW(GetCommandLineW(), &argc);
for (int i = 1; i < argc; ++i) {
@@ -281,6 +282,8 @@
s_usesLayeredWebView = true;
else if (!wcsicmp(argv[i], L"--desktop"))
s_fullDesktop = true;
+ else if (!requestedURL)
+ requestedURL = ::SysAllocString(argv[i]);
}
// Initialize global strings
@@ -369,14 +372,16 @@
if (FAILED(hr))
goto exit;
- IWebFrame* frame;
- hr = gWebView->mainFrame(&frame);
- if (FAILED(hr))
- goto exit;
+ if (!requestedURL) {
+ IWebFrame* frame;
+ hr = gWebView->mainFrame(&frame);
+ if (FAILED(hr))
+ goto exit;
- static BSTR defaultHTML = SysAllocString(TEXT("<p style=\"background-color: #00FF00\">Testing</p><img id=\"webkit logo\" src="" alt=\"Face\"><div style=\"border: solid blue; background: white;\" contenteditable=\"true\">div with blue border</div><ul><li>foo<li>bar<li>baz</ul>"));
- frame->loadHTMLString(defaultHTML, 0);
- frame->Release();
+ static BSTR defaultHTML = SysAllocString(TEXT("<p style=\"background-color: #00FF00\">Testing</p><img id=\"webkit logo\" src="" alt=\"Face\"><div style=\"border: solid blue; background: white;\" contenteditable=\"true\">div with blue border</div><ul><li>foo<li>bar<li>baz</ul>"));
+ frame->loadHTMLString(defaultHTML, 0);
+ frame->Release();
+ }
hr = gWebViewPrivate->setTransparent(usesLayeredWebView());
if (FAILED(hr))
@@ -400,6 +405,12 @@
hAccelTable = LoadAccelerators(hInst, MAKEINTRESOURCE(IDC_WINLAUNCHER));
+ if (requestedURL) {
+ loadURL(requestedURL);
+ ::SysFreeString(requestedURL);
+ requestedURL = 0;
+ }
+
// Main message loop:
while (GetMessage(&msg, NULL, 0, 0)) {
if (!TranslateAccelerator(msg.hwnd, hAccelTable, &msg)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
