← Back to branch summary

~osomon/oxide/thumbnails

~osomon/oxide/thumbnails

Viewing all changes in revision 462.

Committer: Olivier Tilloy
Date: 2014-05-28 09:06:11 UTC
mfrom: (447.1.122 trunk)
Revision ID: olivier.tilloy@canonical.com-20140528090611-am21jfj276dxu3e0

Merge the latest changes from trunk and resolve a bunch of conflicts.

files added:
CHROMIUM_VERSION

patches/disable-default-network-location-provider.patch

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqpermissionrequest_p.h

qt/core/browser/native_web_keyboard_event_oxide.cc

qt/core/browser/oxide_qt_location_provider.cc

qt/core/browser/oxide_qt_location_provider.h

qt/core/browser/oxide_qt_location_provider_p.h

qt/tests/mock

qt/tests/mock/CMakeLists.txt

qt/tests/mock/position

qt/tests/mock/position/CMakeLists.txt

qt/tests/mock/position/plugin.cc

qt/tests/mock/position/plugin.h

qt/tests/mock/position/plugin.json

qt/tests/mock/position/source.cc

qt/tests/mock/position/source.h

qt/tests/qmltests/api/tst_GeolocationPermissionRequest.html

qt/tests/qmltests/api/tst_GeolocationPermissionRequest.qml

qt/tests/qmltests/api/tst_WebView_loadHtml.qml

qt/tests/qmltests/core/tst_geolocation.qml

qt/tests/qmltests/core/tst_geolocation_get.html

qt/tests/qmltests/core/tst_geolocation_watch.html

shared/browser/oxide_geolocation_permission_context.cc

shared/browser/oxide_geolocation_permission_context.h

shared/browser/oxide_permission_request.cc

shared/browser/oxide_permission_request.h

third_party

files removed:
build/scripts/run-gyp-all-target.cmake

chromium

gclient.conf

patches/dont-depend-on-gtk.patch

patches/fix-gyp-space-in-object-filename-exception.patch

patches/gyp-support-library-version.patch

files renamed:
build/gyp_oxide.in => build/gyp_oxide

files modified:
.bzrignore

CMakeLists.txt

build/cmake/OxideCommon.cmake

build/common.gypi

build/python/oxide_utils.py

build/python/patch_utils.py

build/scripts/repack_locales.py

build/toolchain_configs/ubuntu-arm-linux-gnueabihf.cmake

client.py

patch-tool.py

patches/add-frame-attached-to-web-contents-observer.patch

patches/fix-gyp-with-different-toplevel.patch

patches/renderer-user-agent-override.patch

patches/series

patches/support-native-popup-menus.patch

qt/VERSION

qt/build/cmake/OxideQtCommon.cmake

qt/core/browser/oxide_qt_content_browser_client.cc

qt/core/browser/oxide_qt_content_browser_client.h

qt/core/browser/oxide_qt_render_widget_host_view.cc

qt/core/browser/oxide_qt_render_widget_host_view.h

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/core.gyp

qt/core/glue/oxide_qt_web_view_adapter.cc

qt/core/glue/oxide_qt_web_view_adapter.h

qt/core/system.gyp

qt/qmlrunner/main.cc

qt/qt.gypi

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/quick/oxide_qml_plugin.cc

qt/quick/oxide_qquick_render_view_item.cc

qt/tests/CMakeLists.txt

qt/tests/qmltests/api/tst_WebView_loadUrl.qml

qt/tests/qmltests/api/tst_WebView_navigation.qml

qt/tests/qmltests/main.cc

qt/tests/qmltests/run-qmltests.cmake

release-tool.py

shared/app/oxide_content_main_delegate.cc

shared/browser/compositor_util.cc

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_context_impl.cc

shared/browser/oxide_browser_context_impl.h

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_content_browser_client.h

shared/browser/oxide_off_the_record_browser_context_impl.cc

shared/browser/oxide_off_the_record_browser_context_impl.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/gl/gl_implementation_linux.cc

shared/renderer/oxide_content_renderer_client.cc

