diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:08:59 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-23 15:09:20 +0100 |
| commit | 061d58bc0fa016cfeed744fd3e4663460635d69b (patch) | |
| tree | ad9b8b032c803e1c9054c23fa1b7a0f1976bf98f /Source/WebKit/qt/Api/qwebelement.cpp | |
| parent | 470286ecfe79d59df14944e5b5d34630fc739391 (diff) | |
| download | qtwebkit-061d58bc0fa016cfeed744fd3e4663460635d69b.tar.gz | |
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)
New snapshot that fixes various bugs
Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit/qt/Api/qwebelement.cpp')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebelement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/qt/Api/qwebelement.cpp b/Source/WebKit/qt/Api/qwebelement.cpp index 108b9b06f..82f579d95 100644 --- a/Source/WebKit/qt/Api/qwebelement.cpp +++ b/Source/WebKit/qt/Api/qwebelement.cpp @@ -39,6 +39,7 @@ #include "JSHTMLElement.h" #include "JSObject.h" #include "PropertyNameArray.h" +#include <QWebFrameAdapter.h> #include <parser/SourceCode.h> #include "qt_runtime.h" #include "NodeList.h" @@ -47,8 +48,6 @@ #include "StaticNodeList.h" #include "StyleResolver.h" #include "markup.h" -#include "qwebframe.h" -#include "qwebframe_p.h" #include "runtime_root.h" #include <JSDocument.h> #include <wtf/Vector.h> @@ -706,7 +705,8 @@ QWebFrame *QWebElement::webFrame() const Frame* frame = document->frame(); if (!frame) return 0; - return QWebFramePrivate::kit(frame); + QWebFrameAdapter* frameAdapter = QWebFrameAdapter::kit(frame); + return frameAdapter->apiHandle(); } static bool setupScriptContext(WebCore::Element* element, JSC::JSValue& thisValue, ScriptState*& state, ScriptController*& scriptController) |