diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKit/qt/Api/qgraphicswebview.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKit/qt/Api/qgraphicswebview.cpp')
| -rw-r--r-- | WebKit/qt/Api/qgraphicswebview.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp index 178f5c2..8361970 100644 --- a/WebKit/qt/Api/qgraphicswebview.cpp +++ b/WebKit/qt/Api/qgraphicswebview.cpp @@ -122,7 +122,7 @@ void QGraphicsWebViewPrivate::_q_pageDestroyed() void QGraphicsWebViewPrivate::updateResizesToContentsForPage() { ASSERT(page); - + static_cast<PageClientQGraphicsWidget*>(page->d->client)->viewResizesToContents = resizesToContents; if (resizesToContents) { // resizes to contents mode requires preferred contents size to be set if (!page->preferredContentsSize().isValid()) @@ -821,10 +821,8 @@ void QGraphicsWebView::setResizesToContents(bool enabled) if (d->resizesToContents == enabled) return; d->resizesToContents = enabled; - if (d->page) { - static_cast<PageClientQGraphicsWidget*>(d->page->d->client)->viewResizesToContents = enabled; + if (d->page) d->updateResizesToContentsForPage(); - } } bool QGraphicsWebView::resizesToContents() const |