summaryrefslogtreecommitdiffstats
path: root/WebKit/qt/Api
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/qt/Api')
-rw-r--r--WebKit/qt/Api/DerivedSources.pro5
-rw-r--r--WebKit/qt/Api/qwebelement.cpp6
-rw-r--r--WebKit/qt/Api/qwebframe.cpp6
-rw-r--r--WebKit/qt/Api/qwebframe_p.h4
-rw-r--r--WebKit/qt/Api/qwebhistory.cpp2
-rw-r--r--WebKit/qt/Api/qwebhistory_p.h2
-rw-r--r--WebKit/qt/Api/qwebpage.cpp2
-rw-r--r--WebKit/qt/Api/qwebpage_p.h2
-rw-r--r--WebKit/qt/Api/qwebview.cpp2
9 files changed, 17 insertions, 14 deletions
diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index 62546f6..86d5dac 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -10,15 +10,14 @@ DESTDIR = ../../../include/QtWebKit
QUOTE = ""
DOUBLE_ESCAPED_QUOTE = ""
ESCAPE = ""
-win32-msvc*|symbian {
- ESCAPE = "^"
-} else:win32-g++*:isEmpty(QMAKE_SH) {
+contains(QMAKE_HOST.os, "Windows"):isEmpty(QMAKE_SH) {
# MinGW's make will run makefile commands using sh, even if make
# was run from the Windows shell, if it finds sh in the path.
ESCAPE = "^"
} else {
QUOTE = "\'"
DOUBLE_ESCAPED_QUOTE = "\\\'"
+ ESCAPE = "\\"
}
qtheader_module.target = $${DESTDIR}/QtWebKit
diff --git a/WebKit/qt/Api/qwebelement.cpp b/WebKit/qt/Api/qwebelement.cpp
index ce2f283..83ee451 100644
--- a/WebKit/qt/Api/qwebelement.cpp
+++ b/WebKit/qt/Api/qwebelement.cpp
@@ -739,7 +739,7 @@ QVariant QWebElement::evaluateJavaScript(const QString& scriptSource)
return QVariant();
JSC::ScopeChain& scopeChain = state->dynamicGlobalObject()->globalScopeChain();
- JSC::UString script((const UChar*)scriptSource.data(), scriptSource.length());
+ JSC::UString script(reinterpret_cast_ptr<const UChar*>(scriptSource.data()), scriptSource.length());
JSC::Completion completion = JSC::evaluate(state, scopeChain, JSC::makeSource(script), thisValue);
if ((completion.complType() != JSC::ReturnValue) && (completion.complType() != JSC::Normal))
return QVariant();
@@ -1190,6 +1190,8 @@ void QWebElement::removeAllChildren()
m_element->removeAllChildren();
}
+// FIXME: This code, and all callers are wrong, and have no place in a
+// WebKit implementation. These should be replaced with WebCore implementations.
static RefPtr<Node> findInsertionPoint(PassRefPtr<Node> root)
{
RefPtr<Node> node = root;
@@ -1205,7 +1207,7 @@ static RefPtr<Node> findInsertionPoint(PassRefPtr<Node> root)
// The insert point could be a non-enclosable tag and it can thus
// never have children, so go one up. Get the parent element, and not
// note as a root note will always exist.
- if (element->endTagRequirement() == TagStatusForbidden)
+ if (element->ieForbidsInsertHTML())
node = node->parentElement();
}
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 0bb6922..1b0c2df 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -496,7 +496,7 @@ void QWebFrame::addToJavaScriptWindowObject(const QString &name, QObject *object
JSC::Bindings::QtInstance::getQtInstance(object, root, ownership)->createRuntimeObject(exec);
JSC::PutPropertySlot slot;
- window->put(exec, JSC::Identifier(exec, (const UChar *) name.constData(), name.length()), runtimeObject, slot);
+ window->put(exec, JSC::Identifier(exec, reinterpret_cast_ptr<const UChar*>(name.constData()), name.length()), runtimeObject, slot);
}
/*!
@@ -1407,12 +1407,12 @@ QWebSecurityOrigin QWebFrame::securityOrigin() const
return QWebSecurityOrigin(priv);
}
-WebCore::Frame* QWebFramePrivate::core(QWebFrame* webFrame)
+WebCore::Frame* QWebFramePrivate::core(const QWebFrame* webFrame)
{
return webFrame->d->frame;
}
-QWebFrame* QWebFramePrivate::kit(WebCore::Frame* coreFrame)
+QWebFrame* QWebFramePrivate::kit(const WebCore::Frame* coreFrame)
{
return static_cast<FrameLoaderClientQt*>(coreFrame->loader()->client())->webFrame();
}
diff --git a/WebKit/qt/Api/qwebframe_p.h b/WebKit/qt/Api/qwebframe_p.h
index 15b0549..b5dda62 100644
--- a/WebKit/qt/Api/qwebframe_p.h
+++ b/WebKit/qt/Api/qwebframe_p.h
@@ -81,8 +81,8 @@ public:
WebCore::Scrollbar* horizontalScrollBar() const;
WebCore::Scrollbar* verticalScrollBar() const;
- static WebCore::Frame* core(QWebFrame*);
- static QWebFrame* kit(WebCore::Frame*);
+ static WebCore::Frame* core(const QWebFrame*);
+ static QWebFrame* kit(const WebCore::Frame*);
void renderRelativeCoords(WebCore::GraphicsContext*, QWebFrame::RenderLayer, const QRegion& clip);
#if ENABLE(TILED_BACKING_STORE)
diff --git a/WebKit/qt/Api/qwebhistory.cpp b/WebKit/qt/Api/qwebhistory.cpp
index 55305c9..1d9935d 100644
--- a/WebKit/qt/Api/qwebhistory.cpp
+++ b/WebKit/qt/Api/qwebhistory.cpp
@@ -554,7 +554,7 @@ QWebPagePrivate* QWebHistoryPrivate::page()
return QWebFramePrivate::kit(static_cast<WebCore::BackForwardListImpl*>(lst)->page()->mainFrame())->page()->handle();
}
-WebCore::HistoryItem* QWebHistoryItemPrivate::core(QWebHistoryItem* q)
+WebCore::HistoryItem* QWebHistoryItemPrivate::core(const QWebHistoryItem* q)
{
return q->d->item;
}
diff --git a/WebKit/qt/Api/qwebhistory_p.h b/WebKit/qt/Api/qwebhistory_p.h
index c9ff91b..1df2349 100644
--- a/WebKit/qt/Api/qwebhistory_p.h
+++ b/WebKit/qt/Api/qwebhistory_p.h
@@ -45,7 +45,7 @@ public:
item->deref();
}
- static WebCore::HistoryItem* core(QWebHistoryItem* q);
+ static WebCore::HistoryItem* core(const QWebHistoryItem* q);
WebCore::HistoryItem* item;
};
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 516ebc9..5eee21c 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -322,7 +322,7 @@ QWebPagePrivate::~QWebPagePrivate()
#endif
}
-WebCore::Page* QWebPagePrivate::core(QWebPage* page)
+WebCore::Page* QWebPagePrivate::core(const QWebPage* page)
{
return page->d->page;
}
diff --git a/WebKit/qt/Api/qwebpage_p.h b/WebKit/qt/Api/qwebpage_p.h
index cf4ab88..6310eaf 100644
--- a/WebKit/qt/Api/qwebpage_p.h
+++ b/WebKit/qt/Api/qwebpage_p.h
@@ -72,7 +72,7 @@ public:
QWebPagePrivate(QWebPage*);
~QWebPagePrivate();
- static WebCore::Page* core(QWebPage*);
+ static WebCore::Page* core(const QWebPage*);
static QWebPagePrivate* priv(QWebPage*);
void createMainFrame();
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 5e7265f..10cf60c 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -415,6 +415,8 @@ void QWebView::setPage(QWebPage* page)
this, SIGNAL(statusBarMessage(QString)));
connect(d->page, SIGNAL(linkClicked(QUrl)),
this, SIGNAL(linkClicked(QUrl)));
+ connect(d->page, SIGNAL(selectionChanged()),
+ this, SIGNAL(selectionChanged()));
connect(d->page, SIGNAL(microFocusChanged()),
this, SLOT(updateMicroFocus()));
generated by cgit v1.1 at 2024-12-23 14:47:47 +0000