shared/renderer/oxide_content_renderer_client.h

shared/renderer/oxide_script_message_dispatcher_renderer.cc

shared/renderer/oxide_script_message_dispatcher_renderer.h

shared/renderer/oxide_script_message_manager.cc

shared/sandbox_ipc/oxide_sandbox_ipc_process.cc

shared/shared.gyp

shared/shared.gypi

Show diffs side-by-side

added added

removed removed

CHROMIUM_VERSION

build/cmake/OxideCommon.cmake

build/common.gypi

build/gyp_oxide

build/python/oxide_utils.py

build/python/patch_utils.py

build/scripts/repack_locales.py

build/scripts/run-gyp-all-target.cmake

build/toolchain_configs/ubuntu-arm-linux-gnueabihf.cmake

patches/add-frame-attached-to-web-contents-observer.patch

patches/disable-default-network-location-provider.patch

patches/dont-depend-on-gtk.patch

patches/fix-gyp-space-in-object-filename-exception.patch

patches/fix-gyp-with-different-toplevel.patch

patches/gyp-support-library-version.patch

patches/renderer-user-agent-override.patch

qt/build/cmake/OxideQtCommon.cmake

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqpermissionrequest_p.h

qt/core/browser/native_web_keyboard_event_oxide.cc

qt/core/browser/oxide_qt_content_browser_client.cc

qt/core/browser/oxide_qt_content_browser_client.h

qt/core/browser/oxide_qt_location_provider.cc

qt/core/browser/oxide_qt_location_provider.h

qt/core/browser/oxide_qt_location_provider_p.h

qt/core/browser/oxide_qt_render_widget_host_view.cc

qt/core/browser/oxide_qt_render_widget_host_view.h

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/core.gyp

qt/core/glue/oxide_qt_web_view_adapter.cc

qt/core/glue/oxide_qt_web_view_adapter.h

qt/core/system.gyp

qt/qmlrunner/main.cc

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/quick/oxide_qml_plugin.cc

qt/quick/oxide_qquick_render_view_item.cc

qt/tests/CMakeLists.txt

qt/tests/mock/CMakeLists.txt

qt/tests/mock/position/

qt/tests/mock/position/CMakeLists.txt

qt/tests/mock/position/plugin.cc

qt/tests/mock/position/plugin.h

qt/tests/mock/position/plugin.json

qt/tests/mock/position/source.cc

qt/tests/mock/position/source.h

qt/tests/qmltests/api/tst_GeolocationPermissionRequest.html

qt/tests/qmltests/api/tst_GeolocationPermissionRequest.qml

qt/tests/qmltests/api/tst_WebView_loadHtml.qml

qt/tests/qmltests/api/tst_WebView_loadUrl.qml

qt/tests/qmltests/api/tst_WebView_navigation.qml

qt/tests/qmltests/core/tst_geolocation.qml

qt/tests/qmltests/core/tst_geolocation_get.html

qt/tests/qmltests/core/tst_geolocation_watch.html

qt/tests/qmltests/main.cc

qt/tests/qmltests/run-qmltests.cmake

release-tool.py

shared/app/oxide_content_main_delegate.cc

shared/browser/compositor_util.cc

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_context_impl.cc

shared/browser/oxide_browser_context_impl.h

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_content_browser_client.h

shared/browser/oxide_geolocation_permission_context.cc

shared/browser/oxide_geolocation_permission_context.h

shared/browser/oxide_off_the_record_browser_context_impl.cc

shared/browser/oxide_off_the_record_browser_context_impl.h

shared/browser/oxide_permission_request.cc

shared/browser/oxide_permission_request.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/gl/gl_implementation_linux.cc

shared/renderer/oxide_content_renderer_client.cc

shared/renderer/oxide_content_renderer_client.h

shared/renderer/oxide_script_message_dispatcher_renderer.cc

shared/renderer/oxide_script_message_dispatcher_renderer.h

shared/renderer/oxide_script_message_manager.cc

shared/sandbox_ipc/oxide_sandbox_ipc_process.cc

shared/shared.gyp

shared/shared.gypi

Older »