zmike

diff --git a/src/modules/Makefile_geolocation.mk b/src/modules/Makefile_geolocation.mk
index 79182e1..754dc5a 100644
--- a/src/modules/Makefile_geolocation.mk
+++ b/src/modules/Makefile_geolocation.mk
@@ -9,6 +9,7 @@ geolocation_DATA = src/modules/geolocation/e-module-geolocation.edj \
 
 geolocationpkgdir = $(MDIR)/geolocation/$(MODULE_ARCH)
 geolocationpkg_LTLIBRARIES = src/modules/geolocation/module.la
+src_modules_geolocation_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -I$(top_builddir)/src/modules/geolocation
 

zmike

diff --git a/include/X11/Xlib-xcb.h b/include/X11/Xlib-xcb.h
index a21e2be..240a25c 100644
--- a/include/X11/Xlib-xcb.h
+++ b/include/X11/Xlib-xcb.h
@@ -11,6 +11,7 @@
 _XFUNCPROTOBEGIN
 
 xcb_connection_t *XGetXCBConnection(Display *dpy);
+Display *XCBGetXDisplay(xcb_connection_t *c);
 

zmike

#0  0x00007ffff6f8c830 in rust_panic () from ../servo/libcef.so
#1  0x00007ffff6f4ec68 in rt::unwind::begin_unwind_inner::h2ea6b65af87d2482v3v () from ../servo/libcef.so
#2  0x00007ffff6f4f988 in rt::unwind::begin_unwind_fmt::hecd98e7f8a3b6e1cB2v () from ../servo/libcef.so
#3  0x00007ffff6f8cac7 in rust_begin_unwind () from ../servo/libcef.so
#4  0x00007ffff6fdfab5 in panicking::panic_fmt::hd9d434c1534722c4NKy () from ../servo/libcef.so
#5  0x00007ffff5fc661e in net::result::Result<T, E>::unwrap (self=...)
    at /home/larsberg/rust/src/libcore/macros.rs:27
#6  0x00007ffff61000b7 in fnfn () at /home/zmike/src/servo/components/net/image_cache_task.rs:334
#7  0x00007ffff60ffe67 in fnfn () at /home/zmike/src/servo/components/util/task.rs:16
#8  0x00007ffff60ffd7d in net::boxed::F.FnBox<A>::call_box (self=0x7fffea852000, args=0)

zmike

diff --git a/ports/cef/browser.rs b/ports/cef/browser.rs
index 3250da9..6b63853 100644
--- a/ports/cef/browser.rs
+++ b/ports/cef/browser.rs
@@ -9,7 +9,7 @@ use interfaces::{CefBrowser, CefBrowserHost, CefClient, CefFrame, CefRequestCont
 use interfaces::{cef_browser_t, cef_browser_host_t, cef_client_t, cef_frame_t};
 use interfaces::{cef_request_context_t};
 use servo::Browser;
-use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t};
+use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t, cef_window_handle_t};

zmike

thread '<unnamed>' panicked at 'Failed to compile shader: 0:9(2): error: invalid type `sampler2DRect' in declaration of `uSampler'
0:13(45): error: `uSampler' undeclared
0:13(31): error: no matching function for call to `texture2DRect(error, vec2)'; candidates are:
0:13(20): error: operands to arithmetic operators must be numeric', /home/zmike/src/servo/.cargo/git/checkouts/rust-layers-3d9d5f0b4e4d9002/master/src/rendergl.rs:123
fatal runtime error: Could not unwind stack, error = 5

zmike

macro_rules! check_ptr_exist {
    ($var:expr, $member:expr) => (
        (*$var.c_object).$member.is_some()
    );
}

zmike

#include "ecef.h"

#ifdef HAVE_SERVO
static void
render_image_servo_compositing_initialize(void *d)
{
   Browser *b = d;
   cef_browser_host_t *host;

   assert(evas_gl_make_current(b->gl, NULL, NULL));

zmike

void
render_image_servo_present(cef_render_handler_t *handler, cef_browser_t *browser)
{
   Browser *b = browser_get(browser_get_client(browser), browser);
   elm_glview_changed_set(b->img);
   void *buffer = malloc(b->w * b->h * 4);
   static Evas_Object *win, *img;
   elm_glview_gl_api_get(b->img)->glReadPixels(0, 0, b->w, b->h, GL_RGB, GL_UNSIGNED_BYTE, buffer);
   if (!win)
     {

zmike

Breakpoint 5, embedding::compositor::IOCompositor<Window>::composite_if_necessary (self=0x7fffeb050280, reason=NewFrameTree) at /home/zmike/src/servo/components/compositing/compositor.rs:1340
1340	        if self.composition_request == CompositionRequest::NoCompositingNecessary {
#0  embedding::compositor::IOCompositor<Window>::composite_if_necessary (self=0x7fffeb050280, reason=NewFrameTree) at /home/zmike/src/servo/components/compositing/compositor.rs:1340
#1  0x00007ffff454ac80 in embedding::compositor::IOCompositor<Window>::set_frame_tree (self=0x7fffeb050280, frame_tree=0x7fffffffccd0, response_chan=..., new_constellation_chan=...) at /home/zmike/src/servo/components/compositing/compositor.rs:540
#2  0x00007ffff4548073 in embedding::compositor::IOCompositor<Window>::handle_browser_message (self=0x7fffeb050280, msg=...) at /home/zmike/src/servo/components/compositing/compositor.rs:345
#3  0x00007ffff45478f6 in embedding::compositor::IOCompositor<Window>.CompositorEventListener::handle_event (self=0x7fffeb

zmike

FRAMEBUFFER TEXTURE ATTACH 0
RENDERBUFFER ATTACK 0
RENDERBUFFER ATTACK 0
RENDERBUFFER ATTACK 0
FRAMEBUFFER TEXTURE ATTACH 6
RENDERBUFFER ATTACK 1
FRAMEBUFFER TEXTURE ATTACH 0
RENDERBUFFER ATTACK 0
RENDERBUFFER ATTACK 0
RENDERBUFFER ATTACK 0