diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-21 16:01:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-07 17:08:45 +0000 |
| commit | 93ca852dbf00e93c07269e8cca389bc1222130d3 (patch) | |
| tree | 62b541249b8908d717f877c9adb811930bd78a24 /src/core/common | |
| parent | a24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff) | |
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49.
Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/common')
| -rw-r--r-- | src/core/common/qt_messages.h | 10 | ||||
| -rw-r--r-- | src/core/common/user_script_data.cpp | 2 | ||||
| -rw-r--r-- | src/core/common/user_script_data.h | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h index d76b1c911..b8991a2b3 100644 --- a/src/core/common/qt_messages.h +++ b/src/core/common/qt_messages.h @@ -26,13 +26,13 @@ IPC_STRUCT_TRAITS_END() // These are messages sent from the browser to the renderer process. IPC_MESSAGE_ROUTED1(RenderViewObserverQt_FetchDocumentMarkup, - uint64 /* requestId */) + uint64_t /* requestId */) IPC_MESSAGE_ROUTED1(RenderViewObserverQt_FetchDocumentInnerText, - uint64 /* requestId */) + uint64_t /* requestId */) IPC_MESSAGE_ROUTED1(RenderViewObserverQt_SetBackgroundColor, - uint32 /* color */) + uint32_t /* color */) IPC_MESSAGE_ROUTED1(WebChannelIPCTransport_Install, uint /* worldId */) IPC_MESSAGE_ROUTED1(WebChannelIPCTransport_Uninstall, uint /* worldId */) @@ -54,11 +54,11 @@ IPC_MESSAGE_CONTROL0(UserResourceController_ClearScripts) // These are messages sent from the renderer back to the browser process. IPC_MESSAGE_ROUTED2(RenderViewObserverHostQt_DidFetchDocumentMarkup, - uint64 /* requestId */, + uint64_t /* requestId */, base::string16 /* markup */) IPC_MESSAGE_ROUTED2(RenderViewObserverHostQt_DidFetchDocumentInnerText, - uint64 /* requestId */, + uint64_t /* requestId */, base::string16 /* innerText */) IPC_MESSAGE_ROUTED0(RenderViewObserverHostQt_DidFirstVisuallyNonEmptyLayout) diff --git a/src/core/common/user_script_data.cpp b/src/core/common/user_script_data.cpp index 21047d040..6f4b8cb05 100644 --- a/src/core/common/user_script_data.cpp +++ b/src/core/common/user_script_data.cpp @@ -44,6 +44,6 @@ UserScriptData::UserScriptData() : injectionPoint(AfterLoad) , injectForSubframes(false) , worldId(1) { - static uint64 idCount = 0; + static uint64_t idCount = 0; scriptId = idCount++; } diff --git a/src/core/common/user_script_data.h b/src/core/common/user_script_data.h index b8b6025f0..943d61798 100644 --- a/src/core/common/user_script_data.h +++ b/src/core/common/user_script_data.h @@ -42,7 +42,6 @@ #include <QtCore/QHash> #include <string> -#include "base/basictypes.h" #include "ipc/ipc_message_utils.h" #include "url/gurl.h" @@ -57,10 +56,10 @@ struct UserScriptData { std::string source; GURL url; - /*InjectionPoint*/uint8 injectionPoint; + /*InjectionPoint*/uint8_t injectionPoint; bool injectForSubframes; uint worldId; - uint64 scriptId; + uint64_t scriptId; }; QT_BEGIN_NAMESPACE |