diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-28 13:23:12 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-29 15:42:35 +0000 |
commit | cfee452174c58fe4048b1604503d03de2764fc8e (patch) | |
tree | 2af5a3828061ec45b932cd591efda588ea4d18e5 /src/core/renderer | |
parent | 5bd303616717035f7eab54267d016100d78a5e50 (diff) |
Use consistent naming of Qt-specific Chromium classes
Most of our Qt specific versions of Chromium classes have Qt appended,
but a few observers have it prepended. This patch renames them to keep
naming consistent.
Change-Id: I004b61e16bc47f39a6bbc16a5f5c10585626865c
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/renderer')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 8 | ||||
-rw-r--r-- | src/core/renderer/render_frame_observer_qt.cpp (renamed from src/core/renderer/qt_render_frame_observer.cpp) | 8 | ||||
-rw-r--r-- | src/core/renderer/render_frame_observer_qt.h (renamed from src/core/renderer/qt_render_frame_observer.h) | 14 | ||||
-rw-r--r-- | src/core/renderer/render_view_observer_qt.cpp (renamed from src/core/renderer/qt_render_view_observer.cpp) | 30 | ||||
-rw-r--r-- | src/core/renderer/render_view_observer_qt.h (renamed from src/core/renderer/qt_render_view_observer.h) | 12 |
5 files changed, 36 insertions, 36 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index e281cbc95..261b9c581 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -54,8 +54,8 @@ #include "content/public/common/web_preferences.h" #include "renderer/web_channel_ipc_transport.h" -#include "renderer/qt_render_frame_observer.h" -#include "renderer/qt_render_view_observer.h" +#include "renderer/render_frame_observer_qt.h" +#include "renderer/render_view_observer_qt.h" #include "renderer/user_script_controller.h" #include "grit/renderer_resources.h" @@ -90,14 +90,14 @@ void ContentRendererClientQt::RenderThreadStarted() void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view) { // RenderViewObservers destroy themselves with their RenderView. - new QtRenderViewObserver(render_view, m_webCacheObserver.data()); + new RenderViewObserverQt(render_view, m_webCacheObserver.data()); new WebChannelIPCTransport(render_view); UserScriptController::instance()->renderViewCreated(render_view); } void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame* render_frame) { - new QtWebEngineCore::QtRenderFrameObserver(render_frame); + new QtWebEngineCore::RenderFrameObserverQt(render_frame); } bool ContentRendererClientQt::HasErrorPage(int httpStatusCode, std::string *errorDomain) diff --git a/src/core/renderer/qt_render_frame_observer.cpp b/src/core/renderer/render_frame_observer_qt.cpp index 5f06d1e4e..8130cc53a 100644 --- a/src/core/renderer/qt_render_frame_observer.cpp +++ b/src/core/renderer/render_frame_observer_qt.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qt_render_frame_observer.h" +#include "render_frame_observer_qt.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "ppapi/host/ppapi_host.h" @@ -44,17 +44,17 @@ namespace QtWebEngineCore { -QtRenderFrameObserver::QtRenderFrameObserver(content::RenderFrame* render_frame) +RenderFrameObserverQt::RenderFrameObserverQt(content::RenderFrame* render_frame) : RenderFrameObserver(render_frame) { } -QtRenderFrameObserver::~QtRenderFrameObserver() +RenderFrameObserverQt::~RenderFrameObserverQt() { } #if defined(ENABLE_PLUGINS) -void QtRenderFrameObserver::DidCreatePepperPlugin(content::RendererPpapiHost* host) +void RenderFrameObserverQt::DidCreatePepperPlugin(content::RendererPpapiHost* host) { host->GetPpapiHost()->AddHostFactoryFilter( scoped_ptr<ppapi::host::HostFactory>( diff --git a/src/core/renderer/qt_render_frame_observer.h b/src/core/renderer/render_frame_observer_qt.h index 42f2b7464..4835e442e 100644 --- a/src/core/renderer/qt_render_frame_observer.h +++ b/src/core/renderer/render_frame_observer_qt.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT_RENDER_FRAME_OBSERVER_H -#define QT_RENDER_FRAME_OBSERVER_H +#ifndef RENDER_FRAME_OBSERVER_QT_H +#define RENDER_FRAME_OBSERVER_QT_H #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -48,19 +48,19 @@ class RenderFrame; namespace QtWebEngineCore { -class QtRenderFrameObserver : public content::RenderFrameObserver { +class RenderFrameObserverQt : public content::RenderFrameObserver { public: - explicit QtRenderFrameObserver(content::RenderFrame* render_frame); - ~QtRenderFrameObserver(); + explicit RenderFrameObserverQt(content::RenderFrame* render_frame); + ~RenderFrameObserverQt(); #if defined(ENABLE_PLUGINS) void DidCreatePepperPlugin(content::RendererPpapiHost* host) override; #endif private: - DISALLOW_COPY_AND_ASSIGN(QtRenderFrameObserver); + DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt); }; } // namespace QtWebEngineCore -#endif // QT_RENDER_FRAME_OBSERVER_H +#endif // RENDER_FRAME_OBSERVER_QT_H diff --git a/src/core/renderer/qt_render_view_observer.cpp b/src/core/renderer/render_view_observer_qt.cpp index 086b07d17..47efd07e4 100644 --- a/src/core/renderer/qt_render_view_observer.cpp +++ b/src/core/renderer/render_view_observer_qt.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "renderer/qt_render_view_observer.h" +#include "renderer/render_view_observer_qt.h" #include "common/qt_messages.h" @@ -45,7 +45,7 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -QtRenderViewObserver::QtRenderViewObserver( +RenderViewObserverQt::RenderViewObserverQt( content::RenderView* render_view, web_cache::WebCacheRenderProcessObserver* web_cache_render_process_observer) : content::RenderViewObserver(render_view) @@ -53,45 +53,45 @@ QtRenderViewObserver::QtRenderViewObserver( { } -void QtRenderViewObserver::onFetchDocumentMarkup(quint64 requestId) +void RenderViewObserverQt::onFetchDocumentMarkup(quint64 requestId) { - Send(new QtRenderViewObserverHost_DidFetchDocumentMarkup( + Send(new RenderViewObserverHostQt_DidFetchDocumentMarkup( routing_id(), requestId, render_view()->GetWebView()->mainFrame()->contentAsMarkup())); } -void QtRenderViewObserver::onFetchDocumentInnerText(quint64 requestId) +void RenderViewObserverQt::onFetchDocumentInnerText(quint64 requestId) { - Send(new QtRenderViewObserverHost_DidFetchDocumentInnerText( + Send(new RenderViewObserverHostQt_DidFetchDocumentInnerText( routing_id(), requestId, render_view()->GetWebView()->mainFrame()->contentAsText(std::numeric_limits<std::size_t>::max()))); } -void QtRenderViewObserver::onSetBackgroundColor(quint32 color) +void RenderViewObserverQt::onSetBackgroundColor(quint32 color) { render_view()->GetWebView()->setBaseBackgroundColor(color); } -void QtRenderViewObserver::OnFirstVisuallyNonEmptyLayout() +void RenderViewObserverQt::OnFirstVisuallyNonEmptyLayout() { - Send(new QtRenderViewObserverHost_DidFirstVisuallyNonEmptyLayout(routing_id())); + Send(new RenderViewObserverHostQt_DidFirstVisuallyNonEmptyLayout(routing_id())); } -bool QtRenderViewObserver::OnMessageReceived(const IPC::Message& message) +bool RenderViewObserverQt::OnMessageReceived(const IPC::Message& message) { bool handled = true; - IPC_BEGIN_MESSAGE_MAP(QtRenderViewObserver, message) - IPC_MESSAGE_HANDLER(QtRenderViewObserver_FetchDocumentMarkup, onFetchDocumentMarkup) - IPC_MESSAGE_HANDLER(QtRenderViewObserver_FetchDocumentInnerText, onFetchDocumentInnerText) - IPC_MESSAGE_HANDLER(QtRenderViewObserver_SetBackgroundColor, onSetBackgroundColor) + IPC_BEGIN_MESSAGE_MAP(RenderViewObserverQt, message) + IPC_MESSAGE_HANDLER(RenderViewObserverQt_FetchDocumentMarkup, onFetchDocumentMarkup) + IPC_MESSAGE_HANDLER(RenderViewObserverQt_FetchDocumentInnerText, onFetchDocumentInnerText) + IPC_MESSAGE_HANDLER(RenderViewObserverQt_SetBackgroundColor, onSetBackgroundColor) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; } -void QtRenderViewObserver::Navigate(const GURL &) +void RenderViewObserverQt::Navigate(const GURL &) { if (m_web_cache_render_process_observer) m_web_cache_render_process_observer->ExecutePendingClearCache(); diff --git a/src/core/renderer/qt_render_view_observer.h b/src/core/renderer/render_view_observer_qt.h index 1ead53141..166dcc9ea 100644 --- a/src/core/renderer/qt_render_view_observer.h +++ b/src/core/renderer/render_view_observer_qt.h @@ -33,8 +33,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#ifndef QT_RENDER_VIEW_OBSERVER_H -#define QT_RENDER_VIEW_OBSERVER_H +#ifndef RENDER_VIEW_OBSERVER_QT_H +#define RENDER_VIEW_OBSERVER_QT_H #include "content/public/renderer/render_view_observer.h" @@ -44,9 +44,9 @@ namespace web_cache { class WebCacheRenderProcessObserver; } -class QtRenderViewObserver : public content::RenderViewObserver { +class RenderViewObserverQt : public content::RenderViewObserver { public: - QtRenderViewObserver(content::RenderView* render_view, + RenderViewObserverQt(content::RenderView* render_view, web_cache::WebCacheRenderProcessObserver* web_cache_render_process_observer); private: @@ -61,7 +61,7 @@ private: web_cache::WebCacheRenderProcessObserver* m_web_cache_render_process_observer; - DISALLOW_COPY_AND_ASSIGN(QtRenderViewObserver); + DISALLOW_COPY_AND_ASSIGN(RenderViewObserverQt); }; -#endif // QT_RENDER_VIEW_OBSERVER_H +#endif // RENDER_VIEW_OBSERVER_QT_H |