From c37e80cd97c3825eb8e3c8125369f954f577bc3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Thu, 24 Sep 2015 12:00:14 +0200
Subject: [PATCH 1/2] Use version 20150920 of Closure Compiler

---
 closure-util.json | 2 +-
 package.json      | 2 +-
 src/ol/ol.js      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/closure-util.json b/closure-util.json
index 1568b295dd..4c10a7d569 100644
--- a/closure-util.json
+++ b/closure-util.json
@@ -1,3 +1,3 @@
 {
-  "library_url": "https://github.com/google/closure-library/archive/a5f9b8a.zip"
+  "library_url": "https://github.com/google/closure-library/archive/5b25e65.zip"
 }
diff --git a/package.json b/package.json
index ec59eec283..19d032e567 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "async": "0.9.0",
     "browserify": "9.0.3",
-    "closure-util": "1.7.0",
+    "closure-util": "1.8.0",
     "fs-extra": "0.12.0",
     "glob": "5.0.3",
     "graceful-fs": "3.0.2",
diff --git a/src/ol/ol.js b/src/ol/ol.js
index 48c926e560..ba1c7e6282 100644
--- a/src/ol/ol.js
+++ b/src/ol/ol.js
@@ -232,8 +232,8 @@ ol.WEBGL_EXTENSIONS; // value is set in `ol.has`
  *       // Other code here.
  *     };
  *
- * @param {Function} childCtor Child constructor.
- * @param {Function} parentCtor Parent constructor.
+ * @param {!Function} childCtor Child constructor.
+ * @param {!Function} parentCtor Parent constructor.
  * @function
  * @api
  */

From f30744c0b83c706d5a8d490cac38488a0072b71c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Thu, 24 Sep 2015 13:21:09 +0200
Subject: [PATCH 2/2] Simplify test-rendering.js

Now that https://github.com/laurentj/slimerjs/issues/333 is properly fixed (see https://github.com/laurentj/slimerjs/commit/911fcb671a36049bd3ca5e7b8d5824a8d7f01dc7) we can no longer read Slimer's exit code from a file. Instead, we can just use the process exit code, which simplifies the test-rendering.js script.
---
 tasks/test-rendering.js | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/tasks/test-rendering.js b/tasks/test-rendering.js
index fb3e917613..9df2f2bc1b 100644
--- a/tasks/test-rendering.js
+++ b/tasks/test-rendering.js
@@ -39,26 +39,14 @@ serve.createServer(function(err, server) {
       url + '/test_rendering/index.html'
     ];
 
+    // The current version of slimerjs is 0.9.6, but this version does not work
+    // for us because of https://github.com/laurentj/slimerjs/issues/333. This
+    // issue is now fixed in master and slimerjs-edge (nightly builds) works for
+    // us. But we should use slimerjs instead of slimerjs-edge when a new
+    // release is published.
     var child = spawn(slimerjs.path, args, {stdio: 'inherit'});
     child.on('exit', function(code) {
-      // FIXME SlimerJS has a problem with returning the correct return
-      // code when using a custom profile, see
-      // https://github.com/laurentj/slimerjs/issues/333
-      // as a work-around we are currently reading the return code from
-      // a file created in the profile directory.
-      // if this issue is fixed we should use the npm package 'slimerjs'
-      // instead of the nightly build 'slimerjs-edge'.
-      var exitstatus = path.join(profile, 'exitstatus');
-      fs.readFile(exitstatus, {encoding: 'utf-8'}, function(err, data) {
-        if (err) {
-          process.stderr.write(
-              'Error getting the exit status of SlimerJS' + '\n');
-          process.stderr.write(err.stack + '\n');
-          process.exit(1);
-        } else {
-          process.exit(data);
-        }
-      });
+      process.exit(code);
     });
   });