diff options
| author | Alexandru Croitor <alexandru.croitor@theqtcompany.com> | 2016-04-05 15:33:38 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@theqtcompany.com> | 2016-04-08 09:05:54 +0000 |
| commit | 8b587a85efaf73082dd6522f757ea7c6d1b33aae (patch) | |
| tree | ea62451e081e863c6be8216ffe4bb23fe06fc8a1 /src/core | |
| parent | d1d83b229b1a015d40fec943e7b9018053b0d59d (diff) | |
Fix recentlyAudible Widgets and Quick API.
Rename all uses of wasRecentlyAudible to recentlyAudible.
Add missing recentlyAudible properties.
Change QtQuick slots to simple functions.
Change affected demobrowser example.
Adjust documentation for the API.
Change-Id: I5a6f7b8384c0b7e34afaa5c412a5543c210d3ef9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/web_contents_adapter.cpp | 2 | ||||
| -rw-r--r-- | src/core/web_contents_adapter.h | 2 | ||||
| -rw-r--r-- | src/core/web_contents_adapter_client.h | 2 | ||||
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 71d2172fe..7ac3ad72b 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -847,7 +847,7 @@ void WebContentsAdapter::setAudioMuted(bool muted) d->webContents->SetAudioMuted(muted); } -bool WebContentsAdapter::wasRecentlyAudible() +bool WebContentsAdapter::recentlyAudible() { Q_D(WebContentsAdapter); return d->webContents->WasRecentlyAudible(); diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h index 600e759e2..454215359 100644 --- a/src/core/web_contents_adapter.h +++ b/src/core/web_contents_adapter.h @@ -124,7 +124,7 @@ public: void download(const QUrl &url, const QString &suggestedFileName); bool isAudioMuted() const; void setAudioMuted(bool mute); - bool wasRecentlyAudible(); + bool recentlyAudible(); // Must match blink::WebMediaPlayerAction::Type. enum MediaPlayerAction { diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h index 559898411..93ba2fe3e 100644 --- a/src/core/web_contents_adapter_client.h +++ b/src/core/web_contents_adapter_client.h @@ -212,7 +212,7 @@ public: virtual void loadProgressChanged(int progress) = 0; virtual void didUpdateTargetURL(const QUrl&) = 0; virtual void selectionChanged() = 0; - virtual void wasRecentlyAudibleChanged(bool wasRecentlyAudible) = 0; + virtual void recentlyAudibleChanged(bool recentlyAudible) = 0; virtual QRectF viewportRect() const = 0; virtual qreal dpiScale() const = 0; virtual QColor backgroundColor() const = 0; diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 51b9d5bd0..e7d94d338 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -131,7 +131,7 @@ void WebContentsDelegateQt::NavigationStateChanged(content::WebContents* source, // Make sure to only emit the signal when loading isn't in progress, because it causes multiple // false signals to be emitted. if ((changed_flags & content::INVALIDATE_TYPE_TAB) && !(changed_flags & content::INVALIDATE_TYPE_LOAD)) { - m_viewClient->wasRecentlyAudibleChanged(source->WasRecentlyAudible()); + m_viewClient->recentlyAudibleChanged(source->WasRecentlyAudible()); } } |