← Back to branch summary

~osomon/oxide/context-menu

~osomon/oxide/context-menu

Viewing all changes in revision 1034.

Committer: Olivier Tilloy
Date: 2015-04-24 11:34:28 UTC
mfrom: (1031.1.24 oxide)
Revision ID: olivier.tilloy@canonical.com-20150424113428-r221y8t5hv083t0n

Merge the latest changes from trunk.

files added:
qt/tests/qmltests/api/tst_NetworkCallbackEvents3.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents6.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents7.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents8.html

qt/tests/qmltests/api/tst_bug1445673.js

qt/tests/qmltests/api/tst_bug1445673.qml

qt/tests/qmltests/crash/tst_bug1442969.html

qt/tests/qmltests/crash/tst_bug1442969.qml

shared/browser/oxide_redirection_intercept_throttle.cc

shared/browser/oxide_redirection_intercept_throttle.h

files removed:
patches/arm-neon.patch

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

qt/tests/qmltests/api/tst_NetworkCallbackEvents.py

shared/browser/oxide_pepper_talk_host.cc

shared/browser/oxide_pepper_talk_host.h

files renamed:
qt/tests/qmltests/api/tst_NetworkCallbackEvents_Redirect.html => qt/tests/qmltests/api/tst_NetworkCallbackEvents4.html

qt/tests/qmltests/api/redirect.py => qt/tests/qmltests/api/tst_NetworkCallbackEvents_redirect.py

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-render-widget-compositor-settings-override.patch

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

patches/load-nss-without-user-db.patch

patches/mediahub-support.patch

patches/port/gl_implementation.patch

patches/port/render_widget_host_view.patch

patches/port/web_contents_view.patch

patches/series

patches/support-native-popup-menus.patch

qt/VERSION

qt/core/api/oxideqnetworkcallbackevents.cc

qt/core/api/oxideqnetworkcallbackevents_p.h

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqstoragepermissionrequest.cc

qt/core/api/oxideqstoragepermissionrequest_p.h

qt/core/browser/oxide_qt_browser_startup.cc

qt/core/browser/oxide_qt_browser_startup.h

qt/core/browser/oxide_qt_script_message.cc

qt/core/browser/oxide_qt_web_context.cc

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/glue/oxide_qt_web_context_proxy_client.h

qt/core/glue/oxide_qt_web_view_proxy.h

qt/core/gpu/oxide_qt_gl_context_dependent.cc

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquicklocationbarcontroller.cc

qt/quick/api/oxideqquicklocationbarcontroller_p.h

qt/quick/api/oxideqquickscriptmessage.cc

qt/quick/api/oxideqquickwebcontext.cc

qt/quick/api/oxideqquickwebcontextdelegateworker.cc

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p_p.h

qt/quick/api/oxidequseragentoverriderequest.cc

qt/quick/api/oxidequseragentoverriderequest_p_p.h

qt/tests/qmltests/TestWebView.qml

qt/tests/qmltests/api/tst_LocationBarController.qml

qt/tests/qmltests/api/tst_NetworkCallbackEvents.js

qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml

qt/tests/qmltests/api/tst_NetworkCallbackEvents1.html

qt/tests/qmltests/api/tst_ScriptMessage.qml

qt/tests/qmltests/api/tst_WebView_loading.qml

shared/browser/compositor/oxide_compositor.cc

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context_delegate.h

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_browser_process_main.h

shared/browser/oxide_io_thread.cc

shared/browser/oxide_javascript_dialog_manager.cc

shared/browser/oxide_javascript_dialog_manager.h

shared/browser/oxide_network_delegate.cc

shared/browser/oxide_pepper_host_factory_browser.cc

shared/browser/oxide_permission_request.cc

shared/browser/oxide_permission_request.h

shared/browser/oxide_resource_dispatcher_host_delegate.cc

shared/browser/oxide_resource_dispatcher_host_delegate.h

shared/browser/oxide_user_agent_override_provider.cc

shared/browser/oxide_user_agent_override_provider.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/common/oxide_content_client.cc

shared/common/oxide_messages.h

shared/common/oxide_paths.cc

shared/common/oxide_paths.h

shared/port/ozone/surface_factory_ozone_oxide.cc

