summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-12 11:58:21 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-04-21 11:10:13 +0000
commita5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch)
tree61a093917f9c8308d2153335d49c58acc3836981
parentd08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff)
Standardize override declaration
Update our overrides to Qt coding standard getting rid of Q_DECL_OVERRIDE and redundant virtual declarations. Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/core/access_token_store_qt.h5
-rw-r--r--src/core/api/qwebenginecallback.h3
-rw-r--r--src/core/browser_accessibility_manager_qt.h4
-rw-r--r--src/core/browser_accessibility_qt.h132
-rw-r--r--src/core/browser_context_qt.h32
-rw-r--r--src/core/browser_message_filter_qt.h4
-rw-r--r--src/core/clipboard_qt.h42
-rw-r--r--src/core/color_chooser_qt.h4
-rw-r--r--src/core/content_browser_client_qt.cpp42
-rw-r--r--src/core/content_browser_client_qt.h38
-rw-r--r--src/core/content_client_qt.h13
-rw-r--r--src/core/content_main_delegate_qt.h10
-rw-r--r--src/core/custom_protocol_handler.h2
-rw-r--r--src/core/delegated_frame_node.cpp41
-rw-r--r--src/core/desktop_screen_qt.cpp2
-rw-r--r--src/core/desktop_screen_qt.h24
-rw-r--r--src/core/download_manager_delegate_qt.h14
-rw-r--r--src/core/gl_surface_qt.cpp36
-rw-r--r--src/core/gl_surface_qt.h12
-rw-r--r--src/core/javascript_dialog_manager_qt.h14
-rw-r--r--src/core/media_capture_devices_dispatcher.h28
-rw-r--r--src/core/qrc_protocol_handler_qt.h4
-rw-r--r--src/core/render_view_observer_host_qt.h2
-rw-r--r--src/core/render_widget_host_view_qt.cpp48
-rw-r--r--src/core/render_widget_host_view_qt.h120
-rw-r--r--src/core/renderer/content_renderer_client_qt.h25
-rw-r--r--src/core/renderer/render_view_observer_qt.h6
-rw-r--r--src/core/renderer/user_resource_controller.cpp12
-rw-r--r--src/core/renderer/user_resource_controller.h1
-rw-r--r--src/core/renderer/web_channel_ipc_transport.h9
-rw-r--r--src/core/renderer_host/resource_dispatcher_host_delegate_qt.h2
-rw-r--r--src/core/renderer_host/user_resource_controller_host.cpp2
-rw-r--r--src/core/renderer_host/web_channel_ipc_transport_host.h6
-rw-r--r--src/core/resource_context_qt.h6
-rw-r--r--src/core/stream_video_node.cpp6
-rw-r--r--src/core/stream_video_node.h4
-rw-r--r--src/core/surface_factory_qt.h6
-rw-r--r--src/core/url_request_context_getter_qt.h4
-rw-r--r--src/core/url_request_custom_job.h13
-rw-r--r--src/core/url_request_qrc_job_qt.h9
-rw-r--r--src/core/web_contents_delegate_qt.h76
-rw-r--r--src/core/web_contents_view_qt.h56
-rw-r--r--src/core/yuv_video_node.cpp16
-rw-r--r--src/core/yuv_video_node.h12
44 files changed, 466 insertions, 481 deletions
diff --git a/src/core/access_token_store_qt.h b/src/core/access_token_store_qt.h
index ced69a2b..74fc0c89 100644
--- a/src/core/access_token_store_qt.h
+++ b/src/core/access_token_store_qt.h
@@ -43,7 +43,6 @@
#include "base/memory/ref_counted.h"
#include "device/geolocation/access_token_store.h"
-#include <QtCore/qcompilerdetection.h>
#include <QtCore/QFile>
#include <QtCore/QScopedPointer>
@@ -58,8 +57,8 @@ public:
AccessTokenStoreQt();
~AccessTokenStoreQt();
- virtual void LoadAccessTokens(const LoadAccessTokensCallback& request) Q_DECL_OVERRIDE;
- virtual void SaveAccessToken(const GURL& serverUrl, const base::string16& accessToken) Q_DECL_OVERRIDE;
+ void LoadAccessTokens(const LoadAccessTokensCallback& request) override;
+ void SaveAccessToken(const GURL& serverUrl, const base::string16& accessToken) override;
private:
void performWorkOnUIThread();
diff --git a/src/core/api/qwebenginecallback.h b/src/core/api/qwebenginecallback.h
index 9c7e43b9..b967f926 100644
--- a/src/core/api/qwebenginecallback.h
+++ b/src/core/api/qwebenginecallback.h
@@ -42,7 +42,6 @@
#include <QtWebEngineCore/qtwebenginecoreglobal.h>
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
#include <QtCore/qshareddata.h>
#include <QtCore/qstring.h>
#include <QtCore/qvariant.h>
@@ -69,7 +68,7 @@ public:
QWebEngineCallbackPrivate(F callable)
: m_callable(callable)
{}
- virtual void operator()(T value) Q_DECL_OVERRIDE { m_callable(value); }
+ void operator()(T value) override { m_callable(value); }
private:
F m_callable;
};
diff --git a/src/core/browser_accessibility_manager_qt.h b/src/core/browser_accessibility_manager_qt.h
index da50de9c..239d7344 100644
--- a/src/core/browser_accessibility_manager_qt.h
+++ b/src/core/browser_accessibility_manager_qt.h
@@ -53,7 +53,7 @@ namespace content {
class BrowserAccessibilityFactoryQt : public BrowserAccessibilityFactory
{
public:
- BrowserAccessibility* Create() Q_DECL_OVERRIDE;
+ BrowserAccessibility* Create() override;
};
class BrowserAccessibilityManagerQt : public BrowserAccessibilityManager
@@ -66,7 +66,7 @@ public:
void NotifyAccessibilityEvent(BrowserAccessibilityEvent::Source source,
ui::AXEvent event_type,
- BrowserAccessibility* node) Q_DECL_OVERRIDE;
+ BrowserAccessibility* node) override;
QAccessibleInterface *rootParentAccessible();
diff --git a/src/core/browser_accessibility_qt.h b/src/core/browser_accessibility_qt.h
index 186bd7d8..167165ac 100644
--- a/src/core/browser_accessibility_qt.h
+++ b/src/core/browser_accessibility_qt.h
@@ -59,89 +59,89 @@ public:
BrowserAccessibilityQt();
// QAccessibleInterface
- virtual bool isValid() const Q_DECL_OVERRIDE;
- virtual QObject *object() const Q_DECL_OVERRIDE;
- virtual QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
- virtual void *interface_cast(QAccessible::InterfaceType type) Q_DECL_OVERRIDE;
+ bool isValid() const override;
+ QObject *object() const override;
+ QAccessibleInterface *childAt(int x, int y) const override;
+ void *interface_cast(QAccessible::InterfaceType type) override;
// navigation, hierarchy
- virtual QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
- virtual QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
- virtual int childCount() const Q_DECL_OVERRIDE;
- virtual int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE;
+ QAccessibleInterface *parent() const override;
+ QAccessibleInterface *child(int index) const override;
+ int childCount() const override;
+ int indexOfChild(const QAccessibleInterface *) const override;
// properties and state
- virtual QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
- virtual void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
- virtual QRect rect() const Q_DECL_OVERRIDE;
- virtual QAccessible::Role role() const Q_DECL_OVERRIDE;
- virtual QAccessible::State state() const Q_DECL_OVERRIDE;
+ QString text(QAccessible::Text t) const override;
+ void setText(QAccessible::Text t, const QString &text) override;
+ QRect rect() const override;
+ QAccessible::Role role() const override;
+ QAccessible::State state() const override;
// BrowserAccessible
- void NativeAddReference() Q_DECL_OVERRIDE;
- void NativeReleaseReference() Q_DECL_OVERRIDE;
- bool IsNative() const Q_DECL_OVERRIDE { return true; }
+ void NativeAddReference() override;
+ void NativeReleaseReference() override;
+ bool IsNative() const override { return true; }
// QAccessibleActionInterface
- QStringList actionNames() const Q_DECL_OVERRIDE;
- void doAction(const QString &actionName) Q_DECL_OVERRIDE;
- QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
+ QStringList actionNames() const override;
+ void doAction(const QString &actionName) override;
+ QStringList keyBindingsForAction(const QString &actionName) const override;
// QAccessibleTextInterface
- void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE;
- QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
- int cursorPosition() const Q_DECL_OVERRIDE;
- QRect characterRect(int offset) const Q_DECL_OVERRIDE;
- int selectionCount() const Q_DECL_OVERRIDE;
- int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE;
- void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
- QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE;
- void removeSelection(int selectionIndex) Q_DECL_OVERRIDE;
- void setCursorPosition(int position) Q_DECL_OVERRIDE;
- void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE;
- int characterCount() const Q_DECL_OVERRIDE;
- void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE;
+ void addSelection(int startOffset, int endOffset) override;
+ QString attributes(int offset, int *startOffset, int *endOffset) const override;
+ int cursorPosition() const override;
+ QRect characterRect(int offset) const override;
+ int selectionCount() const override;
+ int offsetAtPoint(const QPoint &point) const override;
+ void selection(int selectionIndex, int *startOffset, int *endOffset) const override;
+ QString text(int startOffset, int endOffset) const override;
+ void removeSelection(int selectionIndex) override;
+ void setCursorPosition(int position) override;
+ void setSelection(int selectionIndex, int startOffset, int endOffset) override;
+ int characterCount() const override;
+ void scrollToSubstring(int startIndex, int endIndex) override;
// QAccessibleValueInterface
- QVariant currentValue() const Q_DECL_OVERRIDE;
- void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE;
- QVariant maximumValue() const Q_DECL_OVERRIDE;
- QVariant minimumValue() const Q_DECL_OVERRIDE;
- QVariant minimumStepSize() const Q_DECL_OVERRIDE;
+ QVariant currentValue() const override;
+ void setCurrentValue(const QVariant &value) override;
+ QVariant maximumValue() const override;
+ QVariant minimumValue() const override;
+ QVariant minimumStepSize() const override;
// QAccessibleTableInterface
- virtual QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE;
- virtual QAccessibleInterface *caption() const Q_DECL_OVERRIDE;
- virtual QAccessibleInterface *summary() const Q_DECL_OVERRIDE;
- virtual QString columnDescription(int column) const Q_DECL_OVERRIDE;
- virtual QString rowDescription(int row) const Q_DECL_OVERRIDE;
- virtual int columnCount() const Q_DECL_OVERRIDE;
- virtual int rowCount() const Q_DECL_OVERRIDE;
+ QAccessibleInterface *cellAt(int row, int column) const override;
+ QAccessibleInterface *caption() const override;
+ QAccessibleInterface *summary() const override;
+ QString columnDescription(int column) const override;
+ QString rowDescription(int row) const override;
+ int columnCount() const override;
+ int rowCount() const override;
// selection
- virtual int selectedCellCount() const Q_DECL_OVERRIDE;
- virtual int selectedColumnCount() const Q_DECL_OVERRIDE;
- virtual int selectedRowCount() const Q_DECL_OVERRIDE;
- virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE;
- virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE;
- virtual QList<int> selectedRows() const Q_DECL_OVERRIDE;
- virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE;
- virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE;
- virtual bool selectRow(int row) Q_DECL_OVERRIDE;
- virtual bool selectColumn(int column) Q_DECL_OVERRIDE;
- virtual bool unselectRow(int row) Q_DECL_OVERRIDE;
- virtual bool unselectColumn(int column) Q_DECL_OVERRIDE;
+ int selectedCellCount() const override;
+ int selectedColumnCount() const override;
+ int selectedRowCount() const override;
+ QList<QAccessibleInterface*> selectedCells() const override;
+ QList<int> selectedColumns() const override;
+ QList<int> selectedRows() const override;
+ bool isColumnSelected(int column) const override;
+ bool isRowSelected(int row) const override;
+ bool selectRow(int row) override;
+ bool selectColumn(int column) override;
+ bool unselectRow(int row) override;
+ bool unselectColumn(int column) override;
// QAccessibleTableCellInterface
- virtual int columnExtent() const Q_DECL_OVERRIDE;
- virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE;
- virtual int columnIndex() const Q_DECL_OVERRIDE;
- virtual int rowExtent() const Q_DECL_OVERRIDE;
- virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE;
- virtual int rowIndex() const Q_DECL_OVERRIDE;
- virtual bool isSelected() const Q_DECL_OVERRIDE;
- virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE;
-
- virtual void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE;
+ int columnExtent() const override;
+ QList<QAccessibleInterface*> columnHeaderCells() const override;
+ int columnIndex() const override;
+ int rowExtent() const override;
+ QList<QAccessibleInterface*> rowHeaderCells() const override;
+ int rowIndex() const override;
+ bool isSelected() const override;
+ QAccessibleInterface* table() const override;
+
+ void modelChange(QAccessibleTableModelChangeEvent *event) override;
};
}
diff --git a/src/core/browser_context_qt.h b/src/core/browser_context_qt.h
index 8e46fea8..af250f50 100644
--- a/src/core/browser_context_qt.h
+++ b/src/core/browser_context_qt.h
@@ -45,7 +45,7 @@
#include "content/public/browser/resource_context.h"
#include "net/url_request/url_request_context.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtGlobal>
QT_BEGIN_NAMESPACE
class QStringList;
@@ -68,29 +68,29 @@ public:
virtual ~BrowserContextQt();
// BrowserContext implementation:
- virtual base::FilePath GetPath() const Q_DECL_OVERRIDE;
+ base::FilePath GetPath() const override;
base::FilePath GetCachePath() const;
- virtual bool IsOffTheRecord() const Q_DECL_OVERRIDE;
+ bool IsOffTheRecord() const override;
- virtual net::URLRequestContextGetter *CreateMediaRequestContext() Q_DECL_OVERRIDE;
- virtual net::URLRequestContextGetter *CreateMediaRequestContextForStoragePartition(const base::FilePath& partition_path, bool in_memory) Q_DECL_OVERRIDE;
+ net::URLRequestContextGetter *CreateMediaRequestContext() override;
+ net::URLRequestContextGetter *CreateMediaRequestContextForStoragePartition(const base::FilePath& partition_path, bool in_memory) override;
- virtual content::ResourceContext *GetResourceContext() Q_DECL_OVERRIDE;
- virtual content::DownloadManagerDelegate *GetDownloadManagerDelegate() Q_DECL_OVERRIDE;
- virtual content::BrowserPluginGuestManager* GetGuestManager() Q_DECL_OVERRIDE;
- virtual storage::SpecialStoragePolicy *GetSpecialStoragePolicy() Q_DECL_OVERRIDE;
- virtual content::PushMessagingService* GetPushMessagingService() Q_DECL_OVERRIDE;
- virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() Q_DECL_OVERRIDE;
+ content::ResourceContext *GetResourceContext() override;
+ content::DownloadManagerDelegate *GetDownloadManagerDelegate() override;
+ content::BrowserPluginGuestManager* GetGuestManager() override;
+ storage::SpecialStoragePolicy *GetSpecialStoragePolicy() override;
+ content::PushMessagingService* GetPushMessagingService() override;
+ content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
net::URLRequestContextGetter *CreateRequestContext(
content::ProtocolHandlerMap *protocol_handlers,
- content::URLRequestInterceptorScopedVector request_interceptors) Q_DECL_OVERRIDE;
+ content::URLRequestInterceptorScopedVector request_interceptors) override;
net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
const base::FilePath& partition_path, bool in_memory,
content::ProtocolHandlerMap* protocol_handlers,
- content::URLRequestInterceptorScopedVector request_interceptors) Q_DECL_OVERRIDE;
- virtual std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(const base::FilePath& partition_path) Q_DECL_OVERRIDE;
- virtual content::PermissionManager *GetPermissionManager() Q_DECL_OVERRIDE;
- virtual content::BackgroundSyncController* GetBackgroundSyncController() Q_DECL_OVERRIDE;
+ content::URLRequestInterceptorScopedVector request_interceptors) override;
+ std::unique_ptr<content::ZoomLevelDelegate> CreateZoomLevelDelegate(const base::FilePath& partition_path) override;
+ content::PermissionManager *GetPermissionManager() override;
+ content::BackgroundSyncController* GetBackgroundSyncController() override;
// Profile implementation:
PrefService* GetPrefs() override;
diff --git a/src/core/browser_message_filter_qt.h b/src/core/browser_message_filter_qt.h
index fe4897ec..054625c9 100644
--- a/src/core/browser_message_filter_qt.h
+++ b/src/core/browser_message_filter_qt.h
@@ -43,8 +43,6 @@
#include "content/public/browser/browser_message_filter.h"
#include "ppapi/features/features.h"
-#include <QtGlobal>
-
namespace QtWebEngineCore {
class BrowserMessageFilterQt : public content::BrowserMessageFilter
@@ -53,7 +51,7 @@ public:
BrowserMessageFilterQt(int render_process_id);
private:
- bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
#if BUILDFLAG(ENABLE_PEPPER_CDMS)
// Returns whether any internal plugin supporting |mime_type| is registered
// and enabled. Does not determine whether the plugin can actually be
diff --git a/src/core/clipboard_qt.h b/src/core/clipboard_qt.h
index 6af4193d..c2ced494 100644
--- a/src/core/clipboard_qt.h
+++ b/src/core/clipboard_qt.h
@@ -65,32 +65,32 @@ private:
class ClipboardQt : public ui::Clipboard {
public:
- virtual uint64_t GetSequenceNumber(ui::ClipboardType type) const Q_DECL_OVERRIDE;
- virtual bool IsFormatAvailable(const FormatType& format, ui::ClipboardType type) const Q_DECL_OVERRIDE;
- virtual void Clear(ui::ClipboardType type) Q_DECL_OVERRIDE;
- virtual void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, bool* contains_filenames) const Q_DECL_OVERRIDE;
- virtual void ReadText(ui::ClipboardType type, base::string16* result) const Q_DECL_OVERRIDE;
- virtual void ReadAsciiText(ui::ClipboardType type, std::string* result) const Q_DECL_OVERRIDE;
- virtual void ReadHTML(ui::ClipboardType type,
+ uint64_t GetSequenceNumber(ui::ClipboardType type) const override;
+ bool IsFormatAvailable(const FormatType& format, ui::ClipboardType type) const override;
+ void Clear(ui::ClipboardType type) override;
+ void ReadAvailableTypes(ui::ClipboardType type, std::vector<base::string16>* types, bool* contains_filenames) const override;
+ void ReadText(ui::ClipboardType type, base::string16* result) const override;
+ void ReadAsciiText(ui::ClipboardType type, std::string* result) const override;
+ void ReadHTML(ui::ClipboardType type,
base::string16* markup,
std::string* src_url,
uint32_t* fragment_start,
- uint32_t* fragment_end) const Q_DECL_OVERRIDE;
- virtual void ReadRTF(ui::ClipboardType type, std::string* result) const Q_DECL_OVERRIDE;
- virtual SkBitmap ReadImage(ui::ClipboardType type) const Q_DECL_OVERRIDE;
- virtual void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16& type, base::string16* result) const Q_DECL_OVERRIDE;
- virtual void ReadBookmark(base::string16* title, std::string* url) const Q_DECL_OVERRIDE;
- virtual void ReadData(const FormatType& format, std::string* result) const Q_DECL_OVERRIDE;
+ uint32_t* fragment_end) const override;
+ void ReadRTF(ui::ClipboardType type, std::string* result) const override;
+ SkBitmap ReadImage(ui::ClipboardType type) const override;
+ void ReadCustomData(ui::ClipboardType clipboard_type, const base::string16& type, base::string16* result) const override;
+ void ReadBookmark(base::string16* title, std::string* url) const override;
+ void ReadData(const FormatType& format, std::string* result) const override;
protected:
- virtual void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) Q_DECL_OVERRIDE;
- virtual void WriteText(const char* text_data, size_t text_len) Q_DECL_OVERRIDE;
- virtual void WriteHTML(const char* markup_data, size_t markup_len, const char* url_data, size_t url_len) Q_DECL_OVERRIDE;
- virtual void WriteRTF(const char* rtf_data, size_t data_len) Q_DECL_OVERRIDE;
- virtual void WriteBookmark(const char* title_data, size_t title_len, const char* url_data, size_t url_len) Q_DECL_OVERRIDE;
- virtual void WriteWebSmartPaste() Q_DECL_OVERRIDE;
- virtual void WriteBitmap(const SkBitmap& bitmap) Q_DECL_OVERRIDE;
- virtual void WriteData(const FormatType& format, const char* data_data, size_t data_len) Q_DECL_OVERRIDE;
+ void WriteObjects(ui::ClipboardType type, const ObjectMap& objects) override;
+ void WriteText(const char* text_data, size_t text_len) override;
+ void WriteHTML(const char* markup_data, size_t markup_len, const char* url_data, size_t url_len) override;
+ void WriteRTF(const char* rtf_data, size_t data_len) override;
+ void WriteBookmark(const char* title_data, size_t title_len, const char* url_data, size_t url_len) override;
+ void WriteWebSmartPaste() override;
+ void WriteBitmap(const SkBitmap& bitmap) override;
+ void WriteData(const FormatType& format, const char* data_data, size_t data_len) override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/color_chooser_qt.h b/src/core/color_chooser_qt.h
index cd9f81fa..200db326 100644
--- a/src/core/color_chooser_qt.h
+++ b/src/core/color_chooser_qt.h
@@ -59,8 +59,8 @@ class ColorChooserQt : public content::ColorChooser
public:
ColorChooserQt(content::WebContents *, const QColor &);
- virtual void SetSelectedColor(SkColor color) Q_DECL_OVERRIDE { }
- virtual void End() Q_DECL_OVERRIDE {}
+ void SetSelectedColor(SkColor /*color*/) override { }
+ void End() override {}
QSharedPointer<ColorChooserController> controller();
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index de6e29de..d446d8ff 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -159,7 +159,7 @@ public:
{
}
- virtual void Run(Delegate *delegate) Q_DECL_OVERRIDE
+ void Run(Delegate *delegate) override
{
Q_ASSERT(delegate == m_delegate);
// This is used only when MessagePumpForUIQt is used outside of the GUI thread.
@@ -169,18 +169,18 @@ public:
m_explicitLoop = 0;
}
- virtual void Quit() Q_DECL_OVERRIDE
+ void Quit() override
{
Q_ASSERT(m_explicitLoop);
m_explicitLoop->quit();
}
- virtual void ScheduleWork() Q_DECL_OVERRIDE
+ void ScheduleWork() override
{
QCoreApplication::postEvent(this, new QEvent(QEvent::User));
}
- virtual void ScheduleDelayedWork(const base::TimeTicks &delayed_work_time) Q_DECL_OVERRIDE
+ void ScheduleDelayedWork(const base::TimeTicks &delayed_work_time) override
{
if (delayed_work_time.is_null()) {
killTimer(m_timerId);
@@ -194,13 +194,13 @@ public:
}
protected:
- virtual void customEvent(QEvent *ev) Q_DECL_OVERRIDE
+ void customEvent(QEvent *ev) override
{
if (handleScheduledWork())
QCoreApplication::postEvent(this, new QEvent(QEvent::User));
}
- virtual void timerEvent(QTimerEvent *ev) Q_DECL_OVERRIDE
+ void timerEvent(QTimerEvent *ev) override
{
Q_ASSERT(m_timerId == ev->timerId());
killTimer(m_timerId);
@@ -271,24 +271,24 @@ public:
: content::BrowserMainParts()
{ }
- void PreMainMessageLoopStart() Q_DECL_OVERRIDE
+ void PreMainMessageLoopStart() override
{
base::MessageLoop::InitMessagePumpForUIFactory(messagePumpFactory);
}
- void PreMainMessageLoopRun() Q_DECL_OVERRIDE
+ void PreMainMessageLoopRun() override
{
device::GeolocationProvider::SetGeolocationDelegate(new GeolocationDelegateQt());
}
- void PostMainMessageLoopRun()
+ void PostMainMessageLoopRun() override
{
// The BrowserContext's destructor uses the MessageLoop so it should be deleted
// right before the RenderProcessHostImpl's destructor destroys it.
WebEngineContext::current()->destroyBrowserContext();
}
- int PreCreateThreads() Q_DECL_OVERRIDE
+ int PreCreateThreads() override
{
base::ThreadRestrictions::SetIOAllowed(true);
// Like ChromeBrowserMainExtraPartsViews::PreCreateThreads does.
@@ -333,17 +333,17 @@ public:
}
}
- virtual void* GetHandle() Q_DECL_OVERRIDE { return m_handle; }
+ void* GetHandle() override { return m_handle; }
// Qt currently never creates contexts using robustness attributes.
- virtual bool WasAllocatedUsingRobustnessExtension() { return false; }
+ bool WasAllocatedUsingRobustnessExtension() override { return false; }
// We don't care about the rest, this context shouldn't be used except for its handle.
- virtual bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; }
- virtual bool MakeCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; }
- virtual void ReleaseCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); }
- virtual bool IsCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; }
- virtual void OnSetSwapInterval(int) Q_DECL_OVERRIDE { Q_UNREACHABLE(); }
- virtual scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() Q_DECL_OVERRIDE
+ bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) override { Q_UNREACHABLE(); return false; }
+ bool MakeCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); return false; }
+ void ReleaseCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); }
+ bool IsCurrent(gl::GLSurface *) override { Q_UNREACHABLE(); return false; }
+ void OnSetSwapInterval(int) override { Q_UNREACHABLE(); }
+ scoped_refptr<gl::GPUTimingClient> CreateGPUTimingClient() override
{
return nullptr;
}
@@ -354,8 +354,8 @@ private:
class ShareGroupQtQuick : public gl::GLShareGroup {
public:
- virtual gl::GLContext* GetContext() Q_DECL_OVERRIDE { return m_shareContextQtQuick.get(); }
- virtual void AboutToAddFirstContext() Q_DECL_OVERRIDE;
+ gl::GLContext* GetContext() override { return m_shareContextQtQuick.get(); }
+ void AboutToAddFirstContext() override;
private:
scoped_refptr<QtShareGLContext> m_shareContextQtQuick;
@@ -375,7 +375,7 @@ void ShareGroupQtQuick::AboutToAddFirstContext()
class QuotaPermissionContextQt : public content::QuotaPermissionContext {
public:
- virtual void RequestQuotaPermission(const content::StorageQuotaParams &params, int render_process_id, const PermissionCallback &callback) Q_DECL_OVERRIDE
+ void RequestQuotaPermission(const content::StorageQuotaParams &params, int render_process_id, const PermissionCallback &callback) override
{
Q_UNUSED(params);
Q_UNUSED(render_process_id);
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index 80ae6057..b17dd3e3 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -43,7 +43,7 @@
#include "base/memory/ref_counted.h"
#include "content/public/browser/content_browser_client.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtGlobal>
namespace net {
class URLRequestContextGetter;
@@ -87,14 +87,14 @@ public:
ContentBrowserClientQt();
~ContentBrowserClientQt();
static ContentBrowserClientQt* Get();
- virtual content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams&) Q_DECL_OVERRIDE;
- virtual void RenderProcessWillLaunch(content::RenderProcessHost* host) Q_DECL_OVERRIDE;
- virtual void ResourceDispatcherHostCreated() Q_DECL_OVERRIDE;
- virtual gl::GLShareGroup* GetInProcessGpuShareGroup() Q_DECL_OVERRIDE;
- virtual content::MediaObserver* GetMediaObserver() Q_DECL_OVERRIDE;
- virtual content::QuotaPermissionContext *CreateQuotaPermissionContext() Q_DECL_OVERRIDE;
- virtual void OverrideWebkitPrefs(content::RenderViewHost *, content::WebPreferences *) Q_DECL_OVERRIDE;
- virtual void AllowCertificateError(content::WebContents* web_contents,
+ content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams&) override;
+ void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
+ void ResourceDispatcherHostCreated() override;
+ gl::GLShareGroup* GetInProcessGpuShareGroup() override;
+ content::MediaObserver* GetMediaObserver() override;
+ content::QuotaPermissionContext *CreateQuotaPermissionContext() override;
+ void OverrideWebkitPrefs(content::RenderViewHost *, content::WebPreferences *) override;
+ void AllowCertificateError(content::WebContents* web_contents,
int cert_error,
const net::SSLInfo& ssl_info,
const GURL& request_url,
@@ -102,25 +102,25 @@ public:
bool overridable,
bool strict_enforcement,
bool expired_previous_decision,
- const base::Callback<void(content::CertificateRequestResultType)>& callback) Q_DECL_OVERRIDE;
- virtual void SelectClientCertificate(content::WebContents* web_contents,
+ const base::Callback<void(content::CertificateRequestResultType)>& callback) override;
+ void SelectClientCertificate(content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info,
- std::unique_ptr<content::ClientCertificateDelegate> delegate) Q_DECL_OVERRIDE;
- content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() Q_DECL_OVERRIDE;
+ std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
+ content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() override;
- virtual std::string GetApplicationLocale() Q_DECL_OVERRIDE;
- std::string GetAcceptLangs(content::BrowserContext* context) Q_DECL_OVERRIDE;
- virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) Q_DECL_OVERRIDE;
- virtual void GetAdditionalWebUISchemes(std::vector<std::string>* additional_schemes) Q_DECL_OVERRIDE;
+ std::string GetApplicationLocale() override;
+ std::string GetAcceptLangs(content::BrowserContext* context) override;
+ void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) override;
+ void GetAdditionalWebUISchemes(std::vector<std::string>* additional_schemes) override;
void RegisterRenderFrameMojoInterfaces(service_manager::InterfaceRegistry* registry, content::RenderFrameHost* render_frame_host) override;
#if defined(Q_OS_LINUX)
- virtual void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::FileDescriptorInfo* mappings) Q_DECL_OVERRIDE;
+ void GetAdditionalMappedFilesForChildProcess(const base::CommandLine& command_line, int child_process_id, content::FileDescriptorInfo* mappings) override;
#endif
#if defined(ENABLE_PLUGINS)
- virtual void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) Q_DECL_OVERRIDE;
+ void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override;
#endif
private:
diff --git a/src/core/content_client_qt.h b/src/core/content_client_qt.h
index 4fd539bf..7104b98b 100644
--- a/src/core/content_client_qt.h
+++ b/src/core/content_client_qt.h
@@ -43,7 +43,6 @@
#include "base/strings/string_piece.h"
#include "content/public/common/content_client.h"
#include "ui/base/layout.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
namespace QtWebEngineCore {
@@ -52,14 +51,14 @@ public:
static std::string getUserAgent();
#if defined(ENABLE_PLUGINS)
- virtual void AddPepperPlugins(std::vector<content::PepperPluginInfo>* plugins) Q_DECL_OVERRIDE;
+ void AddPepperPlugins(std::vector<content::PepperPluginInfo>* plugins) override;
#endif
- virtual base::StringPiece GetDataResource(int, ui::ScaleFactor) const Q_DECL_OVERRIDE;
- virtual base::RefCountedMemory* GetDataResourceBytes(int resource_id) const Q_DECL_OVERRIDE;
- virtual std::string GetUserAgent() const Q_DECL_OVERRIDE { return getUserAgent(); }
- virtual base::string16 GetLocalizedString(int message_id) const Q_DECL_OVERRIDE;
- virtual std::string GetProduct() const Q_DECL_OVERRIDE;
+ base::StringPiece GetDataResource(int, ui::ScaleFactor) const override;
+ base::RefCountedMemory* GetDataResourceBytes(int resource_id) const override;
+ std::string GetUserAgent() const override { return getUserAgent(); }
+ base::string16 GetLocalizedString(int message_id) const override;
+ std::string GetProduct() const override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/content_main_delegate_qt.h b/src/core/content_main_delegate_qt.h
index 3cb3b3bb..407687c8 100644
--- a/src/core/content_main_delegate_qt.h
+++ b/src/core/content_main_delegate_qt.h
@@ -42,8 +42,6 @@
#include "content/public/app/content_main_delegate.h"
-#include <QtCore/qcompilerdetection.h>
-
#include "content_browser_client_qt.h"
namespace QtWebEngineCore {
@@ -54,12 +52,12 @@ public:
// This is where the embedder puts all of its startup code that needs to run
// before the sandbox is engaged.
- void PreSandboxStartup() Q_DECL_OVERRIDE;
+ void PreSandboxStartup() override;
- content::ContentBrowserClient* CreateContentBrowserClient() Q_DECL_OVERRIDE;
- content::ContentRendererClient* CreateContentRendererClient() Q_DECL_OVERRIDE;
+ content::ContentBrowserClient* CreateContentBrowserClient() override;
+ content::ContentRendererClient* CreateContentRendererClient() override;
- bool BasicStartupComplete(int* /*exit_code*/) Q_DECL_OVERRIDE;
+ bool BasicStartupComplete(int* /*exit_code*/) override;
private:
std::unique_ptr<ContentBrowserClientQt> m_browserClient;
diff --git a/src/core/custom_protocol_handler.h b/src/core/custom_protocol_handler.h
index 38e17ffa..5d383883 100644
--- a/src/core/custom_protocol_handler.h
+++ b/src/core/custom_protocol_handler.h
@@ -65,7 +65,7 @@ class QWEBENGINE_EXPORT CustomProtocolHandler : public net::URLRequestJobFactory
public:
CustomProtocolHandler(QWeakPointer<const BrowserContextAdapter> adapter);
- virtual net::URLRequestJob *MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const Q_DECL_OVERRIDE;
+ net::URLRequestJob *MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const override;
private:
DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp
index 31b64a27..9a64d2bb 100644
--- a/src/core/delegated_frame_node.cpp
+++ b/src/core/delegated_frame_node.cpp
@@ -124,13 +124,14 @@ class MailboxTexture : public QSGTexture, protected QOpenGLFunctions {
public:
MailboxTexture(const gpu::MailboxHolder &mailboxHolder, const QSize textureSize);
~MailboxTexture();
- virtual int textureId() const Q_DECL_OVERRIDE { return m_textureId; }
- virtual QSize textureSize() const Q_DECL_OVERRIDE { return m_textureSize; }
- virtual bool hasAlphaChannel() const Q_DECL_OVERRIDE { return m_hasAlpha; }
- void setHasAlphaChannel(bool hasAlpha) { m_hasAlpha = hasAlpha; }
- virtual bool hasMipmaps() const Q_DECL_OVERRIDE { return false; }
- virtual void bind() Q_DECL_OVERRIDE;
+ // QSGTexture:
+ int textureId() const override { return m_textureId; }
+ QSize textureSize() const override { return m_textureSize; }
+ bool hasAlphaChannel() const override { return m_hasAlpha; }
+ bool hasMipmaps() const override { return false; }
+ void bind() override;
+ void setHasAlphaChannel(bool hasAlpha) { m_hasAlpha = hasAlpha; }
gpu::MailboxHolder &mailboxHolder() { return m_mailboxHolder; }
void fetchTexture(gpu::gles2::MailboxManager *mailboxManager);
void setTarget(GLenum target);
@@ -217,7 +218,7 @@ public:
{
}
- void setupRenderPassNode(QSGTexture *layer, const QRect &rect, QSGNode *) Q_DECL_OVERRIDE
+ void setupRenderPassNode(QSGTexture *layer, const QRect &rect, QSGNode *) override
{
QSGInternalImageNode *imageNode = static_cast<QSGInternalImageNode*>(*m_nodeIterator++);
// In case of a missing render pass, set the target rects to be empty and return early.
@@ -236,7 +237,7 @@ public:
void setupTextureContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect,
QSGTexture::Filtering filtering,
QSGTextureNode::TextureCoordinatesTransformMode texCoordTransForm,
- QSGNode *) Q_DECL_OVERRIDE
+ QSGNode *) override
{
QSGTextureNode *textureNode = static_cast<QSGTextureNode*>(*m_nodeIterator++);
if (textureNode->texture() != texture)
@@ -251,7 +252,7 @@ public:
textureNode->setFiltering(filtering);
}
void setupTiledContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect,
- QSGTexture::Filtering filtering, QSGNode *) Q_DECL_OVERRIDE
+ QSGTexture::Filtering filtering, QSGNode *) override
{
QSGTextureNode *textureNode = static_cast<QSGTextureNode*>(*m_nodeIterator++);
@@ -264,7 +265,7 @@ public:
if (textureNode->texture() != texture)
textureNode->setTexture(texture);
}
- void setupSolidColorNode(const QRect &rect, const QColor &color, QSGNode *) Q_DECL_OVERRIDE
+ void setupSolidColorNode(const QRect &rect, const QColor &color, QSGNode *) override
{
QSGRectangleNode *rectangleNode = static_cast<QSGRectangleNode*>(*m_nodeIterator++);
@@ -275,7 +276,7 @@ public:
}
void setupDebugBorderNode(QSGGeometry *geometry, QSGFlatColorMaterial *material,
- QSGNode *) Q_DECL_OVERRIDE
+ QSGNode *) override
{
QSGGeometryNode *geometryNode = static_cast<QSGGeometryNode*>(*m_nodeIterator++);
@@ -286,13 +287,13 @@ public:
void setupYUVVideoNode(QSGTexture *, QSGTexture *, QSGTexture *, QSGTexture *,
const QRectF &, const QRectF &, const QSizeF &, const QSizeF &,
YUVVideoMaterial::ColorSpace, float, float, const QRectF &,
- QSGNode *) Q_DECL_OVERRIDE
+ QSGNode *) override
{
Q_UNREACHABLE();
}
#ifdef GL_OES_EGL_image_external
void setupStreamVideoNode(MailboxTexture *, const QRectF &,
- const QMatrix4x4 &, QSGNode *) Q_DECL_OVERRIDE
+ const QMatrix4x4 &, QSGNode *) override
{
Q_UNREACHABLE();
}
@@ -314,7 +315,7 @@ public:
}
void setupRenderPassNode(QSGTexture *layer, const QRect &rect,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
// Only QSGInternalImageNode currently supports QSGLayer textures.
QSGInternalImageNode *imageNode = m_apiDelegate->createImageNode();
@@ -338,7 +339,7 @@ public:
void setupTextureContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect,
QSGTexture::Filtering filtering,
QSGTextureNode::TextureCoordinatesTransformMode texCoordTransForm,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
QSGTextureNode *textureNode = m_apiDelegate->createTextureNode();
textureNode->setTextureCoordinatesTransform(texCoordTransForm);
@@ -353,7 +354,7 @@ public:
void setupTiledContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect,
QSGTexture::Filtering filtering,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
QSGTextureNode *textureNode = m_apiDelegate->createTextureNode();
textureNode->setRect(rect);
@@ -366,7 +367,7 @@ public:
}
void setupSolidColorNode(const QRect &rect, const QColor &color,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
QSGRectangleNode *rectangleNode = m_apiDelegate->createRectangleNode();
rectangleNode->setRect(rect);
@@ -377,7 +378,7 @@ public:
}
void setupDebugBorderNode(QSGGeometry *geometry, QSGFlatColorMaterial *material,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
QSGGeometryNode *geometryNode = new QSGGeometryNode;
geometryNode->setFlags(QSGNode::OwnsGeometry | QSGNode::OwnsMaterial);
@@ -395,7 +396,7 @@ public:
const QRectF &uvTexCoordRect, const QSizeF &yaTexSize,
const QSizeF &uvTexSize, YUVVideoMaterial::ColorSpace colorspace,
float rMul, float rOff, const QRectF &rect,
- QSGNode *layerChain) Q_DECL_OVERRIDE
+ QSGNode *layerChain) override
{
YUVVideoNode *videoNode = new YUVVideoNode(
yTexture,
@@ -416,7 +417,7 @@ public:
}
#ifdef GL_OES_EGL_image_external
void setupStreamVideoNode(MailboxTexture *texture, const QRectF &rect,
- const QMatrix4x4 &textureMatrix, QSGNode *layerChain) Q_DECL_OVERRIDE
+ const QMatrix4x4 &textureMatrix, QSGNode *layerChain) override
{
StreamVideoNode *svideoNode = new StreamVideoNode(texture, false, ExternalTarget);
svideoNode->setRect(rect);
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index f18a27ed..1f4c9730 100644
--- a/src/core/desktop_screen_qt.cpp
+++ b/src/core/desktop_screen_qt.cpp
@@ -42,6 +42,8 @@
#include "ui/display/display.h"
#include "ui/gfx/geometry/point.h"
+#include <QtGlobal>
+
namespace QtWebEngineCore {
gfx::Point DesktopScreenQt::GetCursorScreenPoint()
diff --git a/src/core/desktop_screen_qt.h b/src/core/desktop_screen_qt.h
index 0e7588ae..f052461a 100644
--- a/src/core/desktop_screen_qt.h
+++ b/src/core/desktop_screen_qt.h
@@ -42,24 +42,22 @@
#include "ui/display/screen.h"
-#include <QtGlobal>
-
namespace QtWebEngineCore {
class DesktopScreenQt : public display::Screen {
public:
// Overridden from gfx::Screen:
- virtual gfx::Point GetCursorScreenPoint() Q_DECL_OVERRIDE;
- virtual bool IsWindowUnderCursor(gfx::NativeWindow) Q_DECL_OVERRIDE;
- virtual gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) Q_DECL_OVERRIDE;
- virtual int GetNumDisplays() const Q_DECL_OVERRIDE;
- virtual std::vector<display::Display> GetAllDisplays() const Q_DECL_OVERRIDE;
- virtual display::Display GetDisplayNearestWindow(gfx::NativeView window) const Q_DECL_OVERRIDE;
- virtual display::Display GetDisplayNearestPoint(const gfx::Point& point) const Q_DECL_OVERRIDE;
- virtual display::Display GetDisplayMatching(const gfx::Rect& match_rect) const Q_DECL_OVERRIDE;
- virtual display::Display GetPrimaryDisplay() const Q_DECL_OVERRIDE;
- virtual void AddObserver(display::DisplayObserver* observer) Q_DECL_OVERRIDE;
- virtual void RemoveObserver(display::DisplayObserver* observer) Q_DECL_OVERRIDE;
+ gfx::Point GetCursorScreenPoint() override;
+ bool IsWindowUnderCursor(gfx::NativeWindow) override;
+ gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override;
+ int GetNumDisplays() const override;
+ std::vector<display::Display> GetAllDisplays() const override;
+ display::Display GetDisplayNearestWindow(gfx::NativeView window) const override;
+ display::Display GetDisplayNearestPoint(const gfx::Point& point) const override;
+ display::Display GetDisplayMatching(const gfx::Rect& match_rect) const override;
+ display::Display GetPrimaryDisplay() const override;
+ void AddObserver(display::DisplayObserver* observer) override;
+ void RemoveObserver(display::DisplayObserver* observer) override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h
index e603724e..cd21d330 100644
--- a/src/core/download_manager_delegate_qt.h
+++ b/src/core/download_manager_delegate_qt.h
@@ -43,7 +43,7 @@
#include "content/public/browser/download_manager_delegate.h"
#include <base/memory/weak_ptr.h>
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtGlobal>
namespace base {
class FilePath;
@@ -67,28 +67,28 @@ class DownloadManagerDelegateQt
public:
DownloadManagerDelegateQt(BrowserContextAdapter *contextAdapter);
~DownloadManagerDelegateQt();
- void GetNextId(const content::DownloadIdCallback& callback) Q_DECL_OVERRIDE;
+ void GetNextId(const content::DownloadIdCallback& callback) override;
bool DetermineDownloadTarget(content::DownloadItem* item,
- const content::DownloadTargetCallback& callback) Q_DECL_OVERRIDE;
+ const content::DownloadTargetCallback& callback) override;
void GetSaveDir(content::BrowserContext* browser_context,
base::FilePath* website_save_dir,
base::FilePath* download_save_dir,
- bool* skip_dir_check) Q_DECL_OVERRIDE;
+ bool* skip_dir_check) override;
void ChooseSavePath(content::WebContents *web_contents,
const base::FilePath &suggested_path,
const base::FilePath::StringType &default_extension,
bool can_save_as_complete,
- const content::SavePackagePathPickedCallback &callback) Q_DECL_OVERRIDE;
+ const content::SavePackagePathPickedCallback &callback) override;
void cancelDownload(quint32 downloadId);
void setDownloadType(int downloadType) { m_downloadType = downloadType; }
// Inherited from content::DownloadItem::Observer
- void OnDownloadUpdated(content::DownloadItem *download) Q_DECL_OVERRIDE;
- void OnDownloadDestroyed(content::DownloadItem *download) Q_DECL_OVERRIDE;
+ void OnDownloadUpdated(content::DownloadItem *download) override;
+ void OnDownloadDestroyed(content::DownloadItem *download) override;
private:
void cancelDownload(const content::DownloadTargetCallback& callback);
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index af2e1e5f..766c1473 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -102,10 +102,10 @@ public:
static bool InitializeOneOff();
- virtual bool Initialize() Q_DECL_OVERRIDE;
- virtual void Destroy() Q_DECL_OVERRIDE;
- virtual void* GetHandle() Q_DECL_OVERRIDE;
- virtual bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) Q_DECL_OVERRIDE;
+ bool Initialize() override;
+ void Destroy() override;
+ void* GetHandle() override;
+ bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override;
protected:
~GLSurfaceQtEGL();
@@ -124,12 +124,12 @@ public:
explicit GLSurfacelessQtEGL(const gfx::Size& size);
public:
- bool Initialize() Q_DECL_OVERRIDE;
- void Destroy() Q_DECL_OVERRIDE;
- bool IsSurfaceless() const Q_DECL_OVERRIDE;
- bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) Q_DECL_OVERRIDE;
- EGLSurface GetHandle() Q_DECL_OVERRIDE;
- void* GetShareHandle() Q_DECL_OVERRIDE;
+ bool Initialize() override;
+ void Destroy() override;
+ bool IsSurfaceless() const override;
+ bool Resize(const gfx::Size& size, float scale_factor, bool has_alpha) override;
+ EGLSurface GetHandle() override;
+ void* GetShareHandle() override;
private:
DISALLOW_COPY_AND_ASSIGN(GLSurfacelessQtEGL);
@@ -152,9 +152,9 @@ public:
static bool InitializeOneOff();
- virtual bool Initialize() Q_DECL_OVERRIDE;
- virtual void Destroy() Q_DECL_OVERRIDE;
- virtual void* GetHandle() Q_DECL_OVERRIDE;
+ bool Initialize() override;
+ void Destroy() override;
+ void* GetHandle() override;
protected:
~GLSurfaceQtGLX();
@@ -296,11 +296,11 @@ public:
static bool InitializeOneOff();
- virtual bool Initialize() Q_DECL_OVERRIDE;
- virtual void Destroy() Q_DECL_OVERRIDE;
- virtual void* GetHandle() Q_DECL_OVERRIDE;
- virtual void* GetDisplay() Q_DECL_OVERRIDE;
- virtual void* GetConfig() Q_DECL_OVERRIDE;
+ bool Initialize() override;
+ void Destroy() override;
+ void *GetHandle() override;
+ void *GetDisplay() override;
+ void *GetConfig() override;
protected:
~GLSurfaceQtWGL();
diff --git a/src/core/gl_surface_qt.h b/src/core/gl_surface_qt.h
index 9e0692c6..08b50184 100644
--- a/src/core/gl_surface_qt.h
+++ b/src/core/gl_surface_qt.h
@@ -45,8 +45,6 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gl/gl_surface.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
-
namespace gl {
class GLSurfaceQt: public GLSurface {
@@ -56,11 +54,11 @@ public:
static bool HasEGLExtension(const char* name);
// Implement GLSurface.
- virtual void* GetDisplay() Q_DECL_OVERRIDE;
- virtual void* GetConfig() Q_DECL_OVERRIDE;
- virtual bool IsOffscreen() Q_DECL_OVERRIDE;
- virtual gfx::SwapResult SwapBuffers() Q_DECL_OVERRIDE;
- virtual gfx::Size GetSize() Q_DECL_OVERRIDE;
+ void *GetDisplay() override;
+ void *GetConfig() override;
+ bool IsOffscreen() override;
+ gfx::SwapResult SwapBuffers() override;
+ gfx::Size GetSize() override;
protected:
GLSurfaceQt();
diff --git a/src/core/javascript_dialog_manager_qt.h b/src/core/javascript_dialog_manager_qt.h
index 77a78cd5..ad2a54ca 100644
--- a/src/core/javascript_dialog_manager_qt.h
+++ b/src/core/javascript_dialog_manager_qt.h
@@ -44,7 +44,6 @@
#include "web_contents_adapter_client.h"
-#include "qglobal.h"
#include <QMap>
#include <QSharedPointer>
@@ -61,14 +60,13 @@ public:
// For use with the Singleton helper class from chromium
static JavaScriptDialogManagerQt *GetInstance();
- virtual void RunJavaScriptDialog(content::WebContents *, const GURL &, content::JavaScriptMessageType javascriptMessageType,
- const base::string16 &messageText, const base::string16 &defaultPromptText,
- const content::JavaScriptDialogManager::DialogClosedCallback &callback, bool *didSuppressMessage) Q_DECL_OVERRIDE;
+ void RunJavaScriptDialog(content::WebContents *, const GURL &, content::JavaScriptMessageType javascriptMessageType,
+ const base::string16 &messageText, const base::string16 &defaultPromptText,
+ const content::JavaScriptDialogManager::DialogClosedCallback &callback, bool *didSuppressMessage) override;
- virtual void RunBeforeUnloadDialog(content::WebContents *, bool isReload,
- const content::JavaScriptDialogManager::DialogClosedCallback &callback) Q_DECL_OVERRIDE;
- virtual bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) Q_DECL_OVERRIDE;
- virtual void CancelDialogs(content::WebContents *contents, bool /*suppress_callbacks*/, bool /*reset_state*/) Q_DECL_OVERRIDE
+ void RunBeforeUnloadDialog(content::WebContents *, bool isReload, const content::JavaScriptDialogManager::DialogClosedCallback &callback) override;
+ bool HandleJavaScriptDialog(content::WebContents *, bool accept, const base::string16 *promptOverride) override;
+ void CancelDialogs(content::WebContents *contents, bool /*suppress_callbacks*/, bool /*reset_state*/) override
{
takeDialogForContents(contents);
}
diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index b21d40b8..c378c327 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -44,7 +44,6 @@
#include <deque>
#include <list>
#include <map>
-#include <QtCore/qcompilerdetection.h>
#include "web_contents_adapter_client.h"
@@ -77,16 +76,21 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
void getDefaultDevices(const std::string &audioDeviceId, const std::string &videoDeviceId, bool audio, bool video, content::MediaStreamDevices *);
// Overridden from content::MediaObserver:
- virtual void OnAudioCaptureDevicesChanged() Q_DECL_OVERRIDE { }
- virtual void OnVideoCaptureDevicesChanged() Q_DECL_OVERRIDE { }
- virtual void OnMediaRequestStateChanged(int render_process_id, int render_frame_id, int page_request_id, const GURL& security_origin, content::MediaStreamType stream_type, content::MediaRequestState state) Q_DECL_OVERRIDE;
-
- virtual void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) Q_DECL_OVERRIDE { }
- virtual void OnSetCapturingLinkSecured(int /*render_process_id*/,
- int /*render_frame_id*/,
- int /*page_request_id*/,
- content::MediaStreamType /*stream_type*/,
- bool /*is_secure*/) Q_DECL_OVERRIDE { }
+ void OnAudioCaptureDevicesChanged() override { }
+ void OnVideoCaptureDevicesChanged() override { }
+ void OnMediaRequestStateChanged(int render_process_id,
+ int render_frame_id,
+ int page_request_id,
+ const GURL& security_origin,
+ content::MediaStreamType stream_type,
+ content::MediaRequestState state) override;
+
+ void OnCreatingAudioStream(int /*render_process_id*/, int /*render_frame_id*/) override { }
+ void OnSetCapturingLinkSecured(int /*render_process_id*/,
+ int /*render_frame_id*/,
+ int /*page_request_id*/,
+ content::MediaStreamType /*stream_type*/,
+ bool /*is_secure*/) override { }
DesktopStreamsRegistry *getDesktopStreamsRegistry();
@@ -108,7 +112,7 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver,
virtual ~MediaCaptureDevicesDispatcher();
// content::NotificationObserver implementation.
- virtual void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) Q_DECL_OVERRIDE;
+ void Observe(int type, const content::NotificationSource &source, const content::NotificationDetails &details) override;
// Helpers for ProcessMediaAccessRequest().
void processDesktopCaptureAccessRequest(content::WebContents *, const content::MediaStreamRequest &, const content::MediaResponseCallback &);
diff --git a/src/core/qrc_protocol_handler_qt.h b/src/core/qrc_protocol_handler_qt.h
index a2e0cc00..f2849c1e 100644
--- a/src/core/qrc_protocol_handler_qt.h
+++ b/src/core/qrc_protocol_handler_qt.h
@@ -42,8 +42,6 @@
#include "net/url_request/url_request_job_factory.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
-
namespace net {
class NetworkDelegate;
@@ -61,7 +59,7 @@ class QrcProtocolHandlerQt : public net::URLRequestJobFactory::ProtocolHandler {
public:
QrcProtocolHandlerQt();
- virtual net::URLRequestJob *MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const Q_DECL_OVERRIDE;
+ net::URLRequestJob *MaybeCreateJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate) const override;
private:
DISALLOW_COPY_AND_ASSIGN(QrcProtocolHandlerQt);
diff --git a/src/core/render_view_observer_host_qt.h b/src/core/render_view_observer_host_qt.h
index 42d232b0..a08263e0 100644
--- a/src/core/render_view_observer_host_qt.h
+++ b/src/core/render_view_observer_host_qt.h
@@ -60,7 +60,7 @@ public:
void fetchDocumentInnerText(quint64 requestId);
private:
- bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
void onDidFetchDocumentMarkup(quint64 requestId, const base::string16& markup);
void onDidFetchDocumentInnerText(quint64 requestId, const base::string16& innerText);
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 332be89f..6568398a 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -191,41 +191,41 @@ public:
Q_ASSERT((action != ACTION_DOWN && action != ACTION_UP) || index == 0);
}
- virtual uint32_t GetUniqueEventId() const Q_DECL_OVERRIDE { return eventId; }
- virtual Action GetAction() const Q_DECL_OVERRIDE { return action; }
- virtual int GetActionIndex() const Q_DECL_OVERRIDE { return index; }
- virtual size_t GetPointerCount() const Q_DECL_OVERRIDE { return touchPoints.size(); }
- virtual int GetPointerId(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).id(); }
- virtual float GetX(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).pos().x() / dpiScale; }
- virtual float GetY(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).pos().y() / dpiScale; }
- virtual float GetRawX(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).screenPos().x(); }
- virtual float GetRawY(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).screenPos().y(); }
- virtual float GetTouchMajor(size_t pointer_index) const Q_DECL_OVERRIDE
+ uint32_t GetUniqueEventId() const override { return eventId; }
+ Action GetAction() const override { return action; }
+ int GetActionIndex() const override { return index; }
+ size_t GetPointerCount() const override { return touchPoints.size(); }
+ int GetPointerId(size_t pointer_index) const override { return touchPoints.at(pointer_index).id(); }
+ float GetX(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().x() / dpiScale; }
+ float GetY(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().y() / dpiScale; }
+ float GetRawX(size_t pointer_index) const override { return touchPoints.at(pointer_index).screenPos().x(); }
+ float GetRawY(size_t pointer_index) const override { return touchPoints.at(pointer_index).screenPos().y(); }
+ float GetTouchMajor(size_t pointer_index) const override
{
QRectF touchRect = touchPoints.at(pointer_index).rect();
return std::max(touchRect.height(), touchRect.width());
}
- virtual float GetTouchMinor(size_t pointer_index) const Q_DECL_OVERRIDE
+ float GetTouchMinor(size_t pointer_index) const override
{
QRectF touchRect = touchPoints.at(pointer_index).rect();
return std::min(touchRect.height(), touchRect.width());
}
- virtual float GetOrientation(size_t pointer_index) const Q_DECL_OVERRIDE
+ float GetOrientation(size_t pointer_index) const override
{
return 0;
}
- virtual int GetFlags() const Q_DECL_OVERRIDE { return flags; }
- virtual float GetPressure(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).pressure(); }
- virtual float GetTilt(size_t pointer_index) const Q_DECL_OVERRIDE { return 0; }
- virtual base::TimeTicks GetEventTime() const Q_DECL_OVERRIDE { return eventTime; }
-
- virtual size_t GetHistorySize() const Q_DECL_OVERRIDE { return 0; }
- virtual base::TimeTicks GetHistoricalEventTime(size_t historical_index) const Q_DECL_OVERRIDE { return base::TimeTicks(); }
- virtual float GetHistoricalTouchMajor(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; }
- virtual float GetHistoricalX(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; }
- virtual float GetHistoricalY(size_t pointer_index, size_t historical_index) const Q_DECL_OVERRIDE { return 0; }
- virtual ToolType GetToolType(size_t pointer_index) const Q_DECL_OVERRIDE { return ui::MotionEvent::TOOL_TYPE_UNKNOWN; }
- virtual int GetButtonState() const Q_DECL_OVERRIDE { return 0; }
+ int GetFlags() const override { return flags; }
+ float GetPressure(size_t pointer_index) const override { return touchPoints.at(pointer_index).pressure(); }
+ float GetTilt(size_t pointer_index) const override { return 0; }
+ base::TimeTicks GetEventTime() const override { return eventTime; }
+
+ size_t GetHistorySize() const override { return 0; }
+ base::TimeTicks GetHistoricalEventTime(size_t historical_index) const override { return base::TimeTicks(); }
+ float GetHistoricalTouchMajor(size_t pointer_index, size_t historical_index) const override { return 0; }
+ float GetHistoricalX(size_t pointer_index, size_t historical_index) const override { return 0; }
+ float GetHistoricalY(size_t pointer_index, size_t historical_index) const override { return 0; }
+ ToolType GetToolType(size_t pointer_index) const override { return ui::MotionEvent::TOOL_TYPE_UNKNOWN; }
+ int GetButtonState() const override { return 0; }
private:
QList<QTouchEvent::TouchPoint> touchPoints;
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index 09e02749..79993083 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -121,65 +121,65 @@ public:
void setDelegate(RenderWidgetHostViewQtDelegate *delegate);
void setAdapterClient(WebContentsAdapterClient *adapterClient);
- virtual void InitAsChild(gfx::NativeView) Q_DECL_OVERRIDE;
- virtual void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) Q_DECL_OVERRIDE;
- virtual void InitAsFullscreen(content::RenderWidgetHostView*) Q_DECL_OVERRIDE;
- virtual content::RenderWidgetHost* GetRenderWidgetHost() const Q_DECL_OVERRIDE;
- virtual void SetSize(const gfx::Size& size) Q_DECL_OVERRIDE;
- virtual void SetBounds(const gfx::Rect&) Q_DECL_OVERRIDE;
- virtual gfx::Vector2dF GetLastScrollOffset() const Q_DECL_OVERRIDE;
- virtual gfx::Size GetPhysicalBackingSize() const Q_DECL_OVERRIDE;
- virtual gfx::NativeView GetNativeView() const Q_DECL_OVERRIDE;
- virtual gfx::NativeViewAccessible GetNativeViewAccessible() Q_DECL_OVERRIDE;
- virtual void Focus() Q_DECL_OVERRIDE;
- virtual bool HasFocus() const Q_DECL_OVERRIDE;
- virtual bool IsSurfaceAvailableForCopy() const Q_DECL_OVERRIDE;
- virtual void Show() Q_DECL_OVERRIDE;
- virtual void Hide() Q_DECL_OVERRIDE;
- virtual bool IsShowing() Q_DECL_OVERRIDE;
- virtual gfx::Rect GetViewBounds() const Q_DECL_OVERRIDE;
- virtual void SetBackgroundColor(SkColor color) Q_DECL_OVERRIDE;
- virtual bool LockMouse() Q_DECL_OVERRIDE;
- virtual void UnlockMouse() Q_DECL_OVERRIDE;
- virtual void UpdateCursor(const content::WebCursor&) Q_DECL_OVERRIDE;
- virtual void SetIsLoading(bool) Q_DECL_OVERRIDE;
- virtual void ImeCancelComposition() Q_DECL_OVERRIDE;
- virtual void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) Q_DECL_OVERRIDE;
- virtual void RenderProcessGone(base::TerminationStatus, int) Q_DECL_OVERRIDE;
- virtual void Destroy() Q_DECL_OVERRIDE;
- virtual void SetTooltipText(const base::string16 &tooltip_text) Q_DECL_OVERRIDE;
- virtual void CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& dst_size, const content::ReadbackRequestCallback& callback, const SkColorType preferred_color_type) Q_DECL_OVERRIDE;
- virtual void CopyFromCompositingSurfaceToVideoFrame(const gfx::Rect& src_subrect, const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(const gfx::Rect&, bool)>& callback) Q_DECL_OVERRIDE;
-
- virtual bool CanCopyToVideoFrame() const Q_DECL_OVERRIDE;
- virtual bool HasAcceleratedSurface(const gfx::Size&) Q_DECL_OVERRIDE;
- virtual void OnSwapCompositorFrame(uint32_t output_surface_id, cc::CompositorFrame frame) Q_DECL_OVERRIDE;
+ void InitAsChild(gfx::NativeView) override;
+ void InitAsPopup(content::RenderWidgetHostView*, const gfx::Rect&) override;
+ void InitAsFullscreen(content::RenderWidgetHostView*) override;
+ content::RenderWidgetHost* GetRenderWidgetHost() const override;
+ void SetSize(const gfx::Size& size) override;
+ void SetBounds(const gfx::Rect&) override;
+ gfx::Vector2dF GetLastScrollOffset() const override;
+ gfx::Size GetPhysicalBackingSize() const override;
+ gfx::NativeView GetNativeView() const override;
+ gfx::NativeViewAccessible GetNativeViewAccessible() override;
+ void Focus() override;
+ bool HasFocus() const override;
+ bool IsSurfaceAvailableForCopy() const override;
+ void Show() override;
+ void Hide() override;
+ bool IsShowing() override;
+ gfx::Rect GetViewBounds() const override;
+ void SetBackgroundColor(SkColor color) override;
+ bool LockMouse() override;
+ void UnlockMouse() override;
+ void UpdateCursor(const content::WebCursor&) override;
+ void SetIsLoading(bool) override;
+ void ImeCancelComposition() override;
+ void ImeCompositionRangeChanged(const gfx::Range&, const std::vector<gfx::Rect>&) override;
+ void RenderProcessGone(base::TerminationStatus, int) override;
+ void Destroy() override;
+ void SetTooltipText(const base::string16 &tooltip_text) override;
+ void CopyFromCompositingSurface(const gfx::Rect& src_subrect, const gfx::Size& dst_size, const content::ReadbackRequestCallback& callback, const SkColorType preferred_color_type) override;
+ void CopyFromCompositingSurfaceToVideoFrame(const gfx::Rect& src_subrect, const scoped_refptr<media::VideoFrame>& target, const base::Callback<void(const gfx::Rect&, bool)>& callback) override;
+
+ bool CanCopyToVideoFrame() const override;
+ bool HasAcceleratedSurface(const gfx::Size&) override;
+ void OnSwapCompositorFrame(uint32_t output_surface_id, cc::CompositorFrame frame) override;
void GetScreenInfo(content::ScreenInfo* results);
- virtual gfx::Rect GetBoundsInRootWindow() Q_DECL_OVERRIDE;
- virtual void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) Q_DECL_OVERRIDE;
- virtual void ClearCompositorFrame() Q_DECL_OVERRIDE;
- virtual void LockCompositingSurface() Q_DECL_OVERRIDE;
- virtual void UnlockCompositingSurface() Q_DECL_OVERRIDE;
- virtual void SetNeedsBeginFrames(bool needs_begin_frames) Q_DECL_OVERRIDE;
+ gfx::Rect GetBoundsInRootWindow() override;
+ void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) override;
+ void ClearCompositorFrame() override;
+ void LockCompositingSurface() override;
+ void UnlockCompositingSurface() override;
+ void SetNeedsBeginFrames(bool needs_begin_frames) override;
// Overridden from ui::GestureProviderClient.
- virtual void OnGestureEvent(const ui::GestureEventData& gesture) Q_DECL_OVERRIDE;
+ void OnGestureEvent(const ui::GestureEventData& gesture) override;
// Overridden from RenderWidgetHostViewQtDelegateClient.
- virtual QSGNode *updatePaintNode(QSGNode *) Q_DECL_OVERRIDE;
- virtual void notifyResize() Q_DECL_OVERRIDE;
- virtual void notifyShown() Q_DECL_OVERRIDE;
- virtual void notifyHidden() Q_DECL_OVERRIDE;
- virtual void windowBoundsChanged() Q_DECL_OVERRIDE;
- virtual void windowChanged() Q_DECL_OVERRIDE;
- virtual bool forwardEvent(QEvent *) Q_DECL_OVERRIDE;
- virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) Q_DECL_OVERRIDE;
+ QSGNode *updatePaintNode(QSGNode *) override;
+ void notifyResize() override;
+ void notifyShown() override;
+ void notifyHidden() override;
+ void windowBoundsChanged() override;
+ void windowChanged() override;
+ bool forwardEvent(QEvent *) override;
+ QVariant inputMethodQuery(Qt::InputMethodQuery query) override;
// Overridden from content::TextInputManager::Observer
- virtual void OnUpdateTextInputStateCalled(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view, bool did_update_state) Q_DECL_OVERRIDE;
- virtual void OnSelectionBoundsChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) Q_DECL_OVERRIDE;
- virtual void OnTextSelectionChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) Q_DECL_OVERRIDE;
+ void OnUpdateTextInputStateCalled(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view, bool did_update_state) override;
+ void OnSelectionBoundsChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) override;
+ void OnTextSelectionChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) override;
// cc::BeginFrameObserverBase implementation.
bool OnBeginFrameDerivedImpl(const cc::BeginFrameArgs& args) override;
@@ -196,20 +196,20 @@ public:
void handleInputMethodQueryEvent(QInputMethodQueryEvent*);
#if defined(OS_MACOSX)
- virtual void SetActive(bool active) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual bool IsSpeaking() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; }
- virtual void SpeakSelection() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual void StopSpeaking() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual bool SupportsSpeech() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; }
- virtual void ShowDefinitionForSelection() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual ui::AcceleratedWidgetMac *GetAcceleratedWidgetMac() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return nullptr; }
+ void SetActive(bool active) override { QT_NOT_YET_IMPLEMENTED }
+ bool IsSpeaking() const override { QT_NOT_YET_IMPLEMENTED; return false; }
+ void SpeakSelection() override { QT_NOT_YET_IMPLEMENTED }
+ void StopSpeaking() override { QT_NOT_YET_IMPLEMENTED }
+ bool SupportsSpeech() const override { QT_NOT_YET_IMPLEMENTED; return false; }
+ void ShowDefinitionForSelection() override { QT_NOT_YET_IMPLEMENTED }
+ ui::AcceleratedWidgetMac *GetAcceleratedWidgetMac() const override { QT_NOT_YET_IMPLEMENTED; return nullptr; }
#endif // defined(OS_MACOSX)
// Overridden from content::BrowserAccessibilityDelegate
- virtual content::BrowserAccessibilityManager* CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate, bool for_root_frame) Q_DECL_OVERRIDE;
+ content::BrowserAccessibilityManager* CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
#ifndef QT_NO_ACCESSIBILITY
- virtual void accessibilityActiveChanged(bool active) Q_DECL_OVERRIDE;
+ void accessibilityActiveChanged(bool active) override;
#endif // QT_NO_ACCESSIBILITY
LoadVisuallyCommittedState getLoadVisuallyCommittedState() const { return m_loadVisuallyCommittedState; }
void setLoadVisuallyCommittedState(LoadVisuallyCommittedState state) { m_loadVisuallyCommittedState = state; }
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index c373665e..45ad2e87 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -42,7 +42,6 @@
#include "content/public/renderer/content_renderer_client.h"
#include "components/spellcheck/spellcheck_build_features.h"
-#include <QtGlobal>
#include <QScopedPointer>
namespace visitedlink {
@@ -63,20 +62,20 @@ class ContentRendererClientQt : public content::ContentRendererClient {
public:
ContentRendererClientQt();
~ContentRendererClientQt();
- virtual void RenderThreadStarted() Q_DECL_OVERRIDE;
- virtual void RenderViewCreated(content::RenderView *render_view) Q_DECL_OVERRIDE;
- virtual void RenderFrameCreated(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
- virtual bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) Q_DECL_OVERRIDE;
- virtual bool HasErrorPage(int httpStatusCode, std::string *errorDomain) Q_DECL_OVERRIDE;
- virtual void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest
- , const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) Q_DECL_OVERRIDE;
+ void RenderThreadStarted() override;
+ void RenderViewCreated(content::RenderView *render_view) override;
+ void RenderFrameCreated(content::RenderFrame* render_frame) override;
+ bool ShouldSuppressErrorPage(content::RenderFrame *, const GURL &) override;
+ bool HasErrorPage(int httpStatusCode, std::string *errorDomain) override;
+ void GetNavigationErrorStrings(content::RenderFrame* renderFrame, const blink::WebURLRequest& failedRequest,
+ const blink::WebURLError& error, std::string* errorHtml, base::string16* errorDescription) override;
- virtual unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) Q_DECL_OVERRIDE;
- virtual bool IsLinkVisited(unsigned long long linkHash) Q_DECL_OVERRIDE;
- virtual void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) Q_DECL_OVERRIDE;
+ unsigned long long VisitedLinkHash(const char *canonicalUrl, size_t length) override;
+ bool IsLinkVisited(unsigned long long linkHash) override;
+ void AddSupportedKeySystems(std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) override;
- virtual void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
- virtual void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) Q_DECL_OVERRIDE;
+ void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override;
+ void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override;
private:
QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave;
diff --git a/src/core/renderer/render_view_observer_qt.h b/src/core/renderer/render_view_observer_qt.h
index 538ebea8..60b11c42 100644
--- a/src/core/renderer/render_view_observer_qt.h
+++ b/src/core/renderer/render_view_observer_qt.h
@@ -57,10 +57,10 @@ private:
void onFetchDocumentInnerText(quint64 requestId);
void onSetBackgroundColor(quint32 color);
- void OnDestruct() Q_DECL_OVERRIDE { }
+ void OnDestruct() override { }
- virtual bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
- virtual void Navigate(const GURL& url) Q_DECL_OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
+ void Navigate(const GURL& url) override;
web_cache::WebCacheImpl* m_web_cache_impl;
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index c89ad69a..b172c762 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -103,12 +103,12 @@ public:
RenderViewObserverHelper(content::RenderView *);
private:
// RenderViewObserver implementation.
- virtual void DidFinishDocumentLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
- virtual void DidFinishLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
- virtual void DidStartProvisionalLoad(blink::WebLocalFrame* frame) Q_DECL_OVERRIDE;
- virtual void FrameDetached(blink::WebFrame* frame) Q_DECL_OVERRIDE;
- virtual void OnDestruct() Q_DECL_OVERRIDE;
- virtual bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+ void DidFinishDocumentLoad(blink::WebLocalFrame* frame) override;
+ void DidFinishLoad(blink::WebLocalFrame* frame) override;
+ void DidStartProvisionalLoad(blink::WebLocalFrame* frame) override;
+ void FrameDetached(blink::WebFrame* frame) override;
+ void OnDestruct() override;
+ bool OnMessageReceived(const IPC::Message& message) override;
void onUserScriptAdded(const UserScriptData &);
void onUserScriptRemoved(const UserScriptData &);
diff --git a/src/core/renderer/user_resource_controller.h b/src/core/renderer/user_resource_controller.h
index d0b5088d..5d412fe4 100644
--- a/src/core/renderer/user_resource_controller.h
+++ b/src/core/renderer/user_resource_controller.h
@@ -44,7 +44,6 @@
#include "common/user_script_data.h"
-#include <QtCore/qcompilerdetection.h>
#include <QtCore/QHash>
#include <QtCore/QSet>
diff --git a/src/core/renderer/web_channel_ipc_transport.h b/src/core/renderer/web_channel_ipc_transport.h
index e949d1c9..a2c7d5b4 100644
--- a/src/core/renderer/web_channel_ipc_transport.h
+++ b/src/core/renderer/web_channel_ipc_transport.h
@@ -43,7 +43,8 @@
#include "base/values.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/public/renderer/render_view_observer_tracker.h"
-#include <QtCore/qcompilerdetection.h>
+
+#include <QtCore/qglobal.h>
namespace content {
class RenderFrame;
@@ -67,8 +68,10 @@ private:
void dispatchWebChannelMessage(const std::vector<char> &binaryJSON, uint worldId);
void installWebChannel(uint worldId);
void uninstallWebChannel(uint worldId);
- virtual bool OnMessageReceived(const IPC::Message &message) Q_DECL_OVERRIDE;
- virtual void OnDestruct() Q_DECL_OVERRIDE { }
+
+ // content::RenderViewObserver overrides:
+ bool OnMessageReceived(const IPC::Message &message) override;
+ void OnDestruct() override { }
bool m_installed;
uint m_installedWorldId;
diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
index 604499e9..e7701751 100644
--- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
+++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
@@ -92,7 +92,7 @@ public:
bool HandleExternalProtocol(const GURL& url,
content::ResourceRequestInfo* info) override;
- virtual content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(net::AuthChallengeInfo *authInfo, net::URLRequest *request) Q_DECL_OVERRIDE;
+ content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(net::AuthChallengeInfo *authInfo, net::URLRequest *request) override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/renderer_host/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index 9d2ba8eb..95385ae2 100644
--- a/src/core/renderer_host/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
@@ -98,7 +98,7 @@ void UserResourceControllerHost::WebContentsObserverHelper::WebContentsDestroyed
class UserResourceControllerHost::RenderProcessObserverHelper : public content::RenderProcessHostObserver {
public:
RenderProcessObserverHelper(UserResourceControllerHost *);
- virtual void RenderProcessHostDestroyed(content::RenderProcessHost *) Q_DECL_OVERRIDE;
+ void RenderProcessHostDestroyed(content::RenderProcessHost *) override;
private:
UserResourceControllerHost *m_controllerHost;
};
diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.h b/src/core/renderer_host/web_channel_ipc_transport_host.h
index 75b40477..aa406471 100644
--- a/src/core/renderer_host/web_channel_ipc_transport_host.h
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.h
@@ -59,16 +59,16 @@ public:
virtual ~WebChannelIPCTransportHost();
// WebContentsObserver
- virtual void RenderViewHostChanged(content::RenderViewHost* old_host, content::RenderViewHost* new_host) Q_DECL_OVERRIDE;
+ void RenderViewHostChanged(content::RenderViewHost* old_host, content::RenderViewHost* new_host) override;
// QWebChannelAbstractTransport
- void sendMessage(const QJsonObject &message) Q_DECL_OVERRIDE;
+ void sendMessage(const QJsonObject &message) override;
void setWorldId(uint worldId);
uint worldId() const { return m_worldId; }
private:
- bool OnMessageReceived(const IPC::Message& message) Q_DECL_OVERRIDE;
+ bool OnMessageReceived(const IPC::Message& message) override;
void onWebChannelMessage(const std::vector<char> &message);
uint m_worldId;
};
diff --git a/src/core/resource_context_qt.h b/src/core/resource_context_qt.h
index a6f573ce..62452b44 100644
--- a/src/core/resource_context_qt.h
+++ b/src/core/resource_context_qt.h
@@ -42,8 +42,6 @@
#include "content/public/browser/resource_context.h"
-#include "qglobal.h"
-
namespace net {
class URLRequestContextGetter;
}
@@ -60,9 +58,9 @@ public:
: context(ctx)
{}
- virtual net::HostResolver* GetHostResolver() Q_DECL_OVERRIDE;
+ net::HostResolver *GetHostResolver() override;
+ net::URLRequestContext *GetRequestContext() override;
- virtual net::URLRequestContext* GetRequestContext() Q_DECL_OVERRIDE;
private:
BrowserContextQt *context;
diff --git a/src/core/stream_video_node.cpp b/src/core/stream_video_node.cpp
index 81b76a29..29922f86 100644
--- a/src/core/stream_video_node.cpp
+++ b/src/core/stream_video_node.cpp
@@ -49,7 +49,7 @@ public:
StreamVideoMaterialShader(TextureTarget target) : m_target(target) { }
virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial);
- virtual char const *const *attributeNames() const Q_DECL_OVERRIDE {
+ char const *const *attributeNames() const override {
static const char *names[] = {
"a_position",
"a_texCoord",
@@ -59,7 +59,7 @@ public:
}
protected:
- virtual const char *vertexShader() const Q_DECL_OVERRIDE {
+ const char *vertexShader() const override {
// Keep in sync with cc::VertexShaderVideoTransform
static const char *shader =
"attribute highp vec4 a_position;\n"
@@ -74,7 +74,7 @@ protected:
return shader;
}
- virtual const char *fragmentShader() const Q_DECL_OVERRIDE {
+ const char *fragmentShader() const override {
// Keep in sync with cc::FragmentShaderRGBATexAlpha
static const char *shaderExternal =
"#extension GL_OES_EGL_image_external : require\n"
diff --git a/src/core/stream_video_node.h b/src/core/stream_video_node.h
index 46a43383..9d937791 100644
--- a/src/core/stream_video_node.h
+++ b/src/core/stream_video_node.h
@@ -57,13 +57,13 @@ class StreamVideoMaterial : public QSGMaterial
public:
StreamVideoMaterial(QSGTexture *texture, TextureTarget target);
- virtual QSGMaterialType *type() const Q_DECL_OVERRIDE
+ QSGMaterialType *type() const override
{
static QSGMaterialType theType;
return &theType;
}
- virtual QSGMaterialShader *createShader() const;
+ QSGMaterialShader *createShader() const override;
QSGTexture *m_texture;
QMatrix4x4 m_texMatrix;
diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h
index ad601894..76b6dc6e 100644
--- a/src/core/surface_factory_qt.h
+++ b/src/core/surface_factory_qt.h
@@ -44,15 +44,13 @@
#include "ui/ozone/public/surface_factory_ozone.h"
-#include <QtGlobal>
-
namespace QtWebEngineCore {
class SurfaceFactoryQt
: public ui::SurfaceFactoryOzone
{
- virtual bool LoadEGLGLES2Bindings() Q_DECL_OVERRIDE;
- virtual intptr_t GetNativeDisplay() Q_DECL_OVERRIDE;
+ bool LoadEGLGLES2Bindings() override;
+ intptr_t GetNativeDisplay() override;
};
} // namespace QtWebEngineCore
diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h
index 8cfa8d75..9757cc73 100644
--- a/src/core/url_request_context_getter_qt.h
+++ b/src/core/url_request_context_getter_qt.h
@@ -73,8 +73,8 @@ class URLRequestContextGetterQt : public net::URLRequestContextGetter {
public:
URLRequestContextGetterQt(QSharedPointer<BrowserContextAdapter> browserContext, content::ProtocolHandlerMap *protocolHandlers, content::URLRequestInterceptorScopedVector request_interceptors);
- virtual net::URLRequestContext *GetURLRequestContext() Q_DECL_OVERRIDE;
- virtual scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const Q_DECL_OVERRIDE;
+ net::URLRequestContext *GetURLRequestContext() override;
+ scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner() const override;
// Called on the UI thread:
void updateStorageSettings();
diff --git a/src/core/url_request_custom_job.h b/src/core/url_request_custom_job.h
index 3fce76d3..93edb0b8 100644
--- a/src/core/url_request_custom_job.h
+++ b/src/core/url_request_custom_job.h
@@ -43,7 +43,6 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job.h"
-#include <QtCore/qglobal.h>
#include <QtCore/QMutex>
#include <QtCore/QPointer>
@@ -59,12 +58,12 @@ class URLRequestCustomJobShared;
class URLRequestCustomJob : public net::URLRequestJob {
public:
URLRequestCustomJob(net::URLRequest *request, net::NetworkDelegate *networkDelegate, const std::string &scheme, QWeakPointer<const BrowserContextAdapter> adapter);
- virtual void Start() Q_DECL_OVERRIDE;
- virtual void Kill() Q_DECL_OVERRIDE;
- virtual int ReadRawData(net::IOBuffer *buf, int buf_size) Q_DECL_OVERRIDE;
- virtual bool GetMimeType(std::string *mimeType) const Q_DECL_OVERRIDE;
- virtual bool GetCharset(std::string *charset) Q_DECL_OVERRIDE;
- virtual bool IsRedirectResponse(GURL* location, int* http_status_code) Q_DECL_OVERRIDE;
+ void Start() override;
+ void Kill() override;
+ int ReadRawData(net::IOBuffer *buf, int buf_size) override;
+ bool GetMimeType(std::string *mimeType) const override;
+ bool GetCharset(std::string *charset) override;
+ bool IsRedirectResponse(GURL* location, int* http_status_code) override;
protected:
virtual ~URLRequestCustomJob();
diff --git a/src/core/url_request_qrc_job_qt.h b/src/core/url_request_qrc_job_qt.h
index 5ad115da..11c13069 100644
--- a/src/core/url_request_qrc_job_qt.h
+++ b/src/core/url_request_qrc_job_qt.h
@@ -43,7 +43,6 @@
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_job.h"
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
#include <QFile>
namespace QtWebEngineCore {
@@ -53,10 +52,10 @@ class URLRequestQrcJobQt : public net::URLRequestJob {
public:
URLRequestQrcJobQt(net::URLRequest *request, net::NetworkDelegate *networkDelegate);
- virtual void Start() Q_DECL_OVERRIDE;
- virtual void Kill() Q_DECL_OVERRIDE;
- virtual int ReadRawData(net::IOBuffer* buf, int buf_size) Q_DECL_OVERRIDE;;
- virtual bool GetMimeType(std::string *mimeType) const Q_DECL_OVERRIDE;
+ void Start() override;
+ void Kill() override;
+ int ReadRawData(net::IOBuffer* buf, int buf_size) override;;
+ bool GetMimeType(std::string *mimeType) const override;
protected:
virtual ~URLRequestQrcJobQt();
diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
index 6aa34d2f..2e294a84 100644
--- a/src/core/web_contents_delegate_qt.h
+++ b/src/core/web_contents_delegate_qt.h
@@ -49,8 +49,8 @@
#include "color_chooser_controller.h"
#include "favicon_manager.h"
#include "javascript_dialog_manager_qt.h"
+
#include <QtCore/qvector.h>
-#include <QtCore/qcompilerdetection.h>
QT_FORWARD_DECLARE_CLASS(CertificateErrorController)
@@ -97,45 +97,45 @@ public:
int lastReceivedFindReply() const { return m_lastReceivedFindReply; }
// WebContentsDelegate overrides
- virtual content::WebContents *OpenURLFromTab(content::WebContents *source, const content::OpenURLParams &params) Q_DECL_OVERRIDE;
- virtual void NavigationStateChanged(content::WebContents* source, content::InvalidateTypes changed_flags) Q_DECL_OVERRIDE;
- virtual void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) Q_DECL_OVERRIDE;
- virtual void CloseContents(content::WebContents *source) Q_DECL_OVERRIDE;
- virtual void LoadProgressChanged(content::WebContents* source, double progress) Q_DECL_OVERRIDE;
- virtual void HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) Q_DECL_OVERRIDE;
- virtual content::ColorChooser *OpenColorChooser(content::WebContents *source, SkColor color, const std::vector<content::ColorSuggestion> &suggestion) Q_DECL_OVERRIDE;
- virtual content::JavaScriptDialogManager *GetJavaScriptDialogManager(content::WebContents *source) Q_DECL_OVERRIDE;
- virtual void EnterFullscreenModeForTab(content::WebContents* web_contents, const GURL& origin) Q_DECL_OVERRIDE;
- virtual void ExitFullscreenModeForTab(content::WebContents*) Q_DECL_OVERRIDE;
- virtual bool IsFullscreenForTabOrPending(const content::WebContents* web_contents) const Q_DECL_OVERRIDE;
- virtual void RunFileChooser(content::RenderFrameHost* render_frame_host, const content::FileChooserParams& params) Q_DECL_OVERRIDE;
- virtual bool DidAddMessageToConsole(content::WebContents* source, int32_t level, const base::string16& message, int32_t line_no, const base::string16& source_id) Q_DECL_OVERRIDE;
- virtual void FindReply(content::WebContents *source, int request_id, int number_of_matches, const gfx::Rect& selection_rect, int active_match_ordinal, bool final_update) Q_DECL_OVERRIDE;
- virtual void RequestMediaAccessPermission(content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback) Q_DECL_OVERRIDE;
- virtual void MoveContents(content::WebContents *source, const gfx::Rect &pos) Q_DECL_OVERRIDE;
- virtual bool IsPopupOrPanel(const content::WebContents *source) const Q_DECL_OVERRIDE;
- virtual void UpdateTargetURL(content::WebContents* source, const GURL& url) Q_DECL_OVERRIDE;
- virtual void RequestToLockMouse(content::WebContents *web_contents, bool user_gesture, bool last_unlocked_by_target) Q_DECL_OVERRIDE;
- virtual bool ShouldPreserveAbortedURLs(content::WebContents *source) Q_DECL_OVERRIDE;
- virtual void ShowValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view, const base::string16 &main_text, const base::string16 &sub_text) Q_DECL_OVERRIDE;
- virtual void HideValidationMessage(content::WebContents *web_contents) Q_DECL_OVERRIDE;
- virtual void MoveValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view) Q_DECL_OVERRIDE;
- void BeforeUnloadFired(content::WebContents* tab, bool proceed, bool* proceed_to_fire_unload) Q_DECL_OVERRIDE;
- bool CheckMediaAccessPermission(content::WebContents *web_contents, const GURL& security_origin, content::MediaStreamType type) Q_DECL_OVERRIDE;
+ content::WebContents *OpenURLFromTab(content::WebContents *source, const content::OpenURLParams &params) override;
+ void NavigationStateChanged(content::WebContents* source, content::InvalidateTypes changed_flags) override;
+ void AddNewContents(content::WebContents* source, content::WebContents* new_contents, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture, bool* was_blocked) override;
+ void CloseContents(content::WebContents *source) override;
+ void LoadProgressChanged(content::WebContents* source, double progress) override;
+ void HandleKeyboardEvent(content::WebContents *source, const content::NativeWebKeyboardEvent &event) override;
+ content::ColorChooser *OpenColorChooser(content::WebContents *source, SkColor color, const std::vector<content::ColorSuggestion> &suggestion) override;
+ content::JavaScriptDialogManager *GetJavaScriptDialogManager(content::WebContents *source) override;
+ void EnterFullscreenModeForTab(content::WebContents* web_contents, const GURL& origin) override;
+ void ExitFullscreenModeForTab(content::WebContents*) override;
+ bool IsFullscreenForTabOrPending(const content::WebContents* web_contents) const override;
+ void RunFileChooser(content::RenderFrameHost* render_frame_host, const content::FileChooserParams& params) override;
+ bool DidAddMessageToConsole(content::WebContents* source, int32_t level, const base::string16& message, int32_t line_no, const base::string16& source_id) override;
+ void FindReply(content::WebContents *source, int request_id, int number_of_matches, const gfx::Rect& selection_rect, int active_match_ordinal, bool final_update) override;
+ void RequestMediaAccessPermission(content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback) override;
+ void MoveContents(content::WebContents *source, const gfx::Rect &pos) override;
+ bool IsPopupOrPanel(const content::WebContents *source) const override;
+ void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
+ void RequestToLockMouse(content::WebContents *web_contents, bool user_gesture, bool last_unlocked_by_target) override;
+ bool ShouldPreserveAbortedURLs(content::WebContents *source) override;
+ void ShowValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view, const base::string16 &main_text, const base::string16 &sub_text) override;
+ void HideValidationMessage(content::WebContents *web_contents) override;
+ void MoveValidationMessage(content::WebContents *web_contents, const gfx::Rect &anchor_in_root_view) override;
+ void BeforeUnloadFired(content::WebContents* tab, bool proceed, bool* proceed_to_fire_unload) override;
+ bool CheckMediaAccessPermission(content::WebContents *web_contents, const GURL& security_origin, content::MediaStreamType type) override;
// WebContentsObserver overrides
- virtual void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) Q_DECL_OVERRIDE;
- virtual void DidStartProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &validated_url, bool is_error_page, bool is_iframe_srcdoc) Q_DECL_OVERRIDE;
- virtual void DidCommitProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &url, ui::PageTransition transition_type) Q_DECL_OVERRIDE;
- virtual void DidFailProvisionalLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url,
- int error_code, const base::string16 &error_description, bool was_ignored_by_handler) Q_DECL_OVERRIDE;
- virtual void DidFailLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url,
- int error_code, const base::string16 &error_description, bool was_ignored_by_handler) Q_DECL_OVERRIDE;
- virtual void DidFinishLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url) Q_DECL_OVERRIDE;
- virtual void DidUpdateFaviconURL(const std::vector<content::FaviconURL> &candidates) Q_DECL_OVERRIDE;
- virtual void DidNavigateAnyFrame(content::RenderFrameHost *render_frame_host, const content::LoadCommittedDetails &details, const content::FrameNavigateParams &params) Q_DECL_OVERRIDE;
- virtual void WasShown() Q_DECL_OVERRIDE;
- virtual void DidFirstVisuallyNonEmptyPaint() Q_DECL_OVERRIDE;
+ void RenderFrameDeleted(content::RenderFrameHost *render_frame_host) override;
+ void DidStartProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &validated_url, bool is_error_page, bool is_iframe_srcdoc) override;
+ void DidCommitProvisionalLoadForFrame(content::RenderFrameHost *render_frame_host, const GURL &url, ui::PageTransition transition_type) override;
+ void DidFailProvisionalLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url,
+ int error_code, const base::string16 &error_description, bool was_ignored_by_handler) override;
+ void DidFailLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url,
+ int error_code, const base::string16 &error_description, bool was_ignored_by_handler) override;
+ void DidFinishLoad(content::RenderFrameHost *render_frame_host, const GURL &validated_url) override;
+ void DidUpdateFaviconURL(const std::vector<content::FaviconURL> &candidates) override;
+ void DidNavigateAnyFrame(content::RenderFrameHost *render_frame_host, const content::LoadCommittedDetails &details, const content::FrameNavigateParams &params) override;
+ void WasShown() override;
+ void DidFirstVisuallyNonEmptyPaint() override;
void overrideWebPreferences(content::WebContents *, content::WebPreferences*);
void allowCertificateError(const QSharedPointer<CertificateErrorController> &) ;
diff --git a/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
index a048db14..5db4e287 100644
--- a/src/core/web_contents_view_qt.h
+++ b/src/core/web_contents_view_qt.h
@@ -71,62 +71,60 @@ public:
void initialize(WebContentsAdapterClient* client);
WebContentsAdapterClient *client() { return m_client; }
- virtual content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) Q_DECL_OVERRIDE;
+ content::RenderWidgetHostViewBase *CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack) override;
- virtual void CreateView(const gfx::Size& initial_size, gfx::NativeView context) Q_DECL_OVERRIDE;
+ void CreateView(const gfx::Size& initial_size, gfx::NativeView context) override;
- virtual content::RenderWidgetHostViewBase* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) Q_DECL_OVERRIDE;
+ content::RenderWidgetHostViewBase* CreateViewForPopupWidget(content::RenderWidgetHost* render_widget_host) override;
- virtual void SetPageTitle(const base::string16& title) Q_DECL_OVERRIDE { }
+ void SetPageTitle(const base::string16& title) override { }
- virtual void RenderViewCreated(content::RenderViewHost* host) Q_DECL_OVERRIDE;
+ void RenderViewCreated(content::RenderViewHost* host) override;
- virtual void RenderViewSwappedIn(content::RenderViewHost* host) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ void RenderViewSwappedIn(content::RenderViewHost* host) override { QT_NOT_YET_IMPLEMENTED }
- virtual void SetOverscrollControllerEnabled(bool enabled) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ void SetOverscrollControllerEnabled(bool enabled) override { QT_NOT_YET_IMPLEMENTED }
- virtual gfx::NativeView GetNativeView() const Q_DECL_OVERRIDE;
+ gfx::NativeView GetNativeView() const override;
- virtual gfx::NativeView GetContentNativeView() const Q_DECL_OVERRIDE { QT_NOT_USED return 0; }
+ gfx::NativeView GetContentNativeView() const override { QT_NOT_USED return 0; }
- virtual gfx::NativeWindow GetTopLevelNativeWindow() const Q_DECL_OVERRIDE { QT_NOT_USED return 0; }
+ gfx::NativeWindow GetTopLevelNativeWindow() const override { QT_NOT_USED return 0; }
- virtual void GetContainerBounds(gfx::Rect* out) const Q_DECL_OVERRIDE;
+ void GetContainerBounds(gfx::Rect* out) const override;
- virtual void SizeContents(const gfx::Size& size) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ void SizeContents(const gfx::Size& size) override { QT_NOT_YET_IMPLEMENTED }
- virtual void Focus() Q_DECL_OVERRIDE;
+ void Focus() override;
- virtual void SetInitialFocus() Q_DECL_OVERRIDE;
+ void SetInitialFocus() override;
- virtual void StoreFocus() Q_DECL_OVERRIDE { QT_NOT_USED }
+ void StoreFocus() override { QT_NOT_USED }
- virtual void RestoreFocus() Q_DECL_OVERRIDE { QT_NOT_USED }
+ void RestoreFocus() override { QT_NOT_USED }
- virtual content::DropData* GetDropData() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED return 0; }
+ content::DropData* GetDropData() const override { QT_NOT_YET_IMPLEMENTED return 0; }
- virtual gfx::Rect GetViewBounds() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); }
+ gfx::Rect GetViewBounds() const override { QT_NOT_YET_IMPLEMENTED return gfx::Rect(); }
void StartDragging(const content::DropData& drop_data, blink::WebDragOperationsMask allowed_ops,
const gfx::ImageSkia& image, const gfx::Vector2d& image_offset,
const content::DragEventSourceInfo& event_info,
- content::RenderWidgetHostImpl* source_rwh) Q_DECL_OVERRIDE;
+ content::RenderWidgetHostImpl* source_rwh) override;
- void UpdateDragCursor(blink::WebDragOperation dragOperation) Q_DECL_OVERRIDE;
+ void UpdateDragCursor(blink::WebDragOperation dragOperation) override;
- virtual void ShowContextMenu(content::RenderFrameHost *, const content::ContextMenuParams &params) Q_DECL_OVERRIDE;
+ void ShowContextMenu(content::RenderFrameHost *, const content::ContextMenuParams &params) override;
- virtual void TakeFocus(bool reverse) Q_DECL_OVERRIDE;
+ void TakeFocus(bool reverse) override;
- virtual void GetScreenInfo(content::ScreenInfo* results) const Q_DECL_OVERRIDE;
+ void GetScreenInfo(content::ScreenInfo* results) const override;
#if defined(OS_MACOSX)
- virtual void SetAllowOtherViews(bool allow) Q_DECL_OVERRIDE { m_allowOtherViews = allow; }
- virtual bool GetAllowOtherViews() const Q_DECL_OVERRIDE { return m_allowOtherViews; }
- virtual void CloseTabAfterEventTracking() Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
- virtual bool IsEventTracking() const Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED; return false; }
- virtual void SetOverlayView(WebContentsView* overlay, const gfx::Point& offset) { QT_NOT_YET_IMPLEMENTED }
- virtual void RemoveOverlayView() { QT_NOT_YET_IMPLEMENTED }
+ void SetAllowOtherViews(bool allow) override { m_allowOtherViews = allow; }
+ bool GetAllowOtherViews() const override { return m_allowOtherViews; }
+ void CloseTabAfterEventTracking() override { QT_NOT_YET_IMPLEMENTED }
+ bool IsEventTracking() const override { QT_NOT_YET_IMPLEMENTED; return false; }
#endif // defined(OS_MACOSX)
private:
diff --git a/src/core/yuv_video_node.cpp b/src/core/yuv_video_node.cpp
index 16e52575..c28e25f9 100644
--- a/src/core/yuv_video_node.cpp
+++ b/src/core/yuv_video_node.cpp
@@ -53,9 +53,9 @@ namespace QtWebEngineCore {
class YUVVideoMaterialShader : public QSGMaterialShader
{
public:
- virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
+ void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
- virtual char const *const *attributeNames() const Q_DECL_OVERRIDE {
+ char const *const *attributeNames() const override {
static const char *names[] = {
"a_position",
"a_texCoord",
@@ -65,7 +65,7 @@ public:
}
protected:
- virtual const char *vertexShader() const Q_DECL_OVERRIDE {
+ const char *vertexShader() const override {
// Keep in sync with cc::VertexShaderPosTexYUVStretchOffset
const char *shader =
"attribute highp vec4 a_position;\n"
@@ -85,7 +85,7 @@ protected:
return shader;
}
- virtual const char *fragmentShader() const Q_DECL_OVERRIDE {
+ const char *fragmentShader() const override {
// Keep in sync with cc::FragmentShaderYUVVideo
static const char *shader =
"varying mediump vec2 v_yaTexCoord;\n"
@@ -113,7 +113,7 @@ protected:
return shader;
}
- virtual void initialize() Q_DECL_OVERRIDE {
+ void initialize() override {
m_id_matrix = program()->uniformLocation("matrix");
m_id_yaTexScale = program()->uniformLocation("yaTexScale");
m_id_uvTexScale = program()->uniformLocation("uvTexScale");
@@ -146,10 +146,10 @@ protected:
class YUVAVideoMaterialShader : public YUVVideoMaterialShader
{
- virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) Q_DECL_OVERRIDE;
+ void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override;
protected:
- virtual const char *fragmentShader() const Q_DECL_OVERRIDE {
+ const char *fragmentShader() const override {
// Keep in sync with cc::FragmentShaderYUVAVideo
static const char *shader =
"varying mediump vec2 v_yaTexCoord;\n"
@@ -179,7 +179,7 @@ protected:
return shader;
}
- virtual void initialize() Q_DECL_OVERRIDE {
+ void initialize() override {
// YUVVideoMaterialShader has a subset of the uniforms.
YUVVideoMaterialShader::initialize();
m_id_aTexture = program()->uniformLocation("a_texture");
diff --git a/src/core/yuv_video_node.h b/src/core/yuv_video_node.h
index 670ec62b..0baa5f5b 100644
--- a/src/core/yuv_video_node.h
+++ b/src/core/yuv_video_node.h
@@ -62,14 +62,14 @@ public:
const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
ColorSpace colorspace, float rMul, float rOff);
- virtual QSGMaterialType *type() const Q_DECL_OVERRIDE
+ QSGMaterialType *type() const override
{
static QSGMaterialType theType;
return &theType;
}
- virtual QSGMaterialShader *createShader() const Q_DECL_OVERRIDE;
- virtual int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE;
+ QSGMaterialShader *createShader() const override;
+ int compare(const QSGMaterial *other) const override;
QSGTexture *m_yTexture;
QSGTexture *m_uTexture;
@@ -90,14 +90,14 @@ public:
const QRectF &yaTexCoordRect, const QRectF &uvTexCoordRect, const QSizeF &yaTexSize, const QSizeF &uvTexSize,
ColorSpace colorspace, float rMul, float rOff);
- virtual QSGMaterialType *type() const Q_DECL_OVERRIDE
+ QSGMaterialType *type() const override
{
static QSGMaterialType theType;
return &theType;
}
- virtual QSGMaterialShader *createShader() const Q_DECL_OVERRIDE;
- virtual int compare(const QSGMaterial *other) const Q_DECL_OVERRIDE;
+ QSGMaterialShader *createShader() const override;
+ int compare(const QSGMaterial *other) const override;
QSGTexture *m_aTexture;
};