From 87f75259e4fd1c5e717fa09692977b9da61a3a3b Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Wed, 10 Dec 2014 13:15:59 -0700
Subject: [PATCH] servo: Merge #4316 - Make the gonk port work again (from
 michaelwu:fix-gonk); r=glennw

This makes the gonk port build/work again after the recent CEF port update.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5b53d5a163fb8b32e109d5dea4eddddf64caad08
---
 servo/ports/gonk/src/main.rs   |  3 +++
 servo/ports/gonk/src/window.rs | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/servo/ports/gonk/src/main.rs b/servo/ports/gonk/src/main.rs
index 552658d94da9..356fed244eb2 100644
--- a/servo/ports/gonk/src/main.rs
+++ b/servo/ports/gonk/src/main.rs
@@ -28,6 +28,7 @@ use servo_util::opts;
 use servo_util::rtinstrument;
 use servo::Browser;
 use compositing::windowing::IdleWindowEvent;
+use compositing::windowing::InitializeCompositingWindowEvent;
 
 use std::os;
 
@@ -58,6 +59,8 @@ fn start(argc: int, argv: *const *const u8) -> int {
                 Some(ref window) => input::run_input_loop(&window.event_send)
             }
 
+            browser.browser.handle_event(InitializeCompositingWindowEvent);
+
             loop {
                 let should_continue = match window {
                     None => browser.browser.handle_event(IdleWindowEvent),
diff --git a/servo/ports/gonk/src/window.rs b/servo/ports/gonk/src/window.rs
index 8257ac85c667..27a21cf308a8 100644
--- a/servo/ports/gonk/src/window.rs
+++ b/servo/ports/gonk/src/window.rs
@@ -13,6 +13,7 @@ use layers::platform::surface::NativeGraphicsMetadata;
 use libc::c_int;
 use msg::compositor_msg::{Blank, IdlePaintState};
 use msg::compositor_msg::{ReadyState, PaintState};
+use msg::constellation_msg::LoadData;
 use std::cell::Cell;
 use std::comm::Receiver;
 use std::rc::Rc;
@@ -790,6 +791,15 @@ impl WindowMethods for Window {
         self.paint_state.set(paint_state);
     }
 
+    fn set_page_title(&self, _: Option<String>) {
+    }
+
+    fn set_page_load_data(&self, _: LoadData) {
+    }
+
+    fn load_end(&self) {
+    }
+
     fn hidpi_factor(&self) -> ScaleFactor<ScreenPx, DevicePixel, f32> {
         ScaleFactor(1.0)
     }
@@ -809,6 +819,10 @@ impl WindowMethods for Window {
          } as Box<CompositorProxy+Send>,
          box receiver as Box<CompositorReceiver>)
     }
+
+    fn prepare_for_composite(&self) -> bool {
+        true
+    }
 }
 
 struct GonkCompositorProxy {