Skip to content

Commit a57521a

Browse files
author
Li Hao
committed
Update video resource for ManifestCSP
Impacted tests(approved): new 0, update 1, delete 0 Unit test platform: Crosswalk Project for Android 18.48.484.0 Unit test result summary: pass 1, fail 0, block 0 BUG=https://crosswalk-project.org/jira/browse/XWALK-4425
1 parent 654fafa commit a57521a

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

samples-wrt/ManifestCSP/res/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<link rel="help" href="http://w3c.github.io/webappsec/specs/content-security-policy/csp-specification.dev.html">
3838
<script src="resources/js/jquery.js"></script>
3939
<script src="resources/js/script_local.js"></script>
40-
<script src="http://127.0.0.1:8081/opt/ManifestCSP/res/resources/js/script_online.js"></script>
40+
<script src="http://127.0.0.1:8081/opt/usecase-wrt-android-tests/res/js/script_online.js"></script>
4141
<style>
4242
.script_css {
4343
color: green
@@ -53,7 +53,7 @@
5353

5454
@font-face {
5555
font-family: Canvas1;
56-
src: url("http://127.0.0.1:8081/opt/ManifestCSP/res/resources/font/w3c/CanvasTest.ttf");
56+
src: url("http://127.0.0.1:8081/opt/usecase-wrt-android-tests/res/font/w3c/CanvasTest.ttf");
5757
}
5858

5959
#font_online {
@@ -117,7 +117,7 @@ <h4>This sample demonstrates CSP feature basic functionalities:</h4>
117117
</div>
118118
<span>Loading image in different orgin</span>
119119
<div style="width: 150px; height: 150px;">
120-
<img src="http://127.0.0.1:8081/opt/ManifestCSP/res/resources/image/w3c/cat.png"/>
120+
<img src="http://127.0.0.1:8081/opt/usecase-wrt-android-tests/res/image/w3c/cat.png"/>
121121
</div>
122122
</div>
123123
<hr/>
@@ -126,11 +126,11 @@ <h4>This sample demonstrates CSP feature basic functionalities:</h4>
126126
<p>The CSP restriction allow to load media in same orgin and cross orgin's (play normally in two videos)</p>
127127
<span>Loading video in different orgin</span>
128128
<div>
129-
<video src="http://127.0.0.1:8081/opt/ManifestCSP/res/resources/media/meego/MP4_h264_CIF_15FPS_387Kbps_MP3_44.1KHz_64Kbps_60sec(3.4Mb)_BBB(hinted).mp4" width="200" controls="controls"></video>
129+
<video src="http://127.0.0.1:8081/opt/usecase-wrt-android-tests/res/media/w3c/movie_300.mp4" width="200" controls="controls"></video>
130130
</div>
131131
<span>Loading video in same orgin</span>
132132
<div>
133-
<video src="resources/media/meego/MP4_h264_CIF_15FPS_387Kbps_MP3_44.1KHz_64Kbps_60sec(3.4Mb)_BBB(hinted).mp4" width="200" controls="controls"></video>
133+
<video src="resources/media/w3c/movie_300.mp4" width="200" controls="controls"></video>
134134
</div>
135135
</div>
136136
<hr/>

samples-wrt/ManifestCSP/res/resources/media/meego/COPYING

-10
This file was deleted.

suite.json

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
".git"
1616
],
1717
"copylist": {
18+
"res": "res",
19+
"samples-wrt/ManifestCSP/res/resources": "res",
1820
"samples/CSP-Meta/resources": "csp-meta/resources",
1921
"LICENSE": "LICENSE",
2022
"inst.apk.py": "inst.py"
@@ -69,6 +71,7 @@
6971
"samples-wrt/ManifestCSP/res": {
7072
"apk-type":"MANIFEST",
7173
"copylist": {
74+
"../../../res/media/w3c/movie_300.mp4": "resources/media/w3c/movie_300.mp4",
7275
"../../../js/jquery-2.1.3.min.js": "resources/js/jquery.js"
7376
}
7477
},

0 commit comments

Comments
 (0)