diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebCore/page/DOMWindowProperty.h | |
parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebCore/page/DOMWindowProperty.h')
-rw-r--r-- | Source/WebCore/page/DOMWindowProperty.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/page/DOMWindowProperty.h b/Source/WebCore/page/DOMWindowProperty.h index 441bc242e..e2dcc4437 100644 --- a/Source/WebCore/page/DOMWindowProperty.h +++ b/Source/WebCore/page/DOMWindowProperty.h @@ -47,7 +47,7 @@ protected: virtual ~DOMWindowProperty(); Frame* m_frame; - DOMWindow* m_disconnectedDOMWindow; + DOMWindow* m_associatedDOMWindow; }; } |