Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions WebKitBrowser/WebKitImplementation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2678,15 +2678,12 @@ static GSourceFuncs _handlerIntervention =

void OnURLChanged(const string& URL)
{
static const auto metroDomain = _bootUrl.substr(0, _bootUrl.find('#'));

TRACE_L1("%s", URL.c_str());

const bool isCurrentUrlBootUrl = urlValue() == _bootUrl;
const bool isCurrUrlMetroSubdomain = urlValue().find(metroDomain) != string::npos;
const bool isNewUrlBootUrl = URL == _bootUrl;
const bool isNewUrlBlankUrl = URL.find("about:blank") != string::npos;
const bool isNewUrlMetroSubdomain = URL.find(metroDomain) != string::npos;

urlValue(URL);

Expand All @@ -2700,12 +2697,13 @@ static GSourceFuncs _handlerIntervention =
gcCleaner->stop();
}

if (isNewUrlBlankUrl || (isCurrUrlMetroSubdomain && isNewUrlMetroSubdomain)) {
if (isNewUrlBlankUrl) {
/*
* When loading URL from the same domain only notify::uri signal is being sent.
* This scenario happens only for Metro domain addresses.
* When those addresses are detected and URL() waits for the result, send notification.
*/
TRACE_L1("Notify Url Load Result");
notifyUrlLoadResult(Core::ERROR_NONE);
} else {
/*
Expand Down