Skip to content

Choose which cross-origin URL to use up front. #3095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenrussell merged 3 commits into from
Jun 9, 2020
Merged

Choose which cross-origin URL to use up front. #3095

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08f2014
Choose which cross-origin URL to use up-front.
kenrussell Jun 5, 2020
ed955bb
Attempt to better detect IPv6 loopback in runningOnLocalhost.
kenrussell Jun 5, 2020
d87abd7
Use == instead of indexof on suggestion from @kainino0x
kenrussell Jun 5, 2020
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
21 changes: 12 additions & 9 deletions sdk/tests/js/webgl-test-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,13 +3183,16 @@ var getBaseDomain = function(host) {
}

var runningOnLocalhost = function() {
return window.location.hostname.indexOf("localhost") != -1 ||
window.location.hostname.indexOf("127.0.0.1") != -1;
let hostname = window.location.hostname;
return hostname == "localhost" ||
hostname == "127.0.0.1" ||
hostname == "::1";
}

var getLocalCrossOrigin = function() {
var domain;
if (window.location.host.indexOf("localhost") != -1) {
// TODO(kbr): figure out whether to use an IPv6 loopback address.
domain = "127.0.0.1";
} else {
domain = "localhost";
Expand Down Expand Up @@ -3222,20 +3225,20 @@ var getRelativePath = function(path) {
}

async function loadCrossOriginImage(img, webUrl, localUrl) {
img.src = getUrlOptions().imgUrl || webUrl;
try {
console.log('[loadCrossOriginImage]', 'trying', img.src);
await img.decode();
return;
} catch {}

if (runningOnLocalhost()) {
img.src = getLocalCrossOrigin() + getRelativePath(localUrl);
console.log('[loadCrossOriginImage]', ' trying', img.src);
await img.decode();
return;
}

try {
img.src = getUrlOptions().imgUrl || webUrl;
console.log('[loadCrossOriginImage]', 'trying', img.src);
await img.decode();
return;
} catch {}

throw 'createCrossOriginImage failed';
}

Expand Down