summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--o3d/DEPS2
-rw-r--r--o3d/DEPS_gyp2
-rw-r--r--o3d/samples/GoogleIO-2009/step01ex.html (renamed from o3d/samples/GoogleIO-2009/step01.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step02ex.html (renamed from o3d/samples/GoogleIO-2009/step02.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step03ex.html (renamed from o3d/samples/GoogleIO-2009/step03.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step04ex.html (renamed from o3d/samples/GoogleIO-2009/step04.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step05ex.html (renamed from o3d/samples/GoogleIO-2009/step05.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step06ex.html (renamed from o3d/samples/GoogleIO-2009/step06.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step07ex.html (renamed from o3d/samples/GoogleIO-2009/step07.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step08ex.html (renamed from o3d/samples/GoogleIO-2009/step08.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step09ex.html (renamed from o3d/samples/GoogleIO-2009/step09.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step10ex.html (renamed from o3d/samples/GoogleIO-2009/step10.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step11ex.html (renamed from o3d/samples/GoogleIO-2009/step11.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step12ex.html (renamed from o3d/samples/GoogleIO-2009/step12.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step13ex.html (renamed from o3d/samples/GoogleIO-2009/step13.html)0
-rw-r--r--o3d/samples/GoogleIO-2009/step14ex.html (renamed from o3d/samples/GoogleIO-2009/step14.html)0
-rw-r--r--o3d/samples/MANIFEST28
-rw-r--r--o3d/tests/selenium/sample_list.txt4
18 files changed, 18 insertions, 18 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index 05d5fb2..547b10e 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,7 +2,7 @@ vars = {
"chromium_trunk":
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "25",
- "o3d_code_rev": "91",
+ "o3d_code_rev": "92",
}
deps = {
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 5afa3a2..992efa3 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -3,7 +3,7 @@ vars = {
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "25",
"chromium_rev": "19057",
- "o3d_code_rev": "91",
+ "o3d_code_rev": "92",
}
deps = {
diff --git a/o3d/samples/GoogleIO-2009/step01.html b/o3d/samples/GoogleIO-2009/step01ex.html
index d105a59..d105a59 100644
--- a/o3d/samples/GoogleIO-2009/step01.html
+++ b/o3d/samples/GoogleIO-2009/step01ex.html
diff --git a/o3d/samples/GoogleIO-2009/step02.html b/o3d/samples/GoogleIO-2009/step02ex.html
index 74f3b0f..74f3b0f 100644
--- a/o3d/samples/GoogleIO-2009/step02.html
+++ b/o3d/samples/GoogleIO-2009/step02ex.html
diff --git a/o3d/samples/GoogleIO-2009/step03.html b/o3d/samples/GoogleIO-2009/step03ex.html
index 8f6aaa9..8f6aaa9 100644
--- a/o3d/samples/GoogleIO-2009/step03.html
+++ b/o3d/samples/GoogleIO-2009/step03ex.html
diff --git a/o3d/samples/GoogleIO-2009/step04.html b/o3d/samples/GoogleIO-2009/step04ex.html
index 93bd8ed..93bd8ed 100644
--- a/o3d/samples/GoogleIO-2009/step04.html
+++ b/o3d/samples/GoogleIO-2009/step04ex.html
diff --git a/o3d/samples/GoogleIO-2009/step05.html b/o3d/samples/GoogleIO-2009/step05ex.html
index 2c79086..2c79086 100644
--- a/o3d/samples/GoogleIO-2009/step05.html
+++ b/o3d/samples/GoogleIO-2009/step05ex.html
diff --git a/o3d/samples/GoogleIO-2009/step06.html b/o3d/samples/GoogleIO-2009/step06ex.html
index 131ff43..131ff43 100644
--- a/o3d/samples/GoogleIO-2009/step06.html
+++ b/o3d/samples/GoogleIO-2009/step06ex.html
diff --git a/o3d/samples/GoogleIO-2009/step07.html b/o3d/samples/GoogleIO-2009/step07ex.html
index 4c61f93..4c61f93 100644
--- a/o3d/samples/GoogleIO-2009/step07.html
+++ b/o3d/samples/GoogleIO-2009/step07ex.html
diff --git a/o3d/samples/GoogleIO-2009/step08.html b/o3d/samples/GoogleIO-2009/step08ex.html
index dc3084c..dc3084c 100644
--- a/o3d/samples/GoogleIO-2009/step08.html
+++ b/o3d/samples/GoogleIO-2009/step08ex.html
diff --git a/o3d/samples/GoogleIO-2009/step09.html b/o3d/samples/GoogleIO-2009/step09ex.html
index ce931be..ce931be 100644
--- a/o3d/samples/GoogleIO-2009/step09.html
+++ b/o3d/samples/GoogleIO-2009/step09ex.html
diff --git a/o3d/samples/GoogleIO-2009/step10.html b/o3d/samples/GoogleIO-2009/step10ex.html
index 965ef7c..965ef7c 100644
--- a/o3d/samples/GoogleIO-2009/step10.html
+++ b/o3d/samples/GoogleIO-2009/step10ex.html
diff --git a/o3d/samples/GoogleIO-2009/step11.html b/o3d/samples/GoogleIO-2009/step11ex.html
index 1db5557..1db5557 100644
--- a/o3d/samples/GoogleIO-2009/step11.html
+++ b/o3d/samples/GoogleIO-2009/step11ex.html
diff --git a/o3d/samples/GoogleIO-2009/step12.html b/o3d/samples/GoogleIO-2009/step12ex.html
index cb07ce7..cb07ce7 100644
--- a/o3d/samples/GoogleIO-2009/step12.html
+++ b/o3d/samples/GoogleIO-2009/step12ex.html
diff --git a/o3d/samples/GoogleIO-2009/step13.html b/o3d/samples/GoogleIO-2009/step13ex.html
index a995627..a995627 100644
--- a/o3d/samples/GoogleIO-2009/step13.html
+++ b/o3d/samples/GoogleIO-2009/step13ex.html
diff --git a/o3d/samples/GoogleIO-2009/step14.html b/o3d/samples/GoogleIO-2009/step14ex.html
index 031f858..031f858 100644
--- a/o3d/samples/GoogleIO-2009/step14.html
+++ b/o3d/samples/GoogleIO-2009/step14ex.html
diff --git a/o3d/samples/MANIFEST b/o3d/samples/MANIFEST
index 5cb2ff6..65bda21 100644
--- a/o3d/samples/MANIFEST
+++ b/o3d/samples/MANIFEST
@@ -44,20 +44,20 @@ beachdemo/assets/pe_mist.png
beachdemo/assets/sky-cubemap.dds
beachdemo/beachdemo.html
beachdemo/beachdemo.js
-GoogleIO-2009/step01.html
-GoogleIO-2009/step02.html
-GoogleIO-2009/step03.html
-GoogleIO-2009/step04.html
-GoogleIO-2009/step05.html
-GoogleIO-2009/step06.html
-GoogleIO-2009/step07.html
-GoogleIO-2009/step08.html
-GoogleIO-2009/step09.html
-GoogleIO-2009/step10.html
-GoogleIO-2009/step11.html
-GoogleIO-2009/step12.html
-GoogleIO-2009/step13.html
-GoogleIO-2009/step14.html
+GoogleIO-2009/step01ex.html
+GoogleIO-2009/step02ex.html
+GoogleIO-2009/step03ex.html
+GoogleIO-2009/step04ex.html
+GoogleIO-2009/step05ex.html
+GoogleIO-2009/step06ex.html
+GoogleIO-2009/step07ex.html
+GoogleIO-2009/step08ex.html
+GoogleIO-2009/step09ex.html
+GoogleIO-2009/step10ex.html
+GoogleIO-2009/step11ex.html
+GoogleIO-2009/step12ex.html
+GoogleIO-2009/step13ex.html
+GoogleIO-2009/step14ex.html
GoogleIO-2009/shaders/checker.shader
GoogleIO-2009/assets/background.o3dtgz
GoogleIO-2009/assets/character.o3dtgz
diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt
index 2774574..46a92f6 100644
--- a/o3d/tests/selenium/sample_list.txt
+++ b/o3d/tests/selenium/sample_list.txt
@@ -107,8 +107,8 @@ medium zsorting screenshot pdiff_threshold(39500)
#large box2d-3d/box2d-3d timeout(45000) except(*googlechrome)
large simpleviewer/simpleviewer screenshot pdiff_threshold(100)
large trends/trends timeout(30000)
-medium GoogleIO-2009/step09 screenshot pdiff_threshold(1900)
-large GoogleIO-2009/step14 screenshot pdiff_threshold(4900)
+medium GoogleIO-2009/step09ex screenshot pdiff_threshold(1900)
+large GoogleIO-2009/step14ex screenshot pdiff_threshold(4900)
# -- tests below this line are tests for which there is a python
# function to custom run the test. As such, only the 'except' and