From 308df9e9efef97d9d3c17fc7894f44839e32bdbb Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Fri, 31 Jan 2014 08:06:10 -0600
Subject: [PATCH 1/3] Give up and set the initial size to be the same as the
 default size for reftests

---
 src/components/main/constellation.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/main/constellation.rs b/src/components/main/constellation.rs
index 761abfb6164..1ec2a56e554 100644
--- a/src/components/main/constellation.rs
+++ b/src/components/main/constellation.rs
@@ -274,7 +274,7 @@ impl Constellation {
                 pending_frames: ~[],
                 pending_sizes: HashMap::new(),
                 profiler_chan: profiler_chan,
-                window_size: Size2D(500u, 500u),
+                window_size: Size2D(800u, 600u),
                 opts: opts_clone,
             };
             constellation.run();

From 0c6b381bbbbf612d524472dac96196146eec9bcd Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Sat, 1 Feb 2014 14:25:55 -0600
Subject: [PATCH 2/3] Use synchronous image loading for ref test baseline
 writing

---
 src/components/main/servo.rc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc
index b92f29893fc..8b717f181f9 100755
--- a/src/components/main/servo.rc
+++ b/src/components/main/servo.rc
@@ -50,7 +50,7 @@ use servo_msg::constellation_msg::InitLoadUrlMsg;
 use gfx::opts;
 
 #[cfg(not(test))]
-use servo_net::image_cache_task::ImageCacheTask;
+use servo_net::image_cache_task::{ImageCacheTask, SyncImageCacheTask};
 #[cfg(not(test))]
 use servo_net::resource_task::ResourceTask;
 #[cfg(not(test))]
@@ -149,7 +149,14 @@ fn run(opts: Opts) {
         let opts = &opts_clone;
         // Create a Servo instance.
         let resource_task = ResourceTask();
-        let image_cache_task = ImageCacheTask(resource_task.clone());
+        // If we are emitting an output file, then we need to block on
+        // image load or we risk emitting an output file missing the
+        // image.
+        let image_cache_task = if opts.output_file.is_some() {
+                SyncImageCacheTask(resource_task.clone())
+            } else {
+                ImageCacheTask(resource_task.clone())
+            };
         let constellation_chan = Constellation::start(compositor_chan,
                                                       opts,
                                                       resource_task,

From 11f261471c481c052ec8e03fececdde0480da06e Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Sun, 2 Feb 2014 14:05:33 -0600
Subject: [PATCH 3/3] Update to rust-png with fix for truncation

---
 src/support/png/rust-png | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/support/png/rust-png b/src/support/png/rust-png
index 7a53b3042df..179900c871c 160000
--- a/src/support/png/rust-png
+++ b/src/support/png/rust-png
@@ -1 +1 @@
-Subproject commit 7a53b3042df5f483967b8bba283806d5f620954a
+Subproject commit 179900c871c2416824438cfce7fda737e9cba034