Commit 8972f99ed6c9f97d059a0c9f8f642545286648e6

Fix up these QtWebKit files after the merge from 4.6.

I should've used checkout --theirs src/3rdparty/webkit after the merge,
instead of permitting git's auto-merge for these files.

Reviewed-by: Paul
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
(7 / 5)
  
540540*/
541541QUrl QWebFrame::requestedUrl() const
542542{
543 // In the following edge cases (where the failing document
544 // loader does not get commited by the frame loader) it is
545 // safer to rely on outgoingReferrer than originalRequest.
543546 if (!d->frame->loader()->activeDocumentLoader()
544 || !d->frameLoaderClient->m_loadSucceeded)
547 || (!d->frameLoaderClient->m_loadError.isNull()
548 && !d->frame->loader()->outgoingReferrer().isEmpty()))
545549 return QUrl(d->frame->loader()->outgoingReferrer());
546550
547551 return d->frame->loader()->originalRequest().url();
……
803803 d->horizontalScrollBarPolicy = policy;
804804 if (d->frame->view()) {
805805 d->frame->view()->setHorizontalScrollbarMode((ScrollbarMode)policy);
806 d->frame->view()->updateDefaultScrollbarState();
807806 }
808807 } else {
809808 d->verticalScrollBarPolicy = policy;
810809 if (d->frame->view()) {
811810 d->frame->view()->setVerticalScrollbarMode((ScrollbarMode)policy);
812 d->frame->view()->updateDefaultScrollbarState();
813811 }
814812 }
815813}
……
10251025bool QWebFrame::hasFocus() const
10261026{
10271027 WebCore::Frame* ff = d->frame->page()->focusController()->focusedFrame();
1028 return QWebFramePrivate::kit(ff) == this;
1028 return ff && QWebFramePrivate::kit(ff) == this;
10291029}
10301030
10311031/*!
……
12471247 ScriptController *proxy = d->frame->script();
12481248 QVariant rc;
12491249 if (proxy) {
1250 JSC::JSValue v = proxy->evaluate(ScriptSourceCode(scriptSource)).jsValue();
1250 JSC::JSValue v = d->frame->loader()->executeScript(ScriptSourceCode(scriptSource)).jsValue();
12511251 int distance = 0;
12521252 rc = JSC::Bindings::convertValueToQVariant(proxy->globalObject()->globalExec(), v, QMetaType::Void, &distance);
12531253 }
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
(0 / 2)
  
116116
117117 void consoleOutput();
118118
119 void consoleOutput();
120
121119private:
122120
123121