summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-25 18:17:29 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-25 18:17:29 +0000
commit5a5f8e78600899d9bfdc586793a616cd01ea0475 (patch)
tree5fe08de7b520122f9024339dc601569cfec5c509 /native_client_sdk
parent8f3fdb1030ffda316b496c886ea69be933d3ac35 (diff)
downloadchromium_src-5a5f8e78600899d9bfdc586793a616cd01ea0475.zip
chromium_src-5a5f8e78600899d9bfdc586793a616cd01ea0475.tar.gz
chromium_src-5a5f8e78600899d9bfdc586793a616cd01ea0475.tar.bz2
[NaCl SDK AppEngine] Fix URLs to support loading from https.
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
Diffstat (limited to 'native_client_sdk')
-rw-r--r--native_client_sdk/src/gonacl_appengine/gonacl.py2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/bullet/index.html4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/bullet/main.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/cube/example.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/cube/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/earth/example.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/earth/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/home/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/life/example.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/life/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html2
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/voronoi/example.js4
-rw-r--r--native_client_sdk/src/gonacl_appengine/static/voronoi/index.html2
15 files changed, 22 insertions, 22 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/gonacl.py b/native_client_sdk/src/gonacl_appengine/gonacl.py
index 2942e6d..69892e1 100644
--- a/native_client_sdk/src/gonacl_appengine/gonacl.py
+++ b/native_client_sdk/src/gonacl_appengine/gonacl.py
@@ -5,5 +5,5 @@ import webapp2
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)
diff --git a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
index 75ebbc2..344e924 100644
--- a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
@@ -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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/bullet/main.js b/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
index 770584b..6e80a14 100644
--- a/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
+++ b/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
@@ -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');
diff --git a/native_client_sdk/src/gonacl_appengine/static/cube/example.js b/native_client_sdk/src/gonacl_appengine/static/cube/example.js
index dcb0c28..562f75c 100644
--- a/native_client_sdk/src/gonacl_appengine/static/cube/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/cube/example.js
@@ -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;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/cube/index.html b/native_client_sdk/src/gonacl_appengine/static/cube/index.html
index ef7277a..909d8ed 100644
--- a/native_client_sdk/src/gonacl_appengine/static/cube/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/cube/index.html
@@ -8,7 +8,7 @@ found in the LICENSE file.
<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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/earth/example.js b/native_client_sdk/src/gonacl_appengine/static/earth/example.js
index 33a8261..ef8345b 100644
--- a/native_client_sdk/src/gonacl_appengine/static/earth/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/earth/example.js
@@ -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;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/earth/index.html b/native_client_sdk/src/gonacl_appengine/static/earth/index.html
index f343c99..7f5e505 100644
--- a/native_client_sdk/src/gonacl_appengine/static/earth/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/earth/index.html
@@ -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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/home/index.html b/native_client_sdk/src/gonacl_appengine/static/home/index.html
index 695fdb6..fd2f252 100644
--- a/native_client_sdk/src/gonacl_appengine/static/home/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/home/index.html
@@ -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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/index.html b/native_client_sdk/src/gonacl_appengine/static/index.html
index 368e676..9eea2ed 100644
--- a/native_client_sdk/src/gonacl_appengine/static/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/index.html
@@ -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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/life/example.js b/native_client_sdk/src/gonacl_appengine/static/life/example.js
index 01b03eb..8cbfdd4 100644
--- a/native_client_sdk/src/gonacl_appengine/static/life/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/life/example.js
@@ -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;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/life/index.html b/native_client_sdk/src/gonacl_appengine/static/life/index.html
index 071cd65..7f2ca0a 100644
--- a/native_client_sdk/src/gonacl_appengine/static/life/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/life/index.html
@@ -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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js b/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
index b2dcf58..e8f65a1 100644
--- a/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
@@ -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;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html b/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
index 94a1ba4..9067549 100644
--- a/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/smoothlife/index.html
@@ -8,7 +8,7 @@ found in the LICENSE file.
<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>
diff --git a/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js b/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
index 036e3a9..6769e9b 100644
--- a/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
@@ -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;
}
diff --git a/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html b/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
index 232f7fa..f4fc599 100644
--- a/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/voronoi/index.html
@@ -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>