Skip to content

Commit

Permalink
[NaCl SDK AppEngine] Fix URLs to support loading from https.
Browse files Browse the repository at this point in the history 
It's unfortunately difficult to test whether this works; I pushed to a
different version on appspot, but https is not allowed there (the certs are
invalid). I've confirmed that http still works, however.

* Also, update .pexes to non-dev versions.
* Also, actually land the change to update docs -> dev.

BUG=none
R=sbc@chromium.org

Review URL: https://codereview.chromium.org/83793005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237102 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
binji@chromium.org committed Nov 25, 2013
1 parent 8f3fdb1 commit 5a5f8e7
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/gonacl.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

application = webapp2.WSGIApplication([
webapp2.Route('/', webapp2.RedirectHandler, defaults={
'_uri': 'http://developers.google.com/native-client/'}),
'_uri': 'http://developers.google.com/native-client/dev'}),
], debug=True)
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/bullet/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

<title>Bullet Physics</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">


<script type="text/javascript" src="NaClAM.js"></script>
<script type="text/javascript" src="NaClAMBullet.js"></script>
<script type="text/javascript" src="http://commondatastorage.googleapis.com/gonacl/pnacl-demo-bullet/three.min.js"></script>
<script type="text/javascript" src="//commondatastorage.googleapis.com/gonacl/pnacl-demo-bullet/three.min.js"></script>
<script type="text/javascript" src="scene.js"></script>
<script type="text/javascript" src="world.js"></script>
<script type="text/javascript" src="scenes.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/bullet/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ function pageDidLoad() {
embedWrap.addEventListener('progress', moduleLoadProgress, true);
embedWrap.addEventListener('crash', moduleCrash, true);

var revision = 233080;
var url = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/' +
var revision = 236779;
var url = '//commondatastorage.googleapis.com/gonacl/demos/publish/' +
revision + '/bullet/NaClAMBullet.nmf';

var embed = document.createElement('embed');
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/cube/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function browserSupportsPNaCl() {
* @return {string}
*/
function getDataURL(name) {
var revision = '234237_dev';
var baseUrl = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/';
var revision = '236779';
var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
return baseUrl + revision + '/cube/' + name;
}

Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/cube/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8">
<title>Rotating Cube</title>
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/earth/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function browserSupportsPNaCl() {
* @return {string}
*/
function getDataURL(name) {
var revision = '234237_dev';
var baseUrl = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/';
var revision = '236779';
var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
return baseUrl + revision + '/earth/' + name;
}

Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/earth/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<title>Multi-Threaded Raycasted Earth</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">

<script type="text/javascript" src="example.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/home/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<title>PNaCl Demos</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">

</head>
Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<title>PNaCl Demos</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300">
<link href="/static/styles/style.css" rel="stylesheet">
</head>
<body>
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/life/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function browserSupportsPNaCl() {
* @return {string}
*/
function getDataURL(name) {
var revision = '234237_dev';
var baseUrl = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/';
var revision = '236779';
var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
return baseUrl + revision + '/life/' + name;
}

Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/life/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<title>The Game of Life</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">

<script type="text/javascript" src="example.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ function browserSupportsPNaCl() {
* @return {string}
*/
function getDataURL(name) {
var revision = '234120_dev';
var baseUrl = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/';
var revision = '236779';
var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
return baseUrl + revision + '/smoothlife/' + name;
}

Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<head>
<meta charset="UTF-8">
<title>SmoothLife</title>
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">
<script type="text/javascript" src="example.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ function browserSupportsPNaCl() {
* @return {string}
*/
function getDataURL(name) {
var revision = '234237_dev';
var baseUrl = 'http://commondatastorage.googleapis.com/gonacl/demos/publish/';
var revision = '236779';
var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
return baseUrl + revision + '/voronoi/' + name;
}

Expand Down
2 changes: 1 addition & 1 deletion native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<title>Voronoi</title>

<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:300,700">
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
<link href="/static/styles/style.css" rel="stylesheet">

<script type="text/javascript" src="example.js"></script>
Expand Down

0 comments on commit 5a5f8e7

Please sign in to comment.