← Back to branch summary

~osomon/oxide/context-menu

~osomon/oxide/context-menu

Viewing all changes in revision 1036.

Committer: Olivier Tilloy
Date: 2015-05-15 15:03:10 UTC
mfrom: (1031.1.47 oxide)
Revision ID: olivier.tilloy@canonical.com-20150515150310-8ouquayib3ihi7ca

Merge the latest changes from trunk and resolve a conflict.

files added:
qt/core/api/oxideqmediacapturedevice.cc

qt/core/api/oxideqmediacapturedevice.h

qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.py

qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest.html

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest.qml

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest_subframe.html

qt/tests/qmltests/api/tst_WebView_webProcessStatus.qml

qt/tests/qmltests/core/tst_Incognito_cleanup.qml

qt/tests/qmltests/core/tst_Incognito_cookies.qml

qt/tests/qmltests/crash/tst_bug1450021.qml

qt/tests/qmltests/crash/tst_bug1450021_1.html

qt/tests/qmltests/crash/tst_bug1450021_2.html

qt/tests/qmltests/crash/tst_bug1450243.html

qt/tests/qmltests/crash/tst_bug1450243.qml

qt/tests/qmltests/crash/tst_bug1450570.html

qt/tests/qmltests/crash/tst_bug1450570.qml

shared/browser/oxide_touch_event_state.cc

shared/browser/oxide_touch_event_state.h

files removed:
shared/browser/oxide_devtools_manager_delegate.cc

shared/browser/oxide_devtools_manager_delegate.h

shared/browser/oxide_devtools_target.cc

shared/browser/oxide_devtools_target.h

files renamed:
shared/browser/oxide_browser_context_anchor.cc => shared/browser/oxide_browser_context_destroyer.cc

shared/browser/oxide_browser_context_anchor.h => shared/browser/oxide_browser_context_destroyer.h

files modified:
CHROMIUM_VERSION

patches/add-limit-max-decoded-image-bytes-switch.patch

patches/add-should-download-url-to-resource-dispatcher-host.patch

patches/allow-os-override-for-gpu-manager.patch

patches/allow-render-widget-compositor-settings-override.patch

patches/enable-accelerated-canvas-on-arale.patch

patches/port/gl_implementation.patch

patches/port/gpu_info_collector.patch

patches/port/render_widget_host_view.patch

qt/core/api/oxideqloadevent.cc

qt/core/api/oxideqloadevent.h

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqpermissionrequest_p.h

qt/core/browser/oxide_qt_location_provider.cc

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_proxy.h

qt/core/glue/oxide_qt_web_view_proxy_client.h

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquickglobal.cc

qt/quick/api/oxideqquickglobal_p.h

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/tests/qmltests/api/tst_OxideGlobal.qml

qt/tests/qmltests/api/tst_WebView_closeRequested.qml

qt/tests/qmltests/api/tst_WebView_incognito.qml

qt/tests/qmltests/api/tst_WebView_loading.qml

qt/tests/qmltests/core/tst_UnloadHandlers.qml

qt/tests/qmltests/oxide_qml_testing_plugin.cc

qt/tests/runtests.py

shared/browser/compositor/oxide_compositor.cc

shared/browser/compositor/oxide_mailbox_buffer_map.cc

shared/browser/compositor/oxide_mailbox_buffer_map.h

shared/browser/media/oxide_media_web_contents_observer.h

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_main_parts.cc

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_content_browser_client.h

shared/browser/oxide_devtools_http_handler_delegate.cc

shared/browser/oxide_devtools_http_handler_delegate.h

shared/browser/oxide_gesture_provider.cc

shared/browser/oxide_gesture_provider.h

shared/browser/oxide_javascript_dialog.cc

shared/browser/oxide_permission_manager.cc

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_render_widget_host_view_delegate.h

shared/browser/oxide_ssl_host_state_delegate.cc

shared/browser/oxide_ssl_host_state_delegate.h

shared/browser/oxide_web_contents_unloader.cc

shared/browser/oxide_web_contents_unloader.h

