summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-06 20:56:07 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-20 11:05:27 +0100
commitc86631a070b423ea594ca860c05b7ce7c87d82e0 (patch)
treedf63dd51ae0d18bac501ac9ba1b8352854db1947
parent39a0d09358a8cae4a3d65ed13b81a810355571e5 (diff)
Adapt to chromium API changes in refs/branch-heads/1650
This patch also updates src/3rparty to the new snapshot. Change-Id: I56da8d795051a828d7b375e57c4dda8bc570229f Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
m---------src/3rdparty0
-rw-r--r--src/core/dev_tools_http_handler_delegate_qt.cpp4
-rw-r--r--src/core/dev_tools_http_handler_delegate_qt.h2
-rw-r--r--src/core/qtwebengine.gypi2
-rw-r--r--src/core/render_widget_host_view_qt.cpp10
-rw-r--r--src/core/render_widget_host_view_qt.h6
-rw-r--r--src/core/url_request_context_getter_qt.cpp7
7 files changed, 17 insertions, 14 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 9427c1a0222ebd67efef1a2c7990a0fa5c9aac8
+Subproject e4d96858acc5c6c1bfa47fe4a6a3b8bbf986e60
diff --git a/src/core/dev_tools_http_handler_delegate_qt.cpp b/src/core/dev_tools_http_handler_delegate_qt.cpp
index 0603f5dcc..f71f56726 100644
--- a/src/core/dev_tools_http_handler_delegate_qt.cpp
+++ b/src/core/dev_tools_http_handler_delegate_qt.cpp
@@ -102,7 +102,7 @@ std::string DevToolsHttpHandlerDelegateQt::GetViewDescription(content::RenderVie
return std::string();
}
-scoped_refptr<net::StreamListenSocket> DevToolsHttpHandlerDelegateQt::CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name)
+scoped_ptr<net::StreamListenSocket> DevToolsHttpHandlerDelegateQt::CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name)
{
- return NULL;
+ return scoped_ptr<net::StreamListenSocket>();
}
diff --git a/src/core/dev_tools_http_handler_delegate_qt.h b/src/core/dev_tools_http_handler_delegate_qt.h
index e866f0765..9d9212e6d 100644
--- a/src/core/dev_tools_http_handler_delegate_qt.h
+++ b/src/core/dev_tools_http_handler_delegate_qt.h
@@ -70,7 +70,7 @@ public:
virtual content::RenderViewHost* CreateNewTarget() Q_DECL_OVERRIDE;
virtual TargetType GetTargetType(content::RenderViewHost*) Q_DECL_OVERRIDE;
virtual std::string GetViewDescription(content::RenderViewHost*) Q_DECL_OVERRIDE;
- virtual scoped_refptr<net::StreamListenSocket> CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) Q_DECL_OVERRIDE;
+ virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(net::StreamListenSocket::Delegate* delegate, std::string* name) Q_DECL_OVERRIDE;
private:
content::BrowserContext* m_browserContext;
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi
index 8b604a432..394f087fc 100644
--- a/src/core/qtwebengine.gypi
+++ b/src/core/qtwebengine.gypi
@@ -32,7 +32,7 @@
'<(chromium_src_dir)/ui/ui.gyp:ui',
'<(chromium_src_dir)/url/url.gyp:url_lib',
'<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8',
- '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
+ '<(chromium_src_dir)/webkit/support/webkit_support.gyp:glue',
'<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:webkit',
],
'include_dirs': [
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index e8d38d761..15124f9e9 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -55,7 +55,7 @@
#include "content/common/gpu/gpu_messages.h"
#include "content/common/view_messages.h"
#include "third_party/WebKit/public/web/WebCursorInfo.h"
-#include "ui/base/events/event.h"
+#include "ui/events/event.h"
#include "ui/gfx/size_conversions.h"
#include "webkit/common/cursors/webcursor.h"
@@ -460,7 +460,7 @@ void RenderWidgetHostViewQt::SetIsLoading(bool)
// We use WebContentsDelegateQt::LoadingStateChanged to notify about loading state.
}
-void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType type, bool, ui::TextInputMode)
+void RenderWidgetHostViewQt::TextInputTypeChanged(ui::TextInputType type, ui::TextInputMode, bool)
{
m_currentInputType = type;
m_delegate->inputMethodStateChanged(static_cast<bool>(type));
@@ -471,7 +471,7 @@ void RenderWidgetHostViewQt::ImeCancelComposition()
QT_NOT_YET_IMPLEMENTED
}
-void RenderWidgetHostViewQt::ImeCompositionRangeChanged(const ui::Range&, const std::vector<gfx::Rect>&)
+void RenderWidgetHostViewQt::ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&)
{
// FIXME: not implemented?
QT_NOT_YET_IMPLEMENTED
@@ -619,7 +619,7 @@ void RenderWidgetHostViewQt::SetHasHorizontalScrollbar(bool) { }
void RenderWidgetHostViewQt::SetScrollOffsetPinning(bool, bool) { }
-void RenderWidgetHostViewQt::OnAccessibilityNotifications(const std::vector<AccessibilityHostMsg_NotificationParams>&)
+void RenderWidgetHostViewQt::OnAccessibilityEvents(const std::vector<AccessibilityHostMsg_EventParams>&)
{
// We are not using accessibility features at this point.
QT_NOT_USED
@@ -763,7 +763,7 @@ void RenderWidgetHostViewQt::ProcessAckedTouchEvent(const content::TouchEventWit
void RenderWidgetHostViewQt::sendDelegatedFrameAck()
{
cc::CompositorFrameAck ack;
- ack.resources = m_resourcesToRelease;
+ cc::TransferableResource::ReturnResources(m_resourcesToRelease, &ack.resources);
content::RenderWidgetHostImpl::SendSwapCompositorFrameAck(
m_host->GetRoutingID(), m_pendingOutputSurfaceId,
m_host->GetProcess()->GetID(), ack);
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index e7fab3ff5..fc037dfb1 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -133,9 +133,9 @@ public:
virtual void Blur() Q_DECL_OVERRIDE;
virtual void UpdateCursor(const WebCursor&) Q_DECL_OVERRIDE;
virtual void SetIsLoading(bool) Q_DECL_OVERRIDE;
- virtual void TextInputTypeChanged(ui::TextInputType, bool, ui::TextInputMode) Q_DECL_OVERRIDE;
+ virtual void TextInputTypeChanged(ui::TextInputType, ui::TextInputMode, bool) Q_DECL_OVERRIDE;
virtual void ImeCancelComposition() Q_DECL_OVERRIDE;
- virtual void ImeCompositionRangeChanged(const ui::Range&, const std::vector<gfx::Rect>&) Q_DECL_OVERRIDE;
+ virtual void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) Q_DECL_OVERRIDE;
virtual void DidUpdateBackingStore(const gfx::Rect& scroll_rect, const gfx::Vector2d& scroll_delta, const std::vector<gfx::Rect>& copy_rects, const ui::LatencyInfo&) Q_DECL_OVERRIDE;
virtual void RenderProcessGone(base::TerminationStatus, int) Q_DECL_OVERRIDE;
virtual void Destroy() Q_DECL_OVERRIDE;
@@ -157,7 +157,7 @@ public:
virtual gfx::GLSurfaceHandle GetCompositingSurface() Q_DECL_OVERRIDE;
virtual void SetHasHorizontalScrollbar(bool) Q_DECL_OVERRIDE;
virtual void SetScrollOffsetPinning(bool, bool) Q_DECL_OVERRIDE;
- virtual void OnAccessibilityNotifications(const std::vector<AccessibilityHostMsg_NotificationParams>&) Q_DECL_OVERRIDE;
+ virtual void OnAccessibilityEvents(const std::vector<AccessibilityHostMsg_EventParams>&) Q_DECL_OVERRIDE;
virtual void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) Q_DECL_OVERRIDE;
// Overridden from ui::GestureEventHelper.
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index 90219be4e..75ec94e6e 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -43,6 +43,7 @@
#include "base/strings/string_util.h"
#include "base/threading/worker_pool.h"
+#include "base/threading/sequenced_worker_pool.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cookie_store_factory.h"
#include "net/base/cache_type.h"
@@ -95,7 +96,7 @@ net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext()
m_urlRequestContext->set_network_delegate(m_networkDelegate.get());
base::FilePath cookiesPath = m_basePath.Append(FILE_PATH_LITERAL("Cookies"));
- scoped_refptr<net::CookieStore> cookieStore = content::CreatePersistentCookieStore(cookiesPath, true, NULL, NULL);
+ scoped_refptr<net::CookieStore> cookieStore = content::CreatePersistentCookieStore(cookiesPath, true, NULL, NULL, scoped_refptr<base::SequencedTaskRunner>());
cookieStore->GetCookieMonster()->SetPersistSessionCookies(true);
m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get()));
@@ -163,7 +164,9 @@ net::URLRequestContext *URLRequestContextGetterQt::GetURLRequestContext()
m_jobFactory.reset(new net::URLRequestJobFactoryImpl());
m_jobFactory->SetProtocolHandler(chrome::kDataScheme, new net::DataProtocolHandler());
- m_jobFactory->SetProtocolHandler(chrome::kFileScheme, new net::FileProtocolHandler());
+ m_jobFactory->SetProtocolHandler(
+ chrome::kFileScheme,
+ new net::FileProtocolHandler(content::BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior(base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)));
m_jobFactory->SetProtocolHandler(kQrcSchemeQt, new QrcProtocolHandlerQt());
m_jobFactory->SetProtocolHandler(chrome::kFtpScheme, new net::FtpProtocolHandler(
new net::FtpNetworkLayer(m_urlRequestContext->host_resolver())));