diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-09 14:16:12 +0100 |
| commit | 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec (patch) | |
| tree | 52599cd0ab782b1768e23ad176f7618f98333cb6 /Source/WebCore/page/Frame.cpp | |
| parent | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (diff) | |
| download | qtwebkit-03e12282df9aa1e1fb05a8b90f1cfc2e08764cec.tar.gz | |
Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223)
Diffstat (limited to 'Source/WebCore/page/Frame.cpp')
| -rw-r--r-- | Source/WebCore/page/Frame.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/WebCore/page/Frame.cpp b/Source/WebCore/page/Frame.cpp index e1f5bcf99..72ddd62cb 100644 --- a/Source/WebCore/page/Frame.cpp +++ b/Source/WebCore/page/Frame.cpp @@ -33,7 +33,6 @@ #include "ApplyStyleCommand.h" #include "BackForwardController.h" #include "CSSComputedStyleDeclaration.h" -#include "CSSMutableStyleDeclaration.h" #include "CSSProperty.h" #include "CSSPropertyNames.h" #include "CachedCSSStyleSheet.h" @@ -80,6 +79,7 @@ #include "ScriptSourceCode.h" #include "ScriptValue.h" #include "Settings.h" +#include "StylePropertySet.h" #include "TextIterator.h" #include "TextResourceDecoder.h" #include "UserContentURLPattern.h" @@ -290,11 +290,11 @@ void Frame::setDocument(PassRefPtr<Document> newDoc) // Update the cached 'document' property, which is now stale. m_script.updateDocument(); - if (m_page) { - m_page->updateViewportArguments(); - if (m_page->mainFrame() == this) - notifyChromeClientWheelEventHandlerCountChanged(); - } + if (m_doc) + m_doc->updateViewportArguments(); + + if (m_page && m_page->mainFrame() == this) + notifyChromeClientWheelEventHandlerCountChanged(); } #if ENABLE(ORIENTATION_EVENTS) @@ -668,6 +668,9 @@ void Frame::pageDestroyed() if (m_domWindow) { m_domWindow->resetGeolocation(); +#if ENABLE(NOTIFICATIONS) + m_domWindow->resetNotifications(); +#endif m_domWindow->pageDestroyed(); } @@ -1068,7 +1071,7 @@ DragImageRef Frame::nodeImage(Node* node) m_doc->updateLayout(); m_view->setNodeToDraw(node); // Enable special sub-tree drawing mode. - IntRect topLevelRect; + LayoutRect topLevelRect; IntRect paintingRect = renderer->paintingRootRect(topLevelRect); OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size())); |