WebKit Bugzilla
Attachment 350144 Details for
Bug 189679
: [Win] TestRunner::queueLoad() fails to generate correct url for some urls.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
PATCH
189679.diff (text/plain), 3.71 KB, created by
Basuke Suzuki
on 2018-09-19 13:10:56 PDT
(
hide
)
Description:
PATCH
Filename:
MIME Type:
Creator:
Basuke Suzuki
Created:
2018-09-19 13:10:56 PDT
Size:
3.71 KB
patch
obsolete
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 5f448c0b705..b443ee78759 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,12 @@ >+2018-09-19 Basuke Suzuki <Basuke.Suzuki@sony.com> >+ >+ [Win] TestRunner::queueLoad() fails to generate correct url for some urls. >+ https://bugs.webkit.org/show_bug.cgi?id=189679 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * platform/wincairo/TestExpectations: >+ > 2018-09-19 Ms2ger <Ms2ger@igalia.com> > > [GTK] Unreviewed test gardening >diff --git a/LayoutTests/platform/wincairo/TestExpectations b/LayoutTests/platform/wincairo/TestExpectations >index 68f624082e1..10e8634848d 100644 >--- a/LayoutTests/platform/wincairo/TestExpectations >+++ b/LayoutTests/platform/wincairo/TestExpectations >@@ -944,7 +944,6 @@ http/tests/xmlhttprequest/access-control-preflight-credential-sync.html [ Pass F > http/tests/xmlhttprequest/access-control-preflight-not-successful.html [ Failure ] > http/tests/xmlhttprequest/auth-reject-protection-space.html [ Failure ] > http/tests/xmlhttprequest/basic-auth-nopassword.html [ Failure ] >-http/tests/xmlhttprequest/basic-auth-nouser.html [ Failure ] > http/tests/xmlhttprequest/cache-override.html [ Pass Failure ] > http/tests/xmlhttprequest/cookies.html [ Pass Failure ] > http/tests/xmlhttprequest/cross-origin-authorization-with-embedder.html [ Failure ] >@@ -1489,8 +1488,6 @@ webkit.org/b/182128 fast/dom/navigator-detached-no-crash.html [ Pass Failure ] > fast/dom/Window/slow-unload-handler.html [ Skip ] > fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html [ Failure ] > >-webkit.org/b/42435 fast/dom/navigation-type-back-forward.html [ Failure ] >- > fast/dom/HTMLAnchorElement/anchor-file-blob-convert-to-download-async-delegate.html [ Skip ] > > # TODO HIDDEN_PAGE_DOM_TIMER_THROTTLING is disabled >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index d424f6e6c51..0f3dd631fb7 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,15 @@ >+2018-09-19 Basuke Suzuki <Basuke.Suzuki@sony.com> >+ >+ [Win] TestRunner::queueLoad() fails to generate correct url for some urls. >+ https://bugs.webkit.org/show_bug.cgi?id=189679 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Replace the implementation with correct API call. >+ >+ * DumpRenderTree/win/TestRunnerWin.cpp: >+ (TestRunner::queueLoad): Call UrlCombineW. >+ > 2018-09-19 Michael Catanzaro <mcatanzaro@igalia.com> > > [WPE][GTK] Unreviewed, fix that typo in more places >diff --git a/Tools/DumpRenderTree/win/TestRunnerWin.cpp b/Tools/DumpRenderTree/win/TestRunnerWin.cpp >index b0fbe3cf38e..c99ef7bcc7a 100644 >--- a/Tools/DumpRenderTree/win/TestRunnerWin.cpp >+++ b/Tools/DumpRenderTree/win/TestRunnerWin.cpp >@@ -339,15 +339,18 @@ void TestRunner::queueLoad(JSStringRef url, JSStringRef target) > return; > wstring responseURL(responseURLBSTR, responseURLBSTR.length()); > >- // FIXME: We should do real relative URL resolution here. >- int lastSlash = responseURL.rfind('/'); >- if (lastSlash != -1) >- responseURL = responseURL.substr(0, lastSlash); >- > wstring wURL = jsStringRefToWString(url); >- wstring wAbsoluteURL = responseURL + TEXT("/") + wURL; >- auto jsAbsoluteURL = adopt(JSStringCreateWithCharacters(wAbsoluteURL.data(), wAbsoluteURL.length())); > >+ std::vector<wchar_t> buffer; >+ DWORD bufferSize = 128; >+ while (true) { >+ buffer.resize(bufferSize); >+ auto result = UrlCombineW(responseURL.data(), wURL.data(), buffer.data(), &bufferSize, 0); >+ if (result == S_OK) >+ break; >+ bufferSize *= 2; >+ } >+ auto jsAbsoluteURL = adopt(JSStringCreateWithCharacters(buffer.data(), bufferSize)); > WorkQueue::singleton().queue(new LoadItem(jsAbsoluteURL.get(), target)); > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 189679
:
350136
|
350144
|
350232