Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1958)

Unified Diff: examples/graphics/life/life.html

Issue 6286025: Port the Life example to Pepper 2. (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/graphics/life/life.css ('k') | examples/graphics/life/life.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/graphics/life/life.html
===================================================================
--- examples/graphics/life/life.html (revision 158)
+++ examples/graphics/life/life.html (working copy)
@@ -1,41 +1,25 @@
<html>
<head>
-<TITLE>Life Demo</TITLE>
-<META HTTP-EQUIV="Pragma" CONTENT="no-cache">
-<META HTTP-EQUIV="Expires" CONTENT="-1">
+ <title>Life Demo</title>
+ <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
+ <meta HTTP-EQUIV="Expires" CONTENT="-1">
+ <link href="life.css" rel="stylesheet" type="text/css">
+ <script type="text/javascript" src="dragger.js"></script>
+ <script type="text/javascript" src="life.js"></script>
+ <script type="text/javascript">
+ life.application = new life.Application();
-<script type="text/javascript">
- // Set the global status message. If the element with id 'status_field'
- // exists, then set its HTML to the status message as well.
- // opt_message The message test. If this is null or undefined, then
- // attempt to set the element with id 'status_field' to the value of
- // |status_text|.
- var life = null;
- var updateInterval = null;
- function updateStatus(opt_message) {
- if (opt_message)
- status_text = opt_message;
- var status_field = document.getElementById('status_field');
- if (status_field) {
- status_field.innerHTML = status_text;
+ // This function is called when the life NaCl module is loaded.
+ function moduleDidLoad() {
+ var module =
+ document.getElementById('life');
+ life.application.moduleDidLoad(module, 'div_event_layer');
}
- }
- // use a 10ms update interval to drive frame rate
- function moduleDidLoad() {
- life = document.getElementById('life');
- if (life != null) {
- updateStatus('SUCCESS');
- updateInterval = setInterval("life.update()", 10);
+ function pageDidUnload() {
+ life.application.moduleDidUnload();
}
- }
-
- function pageDidUnload() {
- clearInterval(updateInterval);
- }
-
-</script>
-
+ </script>
</head>
<body id="bodyId" onunload="pageDidUnload();" >
@@ -44,38 +28,24 @@
Use the mouse to paint extra life into the simulation.
</p>
- <div id="life_content"></div>
- <script type="text/javascript">
- contentDiv = document.getElementById('life_content');
- if (window.location.hash == '#develop') {
- // Load the develop version of the module.
- contentDiv.innerHTML = '<embed name="nacl_module" '
- + 'id="life" '
- + 'width=200 height=200 '
- + 'type="pepper-application/life" '
- + 'dimension="2" />'
- moduleDidLoad();
- } else {
- // Load the published .nexe. This includes the 'nexes' attribute which
- // shows how to load multi-architecture modules. Each entry in the
- // table is a key-value pair: the key is the runtime ('x86-32',
- // 'x86-64', etc.); the value is a URL for the desired NaCl module.
- var nexes = 'x86-32: life_x86_32.nexe\n'
- + 'x86-64: life_x86_64.nexe\n'
- + 'arm: life_arm.nexe ';
- contentDiv.innerHTML = '<embed name="nacl_module" '
- + 'id="life" '
- + 'width=200 height=200 '
- // + 'nexes="' + nexes + '" '
- + 'type="application/x-nacl-srpc" '
- + 'dimensions="2" '
- + 'onload=moduleDidLoad() />';
- // Note: this code is here to work around a bug in Chromium build
- // #47357. See also
- // http://code.google.com/p/nativeclient/issues/detail?id=500
- document.getElementById('life').nexes = nexes;
- }
- </script>
+ <!-- Load the published .nexe. This includes the 'nacl' attribute which
+ shows how to load multi-architecture modules. Each entry in the "nexes"
+ object in the .nmf manifest file is a key-value pair: the key is the
+ runtime ('x86-32', 'x86-64', etc.); the value is a URL for the desired NaCl
+ module. To load the debug versions of your .nexes, set the 'nacl'
+ attribute to the _dbg.nmf version of the manifest file.
+ -->
+ <div id="div_background_layer" class="background_layer">
+ <div id="div_event_layer" class="event_layer"></div>
+ <embed name="nacl_module"
+ id="life"
+ class="nacl_module_layer"
+ width=400 height=400
+ nacl="life.nmf"
+ type="application/x-nacl"
+ dimensions="2"
+ onload="moduleDidLoad();" />
+ </div>
<br>
</body>
</html>
« no previous file with comments | « examples/graphics/life/life.css ('k') | examples/graphics/life/life.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698