← Back to branch summary

~chrisccoulson/oxide/lp1504853

~chrisccoulson/oxide/lp1504853

Viewing all changes in revision 1223.

Committer: Chris Coulson
Date: 2015-10-21 19:06:54 UTC
mfrom: (1215.1.13 oxide)
Revision ID: chris.coulson@canonical.com-20151021190654-cfcbueitgzojv7jc

Merge from trunk

files added:
qt/core/browser/input

qt/core/browser/input/oxide_qt_input_method_context.cc

qt/core/browser/input/oxide_qt_input_method_context.h

qt/core/browser/input/oxide_qt_input_method_context_client.h

qt/qmlplugin/oxide.qmltypes

shared/browser/compositor/oxide_compositor_observer.cc

shared/browser/compositor/oxide_compositor_observer.h

shared/browser/input

shared/browser/input/oxide_ime_bridge.cc

shared/browser/input/oxide_ime_bridge.h

shared/browser/input/oxide_ime_bridge_impl.cc

shared/browser/input/oxide_ime_bridge_impl.h

shared/browser/input/oxide_input_method_context.cc

shared/browser/input/oxide_input_method_context.h

shared/browser/input/oxide_input_method_context_observer.cc

shared/browser/input/oxide_input_method_context_observer.h

shared/common/oxide_unowned_user_data.h

files renamed:
shared/browser/oxide_render_widget_host_view_delegate.h => shared/browser/oxide_render_widget_host_view_container.h

files modified:
CMakeLists.txt

qt/CMakeLists.txt

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/core.gyp

qt/qmlplugin/CMakeLists.txt

qt/qmlplugin/qmldir

shared/browser/compositor/oxide_compositor.cc

shared/browser/compositor/oxide_compositor.h

shared/browser/compositor/oxide_compositor_client.h

shared/browser/oxide_render_widget_host_view.cc

shared/browser/oxide_render_widget_host_view.h

shared/browser/oxide_web_contents_view.cc

shared/browser/oxide_web_contents_view.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/browser/oxide_web_view_client.cc

shared/browser/oxide_web_view_client.h

shared/shared.gyp

Show diffs side-by-side

added added

removed removed

qt/CMakeLists.txt

qt/core/browser/input/

qt/core/browser/input/oxide_qt_input_method_context.cc

qt/core/browser/input/oxide_qt_input_method_context.h

qt/core/browser/input/oxide_qt_input_method_context_client.h

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/core.gyp

qt/qmlplugin/CMakeLists.txt

qt/qmlplugin/oxide.qmltypes

qt/qmlplugin/qmldir

shared/browser/compositor/oxide_compositor.cc

shared/browser/compositor/oxide_compositor.h

shared/browser/compositor/oxide_compositor_client.h

shared/browser/compositor/oxide_compositor_observer.cc

shared/browser/compositor/oxide_compositor_observer.h

shared/browser/input/

shared/browser/input/oxide_ime_bridge.cc

shared/browser/input/oxide_ime_bridge.h

shared/browser/input/oxide_ime_bridge_impl.cc

shared/browser/input/oxide_ime_bridge_impl.h

shared/browser/input/oxide_input_method_context.cc

shared/browser/input/oxide_input_method_context.h

shared/browser/input/oxide_input_method_context_observer.cc

shared/browser/input/oxide_input_method_context_observer.h

shared/browser/oxide_render_widget_host_view.cc

shared/browser/oxide_render_widget_host_view.h

shared/browser/oxide_render_widget_host_view_container.h

shared/browser/oxide_web_contents_view.cc

shared/browser/oxide_web_contents_view.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/browser/oxide_web_view_client.cc

shared/browser/oxide_web_view_client.h

shared/common/oxide_unowned_user_data.h

shared/shared.gyp

Older »