← Back to branch summary

~osomon/oxide/thumbnails

~osomon/oxide/thumbnails

Viewing all changes in revision 464.

Committer: Olivier Tilloy
Date: 2014-06-02 08:49:13 UTC
mfrom: (447.1.132 oxide)
Revision ID: olivier.tilloy@canonical.com-20140602084913-nlnxq9zrm5w5ygzi

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

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

qt/tests/qmltests/api/tst_WebView_icon.qml

qt/tests/qmltests/api/tst_WebView_newViewRequested3.html

qt/tests/qmltests/api/tst_bug1324909.qml

qt/tests/qmltests/api/tst_bug1324909_1.html

qt/tests/qmltests/api/tst_bug1324909_2.html

shared/browser/oxide_web_view_contents_helper.cc

shared/browser/oxide_web_view_contents_helper.h

shared/browser/oxide_web_view_contents_helper_delegate.h

files removed:
.channel

files modified:
CHROMIUM_VERSION

build/common.gypi

patches/dont-use-gl-create-context-robustness.patch

patches/enable-glx-on-ozone.patch

patches/share-gl-resources-with-embedder.patch

patches/support-native-popup-menus.patch

qt/core/api/internal/oxideqwebpreferences_p.cc

qt/core/api/oxideqwebpreferences.cc

qt/core/api/oxideqwebpreferences.h

qt/core/api/oxideqwebpreferences_p.h

qt/core/browser/oxide_qt_content_browser_client.cc

qt/core/browser/oxide_qt_content_browser_client.h

qt/core/browser/oxide_qt_web_preferences.cc

qt/core/browser/oxide_qt_web_preferences.h

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/glue/oxide_qt_web_view_adapter.cc

qt/core/glue/oxide_qt_web_view_adapter.h

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/tests/qmltests/TestWebView.qml

qt/tests/qmltests/api/tst_NavigationRequest.qml

qt/tests/qmltests/api/tst_NewViewRequest.qml

qt/tests/qmltests/api/tst_WebContext_userAgent.qml

qt/tests/qmltests/api/tst_WebView_newViewRequested.qml

release-tool.py

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_context_observer.cc

shared/browser/oxide_browser_context_observer.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_script_message_dispatcher_browser.cc

shared/browser/oxide_script_message_dispatcher_browser.h

shared/browser/oxide_user_agent_override_provider.cc

shared/browser/oxide_user_agent_override_provider.h

shared/browser/oxide_web_preferences.cc

shared/browser/oxide_web_preferences.h

shared/browser/oxide_web_preferences_observer.cc

shared/browser/oxide_web_preferences_observer.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/browser/render_sandbox_host_linux.cc

shared/common/oxide_constants.cc

shared/common/oxide_constants.h

shared/gl/gl_implementation_linux.cc

shared/ozone/oxide_ozone_platform.cc

shared/sandbox_ipc/oxide_sandbox_ipc_process.cc

shared/shared.gyp

Show diffs side-by-side

added added

removed removed

CHROMIUM_VERSION

build/common.gypi

patches/dont-use-gl-create-context-robustness.patch

patches/enable-glx-on-ozone.patch

qt/core/api/internal/oxideqwebpreferences_p.cc

qt/core/api/oxideqwebpreferences.cc

qt/core/api/oxideqwebpreferences.h

qt/core/api/oxideqwebpreferences_p.h

qt/core/browser/oxide_qt_content_browser_client.cc

qt/core/browser/oxide_qt_content_browser_client.h

qt/core/browser/oxide_qt_web_preferences.cc

qt/core/browser/oxide_qt_web_preferences.h

qt/core/browser/oxide_qt_web_view.cc

qt/core/browser/oxide_qt_web_view.h

qt/core/glue/oxide_qt_web_view_adapter.cc

qt/core/glue/oxide_qt_web_view_adapter.h

qt/quick/api/oxideqquickwebview.cc

qt/quick/api/oxideqquickwebview_p.h

qt/quick/api/oxideqquickwebview_p_p.h

qt/tests/qmltests/TestWebView.qml

qt/tests/qmltests/api/tst_NavigationRequest.qml

qt/tests/qmltests/api/tst_NewViewRequest.qml

qt/tests/qmltests/api/tst_WebContext_userAgent.qml

qt/tests/qmltests/api/tst_WebView_icon.html

qt/tests/qmltests/api/tst_WebView_icon.qml

qt/tests/qmltests/api/tst_WebView_newViewRequested.qml

qt/tests/qmltests/api/tst_WebView_newViewRequested3.html

qt/tests/qmltests/api/tst_bug1324909.qml

qt/tests/qmltests/api/tst_bug1324909_1.html

qt/tests/qmltests/api/tst_bug1324909_2.html

release-tool.py

shared/browser/oxide_browser_context.cc

shared/browser/oxide_browser_context.h

shared/browser/oxide_browser_context_observer.cc

shared/browser/oxide_browser_context_observer.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_script_message_dispatcher_browser.cc

shared/browser/oxide_script_message_dispatcher_browser.h

shared/browser/oxide_user_agent_override_provider.cc

shared/browser/oxide_user_agent_override_provider.h

shared/browser/oxide_web_preferences.cc

shared/browser/oxide_web_preferences.h

shared/browser/oxide_web_preferences_observer.cc

shared/browser/oxide_web_preferences_observer.h

shared/browser/oxide_web_view.cc

shared/browser/oxide_web_view.h

shared/browser/oxide_web_view_contents_helper.cc

shared/browser/oxide_web_view_contents_helper.h

shared/browser/oxide_web_view_contents_helper_delegate.h

shared/browser/render_sandbox_host_linux.cc

shared/common/oxide_constants.cc

shared/common/oxide_constants.h

shared/gl/gl_implementation_linux.cc

shared/ozone/oxide_ozone_platform.cc

shared/sandbox_ipc/oxide_sandbox_ipc_process.cc

shared/shared.gyp

Older »