summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-10-08 15:05:00 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-12-11 20:50:49 +0100
commit516b7f310d12e1ab844e314b0f2a98096f872f16 (patch)
tree98adfddaf33991f217f38a6d2ab6b8ea6721b72e /src
parent1fe372cdbdf6a6960e46c7555a9698c6b5d7e758 (diff)
Minor. Fix namespace for user resource controller
Change-Id: If9a6b2ceca41534f28ec1d87093778f16fc31ff0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/renderer/content_renderer_client_qt.h3
-rw-r--r--src/core/renderer/user_resource_controller.cpp4
-rw-r--r--src/core/renderer/user_resource_controller.h7
3 files changed, 9 insertions, 5 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index 3eb6be43a..bb67eb45f 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -73,10 +73,9 @@ namespace content {
struct WebPluginInfo;
}
-class UserResourceController;
-
namespace QtWebEngineCore {
+class UserResourceController;
class RenderThreadObserverQt;
class ContentRendererClientQt
: public content::ContentRendererClient
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index 0c2f9b137..707a7b2c5 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -65,6 +65,8 @@
#include <bitset>
+namespace QtWebEngineCore {
+
static content::RenderView *const globalScriptsIndex = nullptr;
// Scripts meant to run after the load event will be run 500ms after DOMContentLoaded if the load event doesn't come within that delay.
@@ -436,3 +438,5 @@ void UserResourceController::UnregisterMojoInterfaces(
{
associated_interfaces->RemoveInterface(qtwebengine::mojom::UserResourceController::Name_);
}
+
+} // namespace
diff --git a/src/core/renderer/user_resource_controller.h b/src/core/renderer/user_resource_controller.h
index cb1a4d38b..eae1c00e0 100644
--- a/src/core/renderer/user_resource_controller.h
+++ b/src/core/renderer/user_resource_controller.h
@@ -57,6 +57,8 @@ class RenderFrame;
class RenderView;
}
+namespace QtWebEngineCore {
+
class UserResourceController : public content::RenderThreadObserver,
qtwebengine::mojom::UserResourceController
{
@@ -79,8 +81,7 @@ private:
// content::RenderThreadObserver:
void RegisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces) override;
- void
- UnregisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces) override;
+ void UnregisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces) override;
class RenderFrameObserverHelper;
class RenderViewObserverHelper;
@@ -98,5 +99,5 @@ private:
mojo::AssociatedReceiver<qtwebengine::mojom::UserResourceController> m_binding;
friend class RenderFrameObserverHelper;
};
-
+} // namespace
#endif // USER_RESOURCE_CONTROLLER_H