shared/browser/oxide_web_frame.cc

shared/browser/oxide_web_frame.h

shared/browser/oxide_web_popup_menu.cc

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/port/gl/gl_surface_oxide_linux.cc

shared/shared.gyp

Show diffs side-by-side

added added

removed removed

CHROMIUM_VERSION

patches/add-limit-max-decoded-image-bytes-switch.patch

patches/add-should-download-url-to-resource-dispatcher-host.patch

patches/allow-os-override-for-gpu-manager.patch

patches/enable-accelerated-canvas-on-arale.patch

patches/port/gl_implementation.patch

patches/port/gpu_info_collector.patch

patches/port/render_widget_host_view.patch

qt/core/api/oxideqloadevent.cc

qt/core/api/oxideqloadevent.h

qt/core/api/oxideqmediacapturedevice.cc

qt/core/api/oxideqmediacapturedevice.h

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqpermissionrequest_p.h

qt/core/browser/oxide_qt_location_provider.cc

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_proxy.h

qt/core/glue/oxide_qt_web_view_proxy_client.h

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquickglobal.cc

qt/quick/api/oxideqquickglobal_p.h

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.py

qt/tests/qmltests/api/tst_LoadEvent_httpStatusCode.qml

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest.html

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest.qml

qt/tests/qmltests/api/tst_MediaAccessPermissionRequest_subframe.html

qt/tests/qmltests/api/tst_OxideGlobal.qml

qt/tests/qmltests/api/tst_WebView_closeRequested.qml

qt/tests/qmltests/api/tst_WebView_incognito.qml

qt/tests/qmltests/api/tst_WebView_loading.qml

qt/tests/qmltests/api/tst_WebView_webProcessStatus.qml

qt/tests/qmltests/core/tst_Incognito_cleanup.qml

qt/tests/qmltests/core/tst_Incognito_cookies.qml

qt/tests/qmltests/core/tst_UnloadHandlers.qml

qt/tests/qmltests/crash/tst_bug1450021.qml

qt/tests/qmltests/crash/tst_bug1450021_1.html

qt/tests/qmltests/crash/tst_bug1450021_2.html

qt/tests/qmltests/crash/tst_bug1450243.html

qt/tests/qmltests/crash/tst_bug1450243.qml

qt/tests/qmltests/crash/tst_bug1450570.html

qt/tests/qmltests/crash/tst_bug1450570.qml

qt/tests/qmltests/oxide_qml_testing_plugin.cc

qt/tests/runtests.py

shared/browser/compositor/oxide_compositor.cc

shared/browser/compositor/oxide_mailbox_buffer_map.cc

shared/browser/compositor/oxide_mailbox_buffer_map.h

shared/browser/media/oxide_media_web_contents_observer.h

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_context_destroyer.cc

shared/browser/oxide_browser_context_destroyer.h

shared/browser/oxide_browser_main_parts.cc

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_content_browser_client.h

shared/browser/oxide_devtools_http_handler_delegate.cc

shared/browser/oxide_devtools_http_handler_delegate.h

shared/browser/oxide_devtools_manager_delegate.cc

shared/browser/oxide_devtools_manager_delegate.h

shared/browser/oxide_devtools_target.cc

shared/browser/oxide_devtools_target.h

shared/browser/oxide_gesture_provider.cc

shared/browser/oxide_gesture_provider.h

shared/browser/oxide_javascript_dialog.cc

shared/browser/oxide_permission_manager.cc

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_render_widget_host_view_delegate.h

shared/browser/oxide_ssl_host_state_delegate.cc

shared/browser/oxide_ssl_host_state_delegate.h

shared/browser/oxide_touch_event_state.cc

shared/browser/oxide_touch_event_state.h

shared/browser/oxide_web_contents_unloader.cc

shared/browser/oxide_web_contents_unloader.h

shared/browser/oxide_web_frame.cc

shared/browser/oxide_web_frame.h

shared/browser/oxide_web_popup_menu.cc

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/port/gl/gl_surface_oxide_linux.cc

shared/shared.gyp

Older »