lp:~chrisccoulson/oxide/arale-fixes

Branch merges

Merged into lp:~oxide-developers/oxide/oxide.trunk at revision 1017

Chris Coulson: Pending requested 2015-03-19

Diff: 4558 lines (+2097/-844)

48 files modified

patches/add-oxide-classes-to-thread-restrictions-friends.patch (+47/-0)
patches/gpu-thread-shim.patch (+7/-5)
patches/series (+1/-0)
qt/core/app/oxide_qt_platform_delegate.cc (+3/-5)
qt/core/app/oxide_qt_platform_delegate.h (+2/-7)
qt/core/browser/oxide_qt_browser_platform_integration.cc (+8/-9)
qt/core/browser/oxide_qt_browser_platform_integration.h (+6/-9)
qt/core/browser/oxide_qt_browser_startup.cc (+6/-7)
qt/core/browser/oxide_qt_browser_startup.h (+7/-4)
qt/core/core.gyp (+3/-2)
qt/core/glue/oxide_qt_init.cc (+3/-3)
qt/core/glue/oxide_qt_web_view_adapter.cc (+10/-3)
qt/core/glue/oxide_qt_web_view_adapter.h (+7/-15)
qt/core/gpu/oxide_qt_gl_context_dependent.cc (+17/-31)
qt/core/gpu/oxide_qt_gl_context_dependent.h (+10/-18)
qt/quick/CMakeLists.txt (+1/-0)
qt/quick/api/oxideqquickwebview.cc (+17/-1)
qt/quick/oxide_qquick_accelerated_frame_node.cc (+2/-2)
qt/quick/oxide_qquick_image_frame_node.cc (+98/-0)
qt/quick/oxide_qquick_image_frame_node.h (+58/-0)
shared/browser/compositor/oxide_compositing_mode.h (+40/-0)
shared/browser/compositor/oxide_compositor.cc (+5/-3)
shared/browser/compositor/oxide_compositor.h (+2/-2)
shared/browser/compositor/oxide_compositor_frame_handle.cc (+12/-11)
shared/browser/compositor/oxide_compositor_frame_handle.h (+25/-12)
shared/browser/compositor/oxide_compositor_gpu_shims.cc (+188/-0)
shared/browser/compositor/oxide_compositor_gpu_shims.h (+91/-0)
shared/browser/compositor/oxide_compositor_output_surface_gl.cc (+48/-39)
shared/browser/compositor/oxide_compositor_output_surface_gl.h (+12/-10)
shared/browser/compositor/oxide_compositor_thread_proxy.cc (+283/-102)
shared/browser/compositor/oxide_compositor_thread_proxy.h (+81/-19)
shared/browser/compositor/oxide_compositor_utils.cc (+340/-312)
shared/browser/compositor/oxide_compositor_utils.h (+44/-21)
shared/browser/compositor/oxide_mailbox_buffer_map.cc (+249/-0)
shared/browser/compositor/oxide_mailbox_buffer_map.h (+130/-0)
shared/browser/oxide_browser_main_parts.cc (+34/-8)
shared/browser/oxide_browser_main_parts.h (+16/-8)
shared/browser/oxide_browser_platform_integration.cc (+2/-2)
shared/browser/oxide_browser_platform_integration.h (+3/-3)
shared/browser/oxide_content_browser_client.cc (+4/-4)
shared/browser/oxide_web_view.cc (+5/-3)
shared/gpu/oxide_gl_context_dependent.cc (+41/-16)
shared/gpu/oxide_gl_context_dependent.h (+30/-17)
shared/port/content/common/gpu_client_shim_oxide.cc (+32/-0)
shared/port/content/common/gpu_client_shim_oxide.h (+35/-0)
shared/port/content/common/gpu_service_shim_oxide.cc (+13/-69)
shared/port/content/common/gpu_service_shim_oxide.h (+12/-60)
shared/shared.gyp (+7/-2)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1435831: Support compositing path using EGLImage	Critical	Fix Released
Bug #1435835: Improve reliability of synchronization between WebView compositor and UI compositor	Critical	Fix Released

Link a bug report

Related blueprints

1022. By Chris Coulson on 2015-03-25

Add a fallback for when sync query doesn't work

1021. By Chris Coulson on 2015-03-25

Fix a startup race

1020. By Chris Coulson on 2015-03-24

Handle the case where we get a frame swap before we have a mailbox -> GPU buffer mapping

1019. By Chris Coulson on 2015-03-24

Split the mailbox buffer map in to a separate class

1018. By Chris Coulson on 2015-03-23

Don't use EGL image if it's not supported

1017. By Chris Coulson on 2015-03-23

Use a fence for synchronization using Chromium's GL_COMMANDS_COMPLETED_CHROMIUM query type. This fixes the flickering on Arale. Note that whilst this works adaquately for now, there is scope for optimizing the EGLImage rendering path further by using something similar to MailboxManagerSync and inserting a server wait on Qt's render thread. That's for another day though

1016. By Chris Coulson on 2015-03-19

Fix a typo from the merge

1015. By Chris Coulson on 2015-03-19

Merge from trunk

1014. By Chris Coulson on 2015-03-19

Refactor code that pulls in GPU-service related headers in to its own translation unit, which allows us to pull in GPU-client headers that means we can stop forward declaring GL types everywhere

1013. By Chris Coulson on 2015-03-18

Don't hold references to cc::ContextProvider outside of the compositor, or references to TextureRef outside of the GPU service - having a WebView is enough to keep these alive until the resources are returned on the compositor swap ACK, and if the GPU driver loses the context then it's pretty much game over anyway. This will enable us to simplify things quite a bit