shared/renderer/oxide_content_renderer_client.cc

shared/renderer/oxide_script_message_handler_renderer.cc

shared/renderer/oxide_script_message_manager.cc

shared/renderer/oxide_script_message_request_impl_renderer.cc

shared/renderer/oxide_script_message_request_impl_renderer.h

shared/renderer/oxide_user_script_slave.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/arm-neon.patch

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

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

patches/load-nss-without-user-db.patch

patches/mediahub-support.patch

patches/port/gl_implementation.patch

patches/port/render_widget_host_view.patch

patches/port/web_contents_view.patch

qt/core/api/oxideqnetworkcallbackevents.cc

qt/core/api/oxideqnetworkcallbackevents_p.h

qt/core/api/oxideqpermissionrequest.cc

qt/core/api/oxideqpermissionrequest.h

qt/core/api/oxideqstoragepermissionrequest.cc

qt/core/api/oxideqstoragepermissionrequest_p.h

qt/core/browser/oxide_qt_browser_startup.cc

qt/core/browser/oxide_qt_browser_startup.h

qt/core/browser/oxide_qt_script_message.cc

qt/core/browser/oxide_qt_web_context.cc

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/glue/oxide_qt_web_context_proxy_client.h

qt/core/glue/oxide_qt_web_view_proxy.h

qt/core/gpu/oxide_qt_gl_context_dependent.cc

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquicklocationbarcontroller.cc

qt/quick/api/oxideqquicklocationbarcontroller_p.h

qt/quick/api/oxideqquickscriptmessage.cc

qt/quick/api/oxideqquickwebcontext.cc

qt/quick/api/oxideqquickwebcontextdelegateworker.cc

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p_p.h

qt/quick/api/oxidequseragentoverriderequest.cc

qt/quick/api/oxidequseragentoverriderequest_p_p.h

qt/tests/qmltests/TestWebView.qml

qt/tests/qmltests/api/tst_LocationBarController.qml

qt/tests/qmltests/api/tst_NetworkCallbackEvents.js

qt/tests/qmltests/api/tst_NetworkCallbackEvents.py

qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml

qt/tests/qmltests/api/tst_NetworkCallbackEvents1.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents3.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents4.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents6.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents7.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents8.html

qt/tests/qmltests/api/tst_NetworkCallbackEvents_redirect.py

qt/tests/qmltests/api/tst_ScriptMessage.qml

qt/tests/qmltests/api/tst_WebView_loading.qml

qt/tests/qmltests/api/tst_bug1445673.js

qt/tests/qmltests/api/tst_bug1445673.qml

qt/tests/qmltests/crash/tst_bug1442969.html

qt/tests/qmltests/crash/tst_bug1442969.qml

shared/browser/compositor/oxide_compositor.cc

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context_delegate.h

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_browser_process_main.h

shared/browser/oxide_io_thread.cc

shared/browser/oxide_javascript_dialog_manager.cc

shared/browser/oxide_javascript_dialog_manager.h

shared/browser/oxide_network_delegate.cc

shared/browser/oxide_pepper_host_factory_browser.cc

shared/browser/oxide_pepper_talk_host.cc

shared/browser/oxide_pepper_talk_host.h

shared/browser/oxide_permission_request.cc

shared/browser/oxide_permission_request.h

shared/browser/oxide_redirection_intercept_throttle.cc

shared/browser/oxide_redirection_intercept_throttle.h

shared/browser/oxide_resource_dispatcher_host_delegate.cc

shared/browser/oxide_resource_dispatcher_host_delegate.h

shared/browser/oxide_user_agent_override_provider.cc

shared/browser/oxide_user_agent_override_provider.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/common/oxide_content_client.cc

shared/common/oxide_messages.h

shared/common/oxide_paths.cc

shared/common/oxide_paths.h

shared/port/ozone/surface_factory_ozone_oxide.cc

shared/renderer/oxide_content_renderer_client.cc

shared/renderer/oxide_script_message_handler_renderer.cc

shared/renderer/oxide_script_message_manager.cc

shared/renderer/oxide_script_message_request_impl_renderer.cc

shared/renderer/oxide_script_message_request_impl_renderer.h

shared/renderer/oxide_user_script_slave.cc

shared/shared.gyp

Older »