diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebKit/qt/WebCoreSupport/ChromeClientQt.cpp')
-rw-r--r-- | WebKit/qt/WebCoreSupport/ChromeClientQt.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp index 3fec1d3..e72ef3e 100644 --- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp @@ -118,14 +118,13 @@ FloatRect ChromeClientQt::pageRect() return FloatRect(QRectF(QPointF(0, 0), m_webPage->viewportSize())); } - float ChromeClientQt::scaleFactor() { - notImplemented(); - return 1; + if (!m_webPage) + return 1; + return m_webPage->d->pixelRatio; } - void ChromeClientQt::focus() { if (!m_webPage) @@ -618,9 +617,12 @@ void ChromeClientQt::scheduleCompositingLayerSync() platformPageClient()->markForSync(true); } -bool ChromeClientQt::allowsAcceleratedCompositing() const +ChromeClient::CompositingTriggerFlags ChromeClientQt::allowedCompositingTriggers() const { - return (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing()); + if (platformPageClient() && platformPageClient()->allowsAcceleratedCompositing()) + return AllTriggers; + + return 0; } #endif |