[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:13:02 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b45dd6a2d801374a2c32fa52562ddf49f7055cb7
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 10 01:24:34 2002 +0000
Reviewed by Trey.
- made KWQKHTMLPart a subclass of KHTMLPart so we can override virtual functions
* khtml/khtml_part.h: Get rid of kwq pointer.
* khtml/khtml_part.cpp:
(KHTMLPart::init): No need to make a KWQKHTMLPart any more.
(KHTMLPart::~KHTMLPart): No need to delete a KWQKHTMLPart any more.
(KHTMLPart::closeURL): KWQKHTMLPart does saveDocumentState in an override now.
(KHTMLPart::begin): KWQ() instead of ->kwq.
(KHTMLPart::checkCompleted): KWQ() instead of ->kwq, and ifdef out some unneeded code.
(KHTMLPart::urlSelected): KWQ() instead of ->kwq.
(KHTMLPart::requestFrameName): KWQ() instead of ->kwq.
(KHTMLPart::processObjectRequest): Just call openURL, since we are now KWQKHTMLPart.
(KHTMLPart::submitForm): KWQ() instead of ->kwq.
(KHTMLPart::popupMenu): Did a bit more ifdef'int out here.
* kwq/KWQKHTMLPart.h: Include "khtml_part.h" and remove includes we don't need any more.
Inherit from KHTMLPart instead of QObject. Remove KHTMLPart parameter from constructor.
Override openURL and closeURL. Remove part and d pointers. Add KWQ() inline to avoid casting.
* kwq/KWQKHTMLPart.mm:
(KHTMLPart::completed): KWQ() instead of ->kwq.
(KHTMLPart::openURL): Never reached now, since we override.
(KHTMLPart::setStatusBarText): KWQ() instead of ->kwq.
(KHTMLPart::started): KWQ() instead of ->kwq.
(KWQKHTMLPart::KWQKHTMLPart): No need to deal with separate part.
(KWQKHTMLPart::bridgeForFrameName): KWQ() instead of ->kwq.
(KWQKHTMLPart::openURL): Add bool return value so we can override the existing openURL.
(KWQKHTMLPart::slotData): Remove unneeded part->.
(KWQKHTMLPart::setView): Remove unneeded part->.
(KWQKHTMLPart::document): Remove unneeded part->.
(KWQKHTMLPart::renderer): Remove unneeded part->.
(KWQKHTMLPart::userAgent): Remove unneeded part->.
(KWQKHTMLPart::nextKeyViewInFrame): KWQ() instead of ->kwq.
(KWQKHTMLPart::nextKeyViewInFrameHierarchy): KWQ() instead of ->kwq.
(KWQKHTMLPart::canCachePage): Remove unneeded part->.
(KWQKHTMLPart::saveWindowProperties): Use this instead of part.
(KWQKHTMLPart::saveLocationProperties): Use this instead of part.
(KWQKHTMLPart::restoreWindowProperties): Use this instead of part.
(KWQKHTMLPart::restoreLocationProperties): Use this instead of part.
(KWQKHTMLPart::openURLFromPageCache): Remove unneeded part->.
(KWQKHTMLPart::partForNode): KWQ() instead of ->kwq.
(KWQKHTMLPart::updatePolicyBaseURL): Remove unneeded part->.
(KWQKHTMLPart::setPolicyBaseURL): Remove unneeded part->.
(KWQKHTMLPart::createDummyDocument): Use this instead of part.
(KWQKHTMLPart::scrollToAnchor): Remove unneeded part->.
(KWQKHTMLPart::closeURL): Added. Calls saveDocumentState().
* kwq/WebCoreBridge.h: Use KWQKHTMLPart instead of KHTMLPart.
* kwq/WebCoreBridge.mm: (-[WebCoreBridge init]): Make a KWQKHTMLPart.
Use _part instead of _part->kwq in the rest of the file.
* kwq/KWQSignal.mm: (KWQSignal::disconnect): Add the names of a few signals that are
disconnected after the KWQKHTMLPart part of the KHTMLPart is destroyed, to avoid noise.
* khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty): KWQ() instead of ->kwq.
* khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::initScript): KWQ() instead of ->kwq.
* khtml/ecma/kjs_window.cpp:
(Window::scheduleClose): KWQ() instead of ->kwq.
(WindowFunc::tryCall): KWQ() instead of ->kwq.
* khtml/xml/dom_docimpl.cpp: (DocumentImpl::setTitle): KWQ() instead of ->kwq.
* kwq/KWQKHTMLPartBrowserExtension.mm:
(KHTMLPartBrowserExtension::openURLRequest): KWQ() instead of ->kwq.
(KHTMLPartBrowserExtension::createNewWindow): KWQ() instead of ->kwq.
(KHTMLPartBrowserExtension::setIconURL): KWQ() instead of ->kwq.
(KHTMLPartBrowserExtension::setTypedIconURL): KWQ() instead of ->kwq.
* kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::showApplet): KWQ() instead of ->kwq.
* kwq/KWQLoader.mm:
(KWQServeRequest): Cast to KWQKHTMLPart instead of casting to KHTMLPart and doing ->kwq.
(KWQCheckIfReloading): Ditto.
(KWQCheckCacheObjectStatus): Ditto.
* WebCore.pbproj/project.pbxproj: Let Electron punish the wicked.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 42dae80..1e61fbd 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,79 @@
+2002-12-09 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey.
+
+ - made KWQKHTMLPart a subclass of KHTMLPart so we can override virtual functions
+
+ * khtml/khtml_part.h: Get rid of kwq pointer.
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::init): No need to make a KWQKHTMLPart any more.
+ (KHTMLPart::~KHTMLPart): No need to delete a KWQKHTMLPart any more.
+ (KHTMLPart::closeURL): KWQKHTMLPart does saveDocumentState in an override now.
+ (KHTMLPart::begin): KWQ() instead of ->kwq.
+ (KHTMLPart::checkCompleted): KWQ() instead of ->kwq, and ifdef out some unneeded code.
+ (KHTMLPart::urlSelected): KWQ() instead of ->kwq.
+ (KHTMLPart::requestFrameName): KWQ() instead of ->kwq.
+ (KHTMLPart::processObjectRequest): Just call openURL, since we are now KWQKHTMLPart.
+ (KHTMLPart::submitForm): KWQ() instead of ->kwq.
+ (KHTMLPart::popupMenu): Did a bit more ifdef'int out here.
+
+ * kwq/KWQKHTMLPart.h: Include "khtml_part.h" and remove includes we don't need any more.
+ Inherit from KHTMLPart instead of QObject. Remove KHTMLPart parameter from constructor.
+ Override openURL and closeURL. Remove part and d pointers. Add KWQ() inline to avoid casting.
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::completed): KWQ() instead of ->kwq.
+ (KHTMLPart::openURL): Never reached now, since we override.
+ (KHTMLPart::setStatusBarText): KWQ() instead of ->kwq.
+ (KHTMLPart::started): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::KWQKHTMLPart): No need to deal with separate part.
+ (KWQKHTMLPart::bridgeForFrameName): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::openURL): Add bool return value so we can override the existing openURL.
+ (KWQKHTMLPart::slotData): Remove unneeded part->.
+ (KWQKHTMLPart::setView): Remove unneeded part->.
+ (KWQKHTMLPart::document): Remove unneeded part->.
+ (KWQKHTMLPart::renderer): Remove unneeded part->.
+ (KWQKHTMLPart::userAgent): Remove unneeded part->.
+ (KWQKHTMLPart::nextKeyViewInFrame): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::nextKeyViewInFrameHierarchy): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::canCachePage): Remove unneeded part->.
+ (KWQKHTMLPart::saveWindowProperties): Use this instead of part.
+ (KWQKHTMLPart::saveLocationProperties): Use this instead of part.
+ (KWQKHTMLPart::restoreWindowProperties): Use this instead of part.
+ (KWQKHTMLPart::restoreLocationProperties): Use this instead of part.
+ (KWQKHTMLPart::openURLFromPageCache): Remove unneeded part->.
+ (KWQKHTMLPart::partForNode): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::updatePolicyBaseURL): Remove unneeded part->.
+ (KWQKHTMLPart::setPolicyBaseURL): Remove unneeded part->.
+ (KWQKHTMLPart::createDummyDocument): Use this instead of part.
+ (KWQKHTMLPart::scrollToAnchor): Remove unneeded part->.
+ (KWQKHTMLPart::closeURL): Added. Calls saveDocumentState().
+
+ * kwq/WebCoreBridge.h: Use KWQKHTMLPart instead of KHTMLPart.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge init]): Make a KWQKHTMLPart.
+ Use _part instead of _part->kwq in the rest of the file.
+
+ * kwq/KWQSignal.mm: (KWQSignal::disconnect): Add the names of a few signals that are
+ disconnected after the KWQKHTMLPart part of the KHTMLPart is destroyed, to avoid noise.
+
+ * khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty): KWQ() instead of ->kwq.
+ * khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::initScript): KWQ() instead of ->kwq.
+ * khtml/ecma/kjs_window.cpp:
+ (Window::scheduleClose): KWQ() instead of ->kwq.
+ (WindowFunc::tryCall): KWQ() instead of ->kwq.
+ * khtml/xml/dom_docimpl.cpp: (DocumentImpl::setTitle): KWQ() instead of ->kwq.
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::openURLRequest): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::createNewWindow): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::setIconURL): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::setTypedIconURL): KWQ() instead of ->kwq.
+ * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::showApplet): KWQ() instead of ->kwq.
+ * kwq/KWQLoader.mm:
+ (KWQServeRequest): Cast to KWQKHTMLPart instead of casting to KHTMLPart and doing ->kwq.
+ (KWQCheckIfReloading): Ditto.
+ (KWQCheckCacheObjectStatus): Ditto.
+
+ * WebCore.pbproj/project.pbxproj: Let Electron punish the wicked.
+
2002-12-09 Richard Williamson <rjw at apple.com>
Many changes for b/f list.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 42dae80..1e61fbd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,79 @@
+2002-12-09 Darin Adler <darin at apple.com>
+
+ Reviewed by Trey.
+
+ - made KWQKHTMLPart a subclass of KHTMLPart so we can override virtual functions
+
+ * khtml/khtml_part.h: Get rid of kwq pointer.
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::init): No need to make a KWQKHTMLPart any more.
+ (KHTMLPart::~KHTMLPart): No need to delete a KWQKHTMLPart any more.
+ (KHTMLPart::closeURL): KWQKHTMLPart does saveDocumentState in an override now.
+ (KHTMLPart::begin): KWQ() instead of ->kwq.
+ (KHTMLPart::checkCompleted): KWQ() instead of ->kwq, and ifdef out some unneeded code.
+ (KHTMLPart::urlSelected): KWQ() instead of ->kwq.
+ (KHTMLPart::requestFrameName): KWQ() instead of ->kwq.
+ (KHTMLPart::processObjectRequest): Just call openURL, since we are now KWQKHTMLPart.
+ (KHTMLPart::submitForm): KWQ() instead of ->kwq.
+ (KHTMLPart::popupMenu): Did a bit more ifdef'int out here.
+
+ * kwq/KWQKHTMLPart.h: Include "khtml_part.h" and remove includes we don't need any more.
+ Inherit from KHTMLPart instead of QObject. Remove KHTMLPart parameter from constructor.
+ Override openURL and closeURL. Remove part and d pointers. Add KWQ() inline to avoid casting.
+ * kwq/KWQKHTMLPart.mm:
+ (KHTMLPart::completed): KWQ() instead of ->kwq.
+ (KHTMLPart::openURL): Never reached now, since we override.
+ (KHTMLPart::setStatusBarText): KWQ() instead of ->kwq.
+ (KHTMLPart::started): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::KWQKHTMLPart): No need to deal with separate part.
+ (KWQKHTMLPart::bridgeForFrameName): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::openURL): Add bool return value so we can override the existing openURL.
+ (KWQKHTMLPart::slotData): Remove unneeded part->.
+ (KWQKHTMLPart::setView): Remove unneeded part->.
+ (KWQKHTMLPart::document): Remove unneeded part->.
+ (KWQKHTMLPart::renderer): Remove unneeded part->.
+ (KWQKHTMLPart::userAgent): Remove unneeded part->.
+ (KWQKHTMLPart::nextKeyViewInFrame): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::nextKeyViewInFrameHierarchy): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::canCachePage): Remove unneeded part->.
+ (KWQKHTMLPart::saveWindowProperties): Use this instead of part.
+ (KWQKHTMLPart::saveLocationProperties): Use this instead of part.
+ (KWQKHTMLPart::restoreWindowProperties): Use this instead of part.
+ (KWQKHTMLPart::restoreLocationProperties): Use this instead of part.
+ (KWQKHTMLPart::openURLFromPageCache): Remove unneeded part->.
+ (KWQKHTMLPart::partForNode): KWQ() instead of ->kwq.
+ (KWQKHTMLPart::updatePolicyBaseURL): Remove unneeded part->.
+ (KWQKHTMLPart::setPolicyBaseURL): Remove unneeded part->.
+ (KWQKHTMLPart::createDummyDocument): Use this instead of part.
+ (KWQKHTMLPart::scrollToAnchor): Remove unneeded part->.
+ (KWQKHTMLPart::closeURL): Added. Calls saveDocumentState().
+
+ * kwq/WebCoreBridge.h: Use KWQKHTMLPart instead of KHTMLPart.
+ * kwq/WebCoreBridge.mm: (-[WebCoreBridge init]): Make a KWQKHTMLPart.
+ Use _part instead of _part->kwq in the rest of the file.
+
+ * kwq/KWQSignal.mm: (KWQSignal::disconnect): Add the names of a few signals that are
+ disconnected after the KWQKHTMLPart part of the KHTMLPart is destroyed, to avoid noise.
+
+ * khtml/ecma/kjs_navigator.cpp: (Navigator::getValueProperty): KWQ() instead of ->kwq.
+ * khtml/ecma/kjs_proxy.cpp: (KJSProxyImpl::initScript): KWQ() instead of ->kwq.
+ * khtml/ecma/kjs_window.cpp:
+ (Window::scheduleClose): KWQ() instead of ->kwq.
+ (WindowFunc::tryCall): KWQ() instead of ->kwq.
+ * khtml/xml/dom_docimpl.cpp: (DocumentImpl::setTitle): KWQ() instead of ->kwq.
+ * kwq/KWQKHTMLPartBrowserExtension.mm:
+ (KHTMLPartBrowserExtension::openURLRequest): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::createNewWindow): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::setIconURL): KWQ() instead of ->kwq.
+ (KHTMLPartBrowserExtension::setTypedIconURL): KWQ() instead of ->kwq.
+ * kwq/KWQKJavaAppletWidget.mm: (KJavaAppletWidget::showApplet): KWQ() instead of ->kwq.
+ * kwq/KWQLoader.mm:
+ (KWQServeRequest): Cast to KWQKHTMLPart instead of casting to KHTMLPart and doing ->kwq.
+ (KWQCheckIfReloading): Ditto.
+ (KWQCheckCacheObjectStatus): Ditto.
+
+ * WebCore.pbproj/project.pbxproj: Let Electron punish the wicked.
+
2002-12-09 Richard Williamson <rjw at apple.com>
Many changes for b/f list.
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 69616ea..da51e6c 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -178,7 +178,6 @@
</dict>
</plist>
";
- shouldUseHeadermap = 0;
};
0867D69DFE84028FC02AAC07 = {
buildActionMask = 2147483647;
diff --git a/WebCore/khtml/ecma/kjs_navigator.cpp b/WebCore/khtml/ecma/kjs_navigator.cpp
index d2daebd..8d10c72 100644
--- a/WebCore/khtml/ecma/kjs_navigator.cpp
+++ b/WebCore/khtml/ecma/kjs_navigator.cpp
@@ -178,7 +178,7 @@ Value Navigator::get(ExecState *exec, const Identifier &propertyName) const
Value Navigator::getValueProperty(ExecState *exec, int token) const
{
#if APPLE_CHANGES
- QString userAgent = m_part->kwq->userAgent();
+ QString userAgent = KWQ(m_part)->userAgent();
#else
KURL url = m_part->url();
QString userAgent = KProtocolManager::userAgentForHost(url.host());
diff --git a/WebCore/khtml/ecma/kjs_proxy.cpp b/WebCore/khtml/ecma/kjs_proxy.cpp
index 69fdae1..50ccc7b 100644
--- a/WebCore/khtml/ecma/kjs_proxy.cpp
+++ b/WebCore/khtml/ecma/kjs_proxy.cpp
@@ -275,7 +275,7 @@ void KJSProxyImpl::initScript()
"debug", Value(new TestFunctionImp()), Internal);
#if APPLE_CHANGES
- QString userAgent = m_part->kwq->userAgent();
+ QString userAgent = KWQ(m_part)->userAgent();
#else
QString userAgent = KProtocolManager::userAgentForHost(m_part->url().host());
#endif
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index 7bf7e95..78d8c20 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -868,7 +868,7 @@ void Window::scheduleClose()
kdDebug(6070) << "Window::scheduleClose window.close() " << m_part << endl;
Q_ASSERT(winq);
#if APPLE_CHANGES
- m_part->kwq->scheduleClose();
+ KWQ(m_part)->scheduleClose();
#else
QTimer::singleShot( 0, winq, SLOT( timeoutClose() ) );
#endif
@@ -998,7 +998,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::Alert:
part->xmlDocImpl()->updateRendering();
#if APPLE_CHANGES
- part->kwq->runJavaScriptAlert(str);
+ KWQ(part)->runJavaScriptAlert(str);
#else
KMessageBox::error(widget, QStyleSheet::convertFromPlainText(str), "JavaScript");
#endif
@@ -1006,7 +1006,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
case Window::Confirm:
part->xmlDocImpl()->updateRendering();
#if APPLE_CHANGES
- return Boolean(part->kwq->runJavaScriptConfirm(str));
+ return Boolean(KWQ(part)->runJavaScriptConfirm(str));
#else
return Boolean((KMessageBox::warningYesNo(widget, QStyleSheet::convertFromPlainText(str), "JavaScript",
i18n("OK"), i18n("Cancel")) == KMessageBox::Yes));
@@ -1015,7 +1015,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
part->xmlDocImpl()->updateRendering();
bool ok;
#if APPLE_CHANGES
- ok = part->kwq->runJavaScriptPrompt(str, args.size() >= 2 ? args[1].toString(exec).qstring() : QString::null, str2);
+ ok = KWQ(part)->runJavaScriptPrompt(str, args.size() >= 2 ? args[1].toString(exec).qstring() : QString::null, str2);
#else
if (args.size() >= 2)
str2 = QInputDialog::getText(i18n("Konqueror: Prompt"),
@@ -1336,7 +1336,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
return Undefined();
case Window::Blur:
#if APPLE_CHANGES
- part->kwq->unfocusWindow();
+ KWQ(part)->unfocusWindow();
#else
// TODO
#endif
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 217332e..5e41a6e 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -234,10 +234,6 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "khtml/khtml_popupmenu.rc", KHTMLFactory::instance() ) );
#endif
-#if APPLE_CHANGES
- kwq = new KWQKHTMLPart(this);
-#endif
-
connect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
connect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
@@ -295,8 +291,6 @@ KHTMLPart::~KHTMLPart()
}
#if APPLE_CHANGES
- delete kwq;
-
delete d->m_hostExtension;
#endif
@@ -495,10 +489,6 @@ bool KHTMLPart::openURL( const KURL &url )
bool KHTMLPart::closeURL()
{
-#if APPLE_CHANGES
- kwq->saveDocumentState();
-#endif
-
if ( d->m_job )
{
KHTMLPageCache::self()->cancelEntry(d->m_cacheId);
@@ -1321,7 +1311,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
if(url.isValid()) {
#if APPLE_CHANGES
- KHTMLFactory::vLinks()->insert( kwq->requestedURLString() );
+ KHTMLFactory::vLinks()->insert( KWQ(this)->requestedURLString() );
#else
QString urlString = url.url();
KHTMLFactory::vLinks()->insert( urlString );
@@ -1385,7 +1375,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->docLoader()->setShowAnimations( KHTMLFactory::defaultHTMLSettings()->showAnimations() );
#if APPLE_CHANGES
- kwq->updatePolicyBaseURL();
+ KWQ(this)->updatePolicyBaseURL();
#endif
#if !APPLE_CHANGES
@@ -1399,7 +1389,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
setUserStyleSheet( KURL( userStyleSheet ) );
#if APPLE_CHANGES
- kwq->restoreDocumentState();
+ KWQ(this)->restoreDocumentState();
#else
d->m_doc->setRestoreState(args.docState);
#endif
@@ -1662,11 +1652,11 @@ void KHTMLPart::checkCompleted()
emit completed();
}
+#if !APPLE_CHANGES
// find the alternate stylesheets
QStringList sheets;
if (d->m_doc)
sheets = d->m_doc->availableStyleSheets();
-#if !APPLE_CHANGES
d->m_paUseStylesheet->setItems( sheets );
d->m_paUseStylesheet->setEnabled( !sheets.isEmpty() );
if (!sheets.isEmpty())
@@ -2389,7 +2379,7 @@ void KHTMLPart::urlSelected( const QString &url, int button, int state, const QS
#if APPLE_CHANGES
args.metaData()["referrer"] = d->m_referrer;
- kwq->urlSelected(cURL, button, state, args);
+ KWQ(this)->urlSelected(cURL, button, state, args);
#else
if ( hasTarget )
{
@@ -2677,14 +2667,10 @@ bool KHTMLPart::requestFrame( khtml::RenderPart *frame, const QString &url, cons
return requestObject( &(*it), completeURL( url ));
}
-#if APPLE_CHANGES
-unsigned KHTMLPartPrivate::m_frameNameId = 0;
-#endif
-
QString KHTMLPart::requestFrameName()
{
#if APPLE_CHANGES
- return kwq->generateFrameName();
+ return KWQ(this)->generateFrameName();
#else
return QString::fromLatin1("<!--frame %1-->").arg(d->m_frameNameId++);
#endif
@@ -2790,11 +2776,11 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
{
KHTMLPart *part = dynamic_cast<KHTMLPart *>(&*child->m_part);
if (part)
- part->kwq->openURL(url);
+ part->openURL(url);
}
else
{
- KParts::ReadOnlyPart *part = kwq->createPart(*child, url, mimetype);
+ KParts::ReadOnlyPart *part = KWQ(this)->createPart(*child, url, mimetype);
#else
if ( !child->m_services.contains( mimetype ) )
{
@@ -3186,16 +3172,17 @@ void KHTMLPart::submitForm( const char *action, const QString &url, const QByteA
else
{
#if APPLE_CHANGES
- kwq->submitForm( u, args);
+ KWQ(this)->submitForm( u, args);
#else
emit d->m_extension->openURLRequest( u, args );
#endif
}
}
+#if !APPLE_CHANGES
+
void KHTMLPart::popupMenu( const QString &linkUrl )
{
-#if !APPLE_CHANGES
KURL popupURL;
KURL linkKURL;
if ( linkUrl.isEmpty() ) // click on background
@@ -3213,9 +3200,10 @@ void KHTMLPart::popupMenu( const QString &linkUrl )
delete client;
emit popupMenu(linkUrl, QCursor::pos());
-#endif
}
+#endif
+
void KHTMLPart::slotParentCompleted()
{
if ( !d->m_redirectURL.isEmpty() && !d->m_redirectionTimer.isActive() )
@@ -4239,11 +4227,13 @@ void KHTMLPart::khtmlMousePressEvent( khtml::MousePressEvent *event )
#endif
}
+#if !APPLE_CHANGES
if ( _mouse->button() == RightButton )
{
popupMenu( d->m_strSelectedURL );
d->m_strSelectedURL = d->m_strSelectedURLTarget = QString::null;
}
+#endif
}
void KHTMLPart::khtmlMouseDoubleClickEvent( khtml::MouseDoubleClickEvent *event)
diff --git a/WebCore/khtml/khtml_part.h b/WebCore/khtml/khtml_part.h
index 3f57360..07cf745 100644
--- a/WebCore/khtml/khtml_part.h
+++ b/WebCore/khtml/khtml_part.h
@@ -34,10 +34,6 @@
#include <qregexp.h>
-#if APPLE_CHANGES
-#include "KWQKHTMLPart.h"
-#endif
-
class KHTMLPartPrivate;
class KHTMLPartBrowserExtension;
class KJSProxy;
@@ -1084,7 +1080,6 @@ private:
#if APPLE_CHANGES
public:
- KWQKHTMLPart *kwq;
friend class KWQKHTMLPart;
void completed();
@@ -1096,4 +1091,8 @@ public:
};
+#if APPLE_CHANGES
+#include "KWQKHTMLPart.h"
+#endif
+
#endif
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 3da7ce0..2f34e90 100644
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -523,7 +523,7 @@ void DocumentImpl::setTitle(DOMString _title)
m_title = _title;
#if APPLE_CHANGES
- view()->part()->kwq->setTitle(_title);
+ KWQ(view()->part())->setTitle(_title);
#else
QString titleStr = m_title.string();
for (int i = 0; i < titleStr.length(); ++i)
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index 276421e..4147b1a 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -26,29 +26,12 @@
#ifndef KWQKHTMLPart_H
#define KWQKHTMLPart_H
-#include "KWQObject.h"
-#include "KWQKURL.h"
-#include "KWQSignal.h"
+#include "khtml_part.h"
-class KHTMLPart;
class KHTMLPartPrivate;
-class KHTMLView;
-
-namespace KParts {
- class ReadOnlyPart;
- class URLArgs;
-}
-
-namespace DOM {
- class DOMString;
- class DocumentImpl;
- class NodeImpl;
-}
namespace khtml {
- class ChildFrame;
class RenderObject;
- class RenderPart;
}
namespace KJS {
@@ -70,10 +53,10 @@ enum KWQSelectionDirection {
KWQSelectingPrevious
};
-class KWQKHTMLPart : public QObject
+class KWQKHTMLPart : public KHTMLPart
{
public:
- KWQKHTMLPart(KHTMLPart *);
+ KWQKHTMLPart();
~KWQKHTMLPart();
void setBridge(WebCoreBridge *p) { _bridge = p; }
@@ -82,7 +65,9 @@ public:
void setOwnsView(bool weOwnIt) { _ownsView = weOwnIt; }
KHTMLView *view() const;
- void openURL(const KURL &);
+ virtual bool openURL(const KURL &);
+ virtual bool closeURL();
+
void openURLRequest(const KURL &, const KParts::URLArgs &);
void submitForm(const KURL &, const KParts::URLArgs &);
@@ -134,7 +119,7 @@ public:
// Incoming calls, used by the bridge.
- DOM::DocumentImpl *document();
+ using KHTMLPart::xmlDocImpl;
khtml::RenderObject *renderer();
void forceLayout();
void paint(QPainter *, const QRect &);
@@ -171,9 +156,6 @@ private:
static DOM::NodeImpl *nodeForWidget(QWidget *);
static KWQKHTMLPart *partForNode(DOM::NodeImpl *);
- KHTMLPart *part;
- KHTMLPartPrivate *d;
-
WebCoreBridge *_bridge;
KWQSignal _started;
@@ -187,4 +169,7 @@ private:
friend class KHTMLPart;
};
+inline KWQKHTMLPart *KWQ(KHTMLPart *part) { return static_cast<KWQKHTMLPart *>(part); }
+inline const KWQKHTMLPart *KWQ(const KHTMLPart *part) { return static_cast<const KWQKHTMLPart *>(part); }
+
#endif
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4c4eae2..816d1b0 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -60,14 +60,16 @@ using KIO::Job;
using KParts::ReadOnlyPart;
using KParts::URLArgs;
+unsigned KHTMLPartPrivate::m_frameNameId = 0;
+
void KHTMLPart::completed()
{
- kwq->_completed.call();
+ KWQ(this)->_completed.call();
}
void KHTMLPart::completed(bool arg)
{
- kwq->_completed.call(arg);
+ KWQ(this)->_completed.call(arg);
}
void KHTMLPart::nodeActivated(const DOM::Node &aNode)
@@ -76,7 +78,7 @@ void KHTMLPart::nodeActivated(const DOM::Node &aNode)
bool KHTMLPart::openURL(const KURL &URL)
{
- kwq->openURL(URL);
+ ASSERT_NOT_REACHED();
return true;
}
@@ -86,12 +88,12 @@ void KHTMLPart::onURL(const QString &)
void KHTMLPart::setStatusBarText(const QString &status)
{
- kwq->setStatusBarText(status);
+ KWQ(this)->setStatusBarText(status);
}
void KHTMLPart::started(Job *j)
{
- kwq->_started.call(j);
+ KWQ(this)->_started.call(j);
}
static void redirectionTimerMonitor(void *context)
@@ -100,11 +102,10 @@ static void redirectionTimerMonitor(void *context)
kwq->redirectionTimerStartedOrStopped();
}
-KWQKHTMLPart::KWQKHTMLPart(KHTMLPart *p)
- : part(p), d(part->d)
- , _started(p, SIGNAL(started(KIO::Job *)))
- , _completed(p, SIGNAL(completed()))
- , _completedWithBool(p, SIGNAL(completed(bool)))
+KWQKHTMLPart::KWQKHTMLPart()
+ : _started(this, SIGNAL(started(KIO::Job *)))
+ , _completed(this, SIGNAL(completed()))
+ , _completedWithBool(this, SIGNAL(completed(bool)))
, _ownsView(false)
{
Cache::init();
@@ -125,8 +126,8 @@ WebCoreBridge *KWQKHTMLPart::bridgeForFrameName(const QString &frameName)
WebCoreBridge *frame;
if (frameName.isEmpty()) {
// If we're the only frame in a frameset then pop the frame.
- KHTMLPart *parentPart = part->parentPart();
- frame = parentPart ? parentPart->kwq->_bridge : nil;
+ KHTMLPart *parent = parentPart();
+ frame = parent ? KWQ(parent)->_bridge : nil;
if ([[frame childFrames] count] != 1) {
frame = _bridge;
}
@@ -142,12 +143,13 @@ QString KWQKHTMLPart::generateFrameName()
return QString::fromNSString([_bridge generateFrameName]);
}
-void KWQKHTMLPart::openURL(const KURL &url)
+bool KWQKHTMLPart::openURL(const KURL &url)
{
// FIXME: The lack of args here to get the reload flag from
// indicates a problem in how we use KHTMLPart::processObjectRequest,
// where we are opening the URL before the args are set up.
[_bridge loadURL:url.url().getNSString() reload:NO triggeringEvent:nil isFormSubmission:NO];
+ return true;
}
void KWQKHTMLPart::openURLRequest(const KURL &url, const URLArgs &args)
@@ -172,19 +174,19 @@ void KWQKHTMLPart::submitForm(const KURL &url, const URLArgs &args)
void KWQKHTMLPart::slotData(NSString *encoding, bool forceEncoding, const char *bytes, int length, bool complete)
{
if (!d->m_workingURL.isEmpty()) {
- part->receivedFirstData();
+ receivedFirstData();
}
ASSERT(d->m_doc);
ASSERT(d->m_doc->parsing());
if (encoding) {
- part->setEncoding(QString::fromNSString(encoding), forceEncoding);
+ setEncoding(QString::fromNSString(encoding), forceEncoding);
} else {
- part->setEncoding(QString::null, false);
+ setEncoding(QString::null, false);
}
- part->write(bytes, length);
+ write(bytes, length);
}
void KWQKHTMLPart::urlSelected(const KURL &url, int button, int state, const URLArgs &args)
@@ -233,7 +235,7 @@ void KWQKHTMLPart::setView(KHTMLView *view, bool weOwnIt)
delete d->m_view;
}
d->m_view = view;
- part->setWidget(view);
+ setWidget(view);
_ownsView = weOwnIt;
}
@@ -303,20 +305,15 @@ void KWQKHTMLPart::paint(QPainter *p, const QRect &rect)
}
}
-DocumentImpl *KWQKHTMLPart::document()
-{
- return part->xmlDocImpl();
-}
-
RenderObject *KWQKHTMLPart::renderer()
{
- DocumentImpl *doc = part->xmlDocImpl();
+ DocumentImpl *doc = xmlDocImpl();
return doc ? doc->renderer() : 0;
}
QString KWQKHTMLPart::userAgent() const
{
- NSString *us = [_bridge userAgentForURL:part->m_url.url().getNSString()];
+ NSString *us = [_bridge userAgentForURL:m_url.url().getNSString()];
if (us)
return QString::fromNSString(us);
@@ -325,7 +322,7 @@ QString KWQKHTMLPart::userAgent() const
NSView *KWQKHTMLPart::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection direction)
{
- DocumentImpl *doc = document();
+ DocumentImpl *doc = xmlDocImpl();
if (!doc) {
return nil;
}
@@ -340,7 +337,7 @@ NSView *KWQKHTMLPart::nextKeyViewInFrame(NodeImpl *node, KWQSelectionDirection d
QWidget *widget = renderWidget->widget();
KHTMLView *childFrameWidget = dynamic_cast<KHTMLView *>(widget);
if (childFrameWidget) {
- NSView *view = childFrameWidget->part()->kwq->nextKeyViewInFrame(0, direction);
+ NSView *view = KWQ(childFrameWidget->part())->nextKeyViewInFrame(0, direction);
if (view) {
return view;
}
@@ -366,9 +363,9 @@ NSView *KWQKHTMLPart::nextKeyViewInFrameHierarchy(NodeImpl *node, KWQSelectionDi
return next;
}
- KHTMLPart *parentPart = part->parentPart();
- if (parentPart) {
- next = parentPart->kwq->nextKeyView(parentPart->frame(part)->m_frame->element(), direction);
+ KHTMLPart *parent = parentPart();
+ if (parent) {
+ next = KWQ(parent)->nextKeyView(parent->frame(this)->m_frame->element(), direction);
if (next) {
return next;
}
@@ -413,10 +410,10 @@ bool KWQKHTMLPart::canCachePage()
// 4. The page has no plugins.
if (d->m_doc &&
(d->m_frames.count() ||
- part->parentPart() ||
+ parentPart() ||
d->m_objects.count() ||
d->m_doc->getWindowEventListener (DOM::EventImpl::UNLOAD_EVENT) ||
- (d->m_jscript && KJS::Window::retrieveWindow(part)->hasTimeouts()))){
+ (d->m_jscript && KJS::Window::retrieveWindow(this)->hasTimeouts()))){
return false;
}
return true;
@@ -424,22 +421,22 @@ bool KWQKHTMLPart::canCachePage()
void KWQKHTMLPart::saveWindowProperties(KJS::SavedProperties *windowProperties)
{
- KJS::Window::retrieveWindow(part)->saveProperties(*windowProperties);
+ KJS::Window::retrieveWindow(this)->saveProperties(*windowProperties);
}
void KWQKHTMLPart::saveLocationProperties(KJS::SavedProperties *locationProperties)
{
- KJS::Window::retrieveWindow(part)->location()->saveProperties(*locationProperties);
+ KJS::Window::retrieveWindow(this)->location()->saveProperties(*locationProperties);
}
void KWQKHTMLPart::restoreWindowProperties(KJS::SavedProperties *windowProperties)
{
- KJS::Window::retrieveWindow(part)->restoreProperties(*windowProperties);
+ KJS::Window::retrieveWindow(this)->restoreProperties(*windowProperties);
}
void KWQKHTMLPart::restoreLocationProperties(KJS::SavedProperties *locationProperties)
{
- KJS::Window::retrieveWindow(part)->location()->restoreProperties(*locationProperties);
+ KJS::Window::retrieveWindow(this)->location()->restoreProperties(*locationProperties);
}
void KWQKHTMLPart::openURLFromPageCache(DOM::DocumentImpl *doc, KURL *url, KJS::SavedProperties *windowProperties, KJS::SavedProperties *locationProperties)
@@ -448,7 +445,7 @@ void KWQKHTMLPart::openURLFromPageCache(DOM::DocumentImpl *doc, KURL *url, KJS::
// We still have to close the previous part page.
if (!d->m_restored){
- part->closeURL();
+ closeURL();
}
d->m_bComplete = false;
@@ -463,41 +460,41 @@ void KWQKHTMLPart::openURLFromPageCache(DOM::DocumentImpl *doc, KURL *url, KJS::
d->m_kjsDefaultStatusBarText = QString::null;
}
- part->m_url = *url;
+ m_url = *url;
// set the javascript flags according to the current url
- d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(part->m_url.host());
+ d->m_bJScriptEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptEnabled(m_url.host());
d->m_bJScriptDebugEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaScriptDebugEnabled();
- d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(part->m_url.host());
- d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(part->m_url.host());
+ d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled(m_url.host());
+ d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(m_url.host());
// initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first
// data arrives) (Simon)
- if(part->m_url.protocol().startsWith( "http" ) && !part->m_url.host().isEmpty() && part->m_url.path().isEmpty()) {
- part->m_url.setPath("/");
- emit d->m_extension->setLocationBarURL( part->m_url.prettyURL() );
+ if(m_url.protocol().startsWith( "http" ) && !m_url.host().isEmpty() && m_url.path().isEmpty()) {
+ m_url.setPath("/");
+ emit d->m_extension->setLocationBarURL( m_url.prettyURL() );
}
// copy to m_workingURL after fixing m_url above
- d->m_workingURL = part->m_url;
+ d->m_workingURL = m_url;
- emit part->started( 0L );
+ emit started( 0L );
// -----------begin-----------
- part->clear();
+ clear();
d->m_bCleared = false;
d->m_cacheId = 0;
d->m_bComplete = false;
d->m_bLoadEventEmitted = false;
- d->m_referrer = part->m_url.url();
- part->m_url = *url;
+ d->m_referrer = m_url.url();
+ m_url = *url;
KURL baseurl;
// We don't need KDE chained URI handling or window caption setting
- if ( !part->m_url.isEmpty() ){
- baseurl = part->m_url;
+ if ( !m_url.isEmpty() ){
+ baseurl = m_url;
}
d->m_doc = doc;
@@ -520,7 +517,7 @@ WebCoreBridge *KWQKHTMLPart::bridgeForWidget(QWidget *widget)
KWQKHTMLPart *KWQKHTMLPart::partForNode(NodeImpl *node)
{
- return node->getDocument()->view()->part()->kwq;
+ return KWQ(node->getDocument()->view()->part());
}
NodeImpl *KWQKHTMLPart::nodeForWidget(QWidget *widget)
@@ -557,10 +554,10 @@ QPtrList<KWQKHTMLPart> &KWQKHTMLPart::mutableInstances()
void KWQKHTMLPart::updatePolicyBaseURL()
{
- if (part->parentPart()) {
- setPolicyBaseURL(part->parentPart()->docImpl()->policyBaseURL());
+ if (parentPart()) {
+ setPolicyBaseURL(parentPart()->docImpl()->policyBaseURL());
} else {
- setPolicyBaseURL(part->m_url.url());
+ setPolicyBaseURL(m_url.url());
}
}
@@ -568,12 +565,12 @@ void KWQKHTMLPart::setPolicyBaseURL(const DOM::DOMString &s)
{
// XML documents will cause this to return null. docImpl() is
// an HTMLdocument only. -dwh
- if (part->docImpl())
- part->docImpl()->setPolicyBaseURL(s);
+ if (docImpl())
+ docImpl()->setPolicyBaseURL(s);
ConstFrameIt end = d->m_frames.end();
for (ConstFrameIt it = d->m_frames.begin(); it != end; ++it) {
ReadOnlyPart *subpart = (*it).m_part;
- static_cast<KHTMLPart *>(subpart)->kwq->setPolicyBaseURL(s);
+ static_cast<KWQKHTMLPart *>(subpart)->setPolicyBaseURL(s);
}
}
@@ -630,7 +627,7 @@ void KWQKHTMLPart::createDummyDocument()
d->m_doc->ref();
ASSERT(d->m_view == 0);
- KHTMLView *kview = new KHTMLView(part, 0);
+ KHTMLView *kview = new KHTMLView(this, 0);
setView(kview, true);
NSView *view = [[KWQDummyView alloc] initWithWindow:[_bridge window]];
@@ -661,7 +658,7 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
// Check for cases where we are too early for events -- possible unmatched key up
// from pressing return in the location bar.
- DocumentImpl *doc = document();
+ DocumentImpl *doc = xmlDocImpl();
if (!doc) {
return false;
}
@@ -691,14 +688,20 @@ bool KWQKHTMLPart::keyEvent(NSEvent *event)
// that a higher level already checked that the URLs match and the scrolling is the right thing to do.
void KWQKHTMLPart::scrollToAnchor(const KURL &URL)
{
- part->m_url = URL;
- part->started(0);
+ m_url = URL;
+ started(0);
- if (!part->gotoAnchor(URL.encodedHtmlRef()))
- part->gotoAnchor(URL.htmlRef());
+ if (!gotoAnchor(URL.encodedHtmlRef()))
+ gotoAnchor(URL.htmlRef());
d->m_bComplete = true;
d->m_doc->setParsing(false);
- part->completed();
+ completed();
+}
+
+bool KWQKHTMLPart::closeURL()
+{
+ saveDocumentState();
+ return KHTMLPart::closeURL();
}
diff --git a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
index 1aba073..b86fed0 100644
--- a/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
+++ b/WebCore/kwq/KWQKHTMLPartBrowserExtension.mm
@@ -35,7 +35,7 @@ KHTMLPartBrowserExtension::KHTMLPartBrowserExtension(KHTMLPart *part)
void KHTMLPartBrowserExtension::openURLRequest(const KURL &url,
const KParts::URLArgs &args)
{
- m_part->kwq->openURLRequest(url, args);
+ KWQ(m_part)->openURLRequest(url, args);
}
void KHTMLPartBrowserExtension::openURLNotify()
@@ -66,7 +66,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
WebCoreBridge *bridge;
if (frameName != nil) {
- bridge = [m_part->kwq->bridge() findFramedNamed:frameName];
+ bridge = [KWQ(m_part)->bridge() findFramedNamed:frameName];
if (bridge != nil) {
if (!url.isEmpty()) {
[bridge loadURL:url.url().getNSString() reload:urlArgs.reload triggeringEvent:nil isFormSubmission:NO];
@@ -76,7 +76,7 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
}
}
- bridge = [m_part->kwq->bridge() createWindowWithURL:url.url().getNSString() frameName:frameName];
+ bridge = [KWQ(m_part)->bridge() createWindowWithURL:url.url().getNSString() frameName:frameName];
if (!winArgs.toolBarsVisible) {
[bridge setToolbarsVisible:NO];
@@ -128,10 +128,10 @@ void KHTMLPartBrowserExtension::createNewWindow(const KURL &url,
void KHTMLPartBrowserExtension::setIconURL(const KURL &url)
{
- [m_part->kwq->bridge() setIconURL:url.url().getNSString()];
+ [KWQ(m_part)->bridge() setIconURL:url.url().getNSString()];
}
void KHTMLPartBrowserExtension::setTypedIconURL(const KURL &url, const QString &type)
{
- [m_part->kwq->bridge() setIconURL:url.url().getNSString() withType:type.getNSString()];
+ [KWQ(m_part)->bridge() setIconURL:url.url().getNSString() withType:type.getNSString()];
}
diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 6d01fb1..cbbd300 100644
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -60,7 +60,7 @@ void KJavaAppletWidget::processArguments(const QMap<QString, QString> &arguments
void KJavaAppletWidget::showApplet()
{
- setView([_context->part()->kwq->bridge()
+ setView([KWQ(_context->part())->bridge()
viewForJavaAppletWithFrame:NSMakeRect(pos().x(), pos().y(), size().width(), size().height())
attributes:_parameters
baseURL:_baseURL.getNSString()]);
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 215471c..f46fc63 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -45,7 +45,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
request->m_docLoader->part()->baseURL().url().latin1(),
request->object->url().string().latin1());
- WebCoreBridge *bridge = ((KHTMLPart *)request->m_docLoader->part())->kwq->bridge();
+ WebCoreBridge *bridge = static_cast<KWQKHTMLPart *>(request->m_docLoader->part())->bridge();
KWQResourceLoader *resourceLoader = [[KWQResourceLoader alloc] initWithLoader:loader job:job];
id <WebCoreResourceHandle> handle = [bridge startLoadingResource:resourceLoader withURL:job->url().url().getNSString()];
@@ -57,7 +57,7 @@ bool KWQServeRequest(Loader *loader, Request *request, TransferJob *job)
bool KWQCheckIfReloading(DocLoader *loader)
{
- return [((KHTMLPart *)loader->part())->kwq->bridge() isReloading];
+ return [static_cast<KWQKHTMLPart *>(loader->part())->bridge() isReloading];
}
void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
@@ -80,7 +80,7 @@ void KWQCheckCacheObjectStatus(DocLoader *loader, CachedObject *cachedObject)
ASSERT(cachedObject->response());
// Notify the caller that we "loaded".
- WebCoreBridge *bridge = ((KHTMLPart *)loader->part())->kwq->bridge();
+ WebCoreBridge *bridge = static_cast<KWQKHTMLPart *>(loader->part())->bridge();
CachedImage *cachedImage = dynamic_cast<CachedImage *>(cachedObject);
[bridge objectLoadedFromCacheWithURL:cachedObject->url().string().getNSString()
response:(id)cachedObject->response()
diff --git a/WebCore/kwq/KWQSignal.mm b/WebCore/kwq/KWQSignal.mm
index 3bc02ff..5a8ffa3 100644
--- a/WebCore/kwq/KWQSignal.mm
+++ b/WebCore/kwq/KWQSignal.mm
@@ -66,7 +66,11 @@ void KWQSignal::disconnect(const KWQSlot &slot)
{
#if !ERROR_DISABLED
if (!_slots.contains(slot)
- && !KWQNamesMatch(_name, SIGNAL(finishedParsing()))) {
+ && !KWQNamesMatch(_name, SIGNAL(finishedParsing()))
+ && !KWQNamesMatch(_name, SIGNAL(requestDone(khtml::DocLoader *, khtml::CachedObject *)))
+ && !KWQNamesMatch(_name, SIGNAL(requestFailed(khtml::DocLoader *, khtml::CachedObject *)))
+ && !KWQNamesMatch(_name, SIGNAL(requestStarted(khtml::DocLoader *, khtml::CachedObject *)))
+ ) {
ERROR("disconnecting a signal that wasn't connected, %s", _name);
}
#endif
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 070968c..3b15f10 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -27,7 +27,7 @@
#ifdef __cplusplus
-class KHTMLPart;
+class KWQKHTMLPart;
class KHTMLView;
namespace khtml {
@@ -39,7 +39,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
#else
- at class KHTMLPart;
+ at class KWQKHTMLPart;
@class KHTMLView;
@class KHTMLRenderPart;
@@ -83,7 +83,7 @@ enum FrameBorderStyle {
@interface WebCoreBridge : NSObject
{
- KHTMLPart *_part;
+ KWQKHTMLPart *_part;
KHTMLRenderPart *_renderPart;
}
@@ -93,7 +93,7 @@ enum FrameBorderStyle {
- (void)setName:(NSString *)name;
- (NSString *)name;
-- (KHTMLPart *)part;
+- (KWQKHTMLPart *)part;
- (void)setParent:(WebCoreBridge *)parent;
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index c541dad..0eebc1b 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -99,8 +99,8 @@ NSString *WebCoreElementStringKey = @"WebElementString";
{
[super init];
- _part = new KHTMLPart;
- _part->kwq->setBridge(self);
+ _part = new KWQKHTMLPart;
+ _part->setBridge(self);
return self;
}
@@ -112,13 +112,13 @@ NSString *WebCoreElementStringKey = @"WebElementString";
if (_renderPart) {
_renderPart->deref();
}
- _part->kwq->setBridge(nil);
+ _part->setBridge(nil);
_part->deref();
[super dealloc];
}
-- (KHTMLPart *)part
+- (KWQKHTMLPart *)part
{
return _part;
}
@@ -147,7 +147,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
if (pageCache) {
KWQPageState *state = [pageCache objectForKey:@"WebCorePageState"];
[state document]->restoreRenderer([state renderer]);
- _part->kwq->openURLFromPageCache([state document], [state URL], [state windowProperties], [state locationProperties]);
+ _part->openURLFromPageCache([state document], [state URL], [state windowProperties], [state locationProperties]);
return;
}
@@ -166,21 +166,21 @@ NSString *WebCoreElementStringKey = @"WebElementString";
// things we have to set up after calling didOpenURL
NSString *refreshHeader = [headers objectForKey:@"Refresh"];
if (refreshHeader) {
- _part->kwq->addMetaData("http-refresh", QString::fromNSString(refreshHeader));
+ _part->addMetaData("http-refresh", QString::fromNSString(refreshHeader));
}
if (lastModified) {
- _part->kwq->addMetaData("modified", QString::fromNSString([lastModified description]));
+ _part->addMetaData("modified", QString::fromNSString([lastModified description]));
}
}
- (void)addData:(NSData *)data withEncoding:(NSString *)encoding
{
- _part->kwq->slotData(encoding, NO, (const char *)[data bytes], [data length], NO);
+ _part->slotData(encoding, NO, (const char *)[data bytes], [data length], NO);
}
- (void)addData:(NSData *)data withOverrideEncoding:(NSString *)encoding
{
- _part->kwq->slotData(encoding, YES, (const char *)[data bytes], [data length], NO);
+ _part->slotData(encoding, YES, (const char *)[data bytes], [data length], NO);
}
- (void)closeURL
@@ -190,7 +190,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)saveDocumentState
{
- DocumentImpl *doc = _part->kwq->document();
+ DocumentImpl *doc = _part->xmlDocImpl();
if (doc != 0){
QStringList list = doc->docState();
NSMutableArray *documentState = [[[NSMutableArray alloc] init] autorelease];
@@ -205,7 +205,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)restoreDocumentState
{
- DocumentImpl *doc = _part->kwq->document();
+ DocumentImpl *doc = _part->xmlDocImpl();
if (doc != 0){
NSArray *documentState = [self documentState];
@@ -222,18 +222,18 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)scrollToAnchorWithURL:(NSString *)URL
{
- _part->kwq->scrollToAnchor([URL cString]);
+ _part->scrollToAnchor([URL cString]);
}
- (BOOL)saveDocumentToPageCache
{
- DocumentImpl *doc = _part->kwq->document();
+ DocumentImpl *doc = _part->xmlDocImpl();
if (doc != 0){
KJS::SavedProperties *windowProperties = new KJS::SavedProperties();
KJS::SavedProperties *locationProperties = new KJS::SavedProperties();
- _part->kwq->saveWindowProperties(windowProperties);
- _part->kwq->saveLocationProperties(locationProperties);
+ _part->saveWindowProperties(windowProperties);
+ _part->saveLocationProperties(locationProperties);
if (doc->isHTMLDocument()) {
DOM::HTMLDocumentImpl* hdoc = static_cast<HTMLDocumentImpl*>(doc);
hdoc->clearTimers();
@@ -246,7 +246,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (BOOL)canCachePage
{
- return _part->kwq->canCachePage();
+ return _part->canCachePage();
}
- (void)end
@@ -260,7 +260,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
[self removeFromFrame];
KHTMLView *kview = new KHTMLView(_part, 0);
- _part->kwq->setView(kview, true);
+ _part->setView(kview, true);
kview->setView(view);
if (mw >= 0)
@@ -286,12 +286,12 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)deselectAll
{
- _part->kwq->document()->clearSelection();
+ _part->xmlDocImpl()->clearSelection();
}
- (BOOL)isFrameSet
{
- return _part->kwq->isFrameSet();
+ return _part->isFrameSet();
}
- (void)reapplyStyles
@@ -301,12 +301,12 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)forceLayout
{
- _part->kwq->forceLayout();
+ _part->forceLayout();
}
- (void)drawRect:(NSRect)rect withPainter:(QPainter *)p
{
- _part->kwq->paint(p, QRect(rect));
+ _part->paint(p, QRect(rect));
}
- (void)drawRect:(NSRect)rect
@@ -343,7 +343,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (NSObject *)copyDOMTree:(id <WebCoreDOMTreeCopier>)copier
{
- DocumentImpl *doc = _part->kwq->document();
+ DocumentImpl *doc = _part->xmlDocImpl();
if (!doc) {
return nil;
}
@@ -379,7 +379,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (NSObject *)copyRenderTree:(id <WebCoreRenderTreeCopier>)copier
{
- RenderObject *renderer = _part->kwq->renderer();
+ RenderObject *renderer = _part->renderer();
if (!renderer) {
return nil;
}
@@ -388,7 +388,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)removeFromFrame
{
- _part->kwq->setView(0, false);
+ _part->setView(0, false);
}
- (void)installInFrame:(NSView *)view
@@ -397,11 +397,11 @@ NSString *WebCoreElementStringKey = @"WebElementString";
// won't ever get installed in the view hierarchy.
ASSERT(self == [self mainFrame] || _renderPart != nil);
- _part->kwq->view()->setView(view);
+ _part->view()->setView(view);
if (_renderPart) {
- _renderPart->setWidget(_part->kwq->view());
+ _renderPart->setWidget(_part->view());
// Now the render part owns the view, so we don't any more.
- _part->kwq->setOwnsView(false);
+ _part->setOwnsView(false);
}
}
@@ -426,7 +426,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)mouseUp:(NSEvent *)event
{
- if (!_part->kwq->view()) {
+ if (!_part->view()) {
return;
}
@@ -458,17 +458,17 @@ NSString *WebCoreElementStringKey = @"WebElementString";
// viewportMouseDoubleClickEvent.
if (clickCount > 0 && clickCount % 2 == 0) {
QMouseEvent doubleClickEvent(QEvent::MouseButtonDblClick, QPoint(p), button, state, clickCount);
- _part->kwq->view()->viewportMouseDoubleClickEvent(&doubleClickEvent);
+ _part->view()->viewportMouseDoubleClickEvent(&doubleClickEvent);
}
else {
QMouseEvent releaseEvent(QEvent::MouseButtonRelease, QPoint(p), button, state, clickCount);
- _part->kwq->view()->viewportMouseReleaseEvent(&releaseEvent);
+ _part->view()->viewportMouseReleaseEvent(&releaseEvent);
}
}
- (void)mouseDown:(NSEvent *)event
{
- if (!_part->kwq->view()) {
+ if (!_part->view()) {
return;
}
@@ -492,36 +492,36 @@ NSString *WebCoreElementStringKey = @"WebElementString";
state |= [self stateForEvent:event];
QMouseEvent kEvent(QEvent::MouseButtonPress, QPoint(p), button, state, [event clickCount]);
- _part->kwq->view()->viewportMousePressEvent(&kEvent);
+ _part->view()->viewportMousePressEvent(&kEvent);
}
- (void)mouseMoved:(NSEvent *)event
{
- if (!_part->kwq->view()) {
+ if (!_part->view()) {
return;
}
NSPoint p = [event locationInWindow];
QMouseEvent kEvent(QEvent::MouseMove, QPoint(p), 0, [self stateForEvent:event]);
- _part->kwq->view()->viewportMouseMoveEvent(&kEvent);
+ _part->view()->viewportMouseMoveEvent(&kEvent);
}
- (void)mouseDragged:(NSEvent *)event
{
- if (!_part->kwq->view()) {
+ if (!_part->view()) {
return;
}
NSPoint p = [event locationInWindow];
QMouseEvent kEvent(QEvent::MouseMove, QPoint(p), Qt::LeftButton, Qt::LeftButton);
- _part->kwq->view()->viewportMouseMoveEvent(&kEvent);
+ _part->view()->viewportMouseMoveEvent(&kEvent);
}
- (NSDictionary *)elementAtPoint:(NSPoint)point
{
- RenderObject *renderer = _part->kwq->renderer();
+ RenderObject *renderer = _part->renderer();
if (!renderer) {
return nil;
}
@@ -538,7 +538,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
[element setObject:title forKey:WebCoreElementLinkTitleKey];
}
- NSString *URLString = _part->kwq->document()->completeURL(e->getAttribute(ATTR_HREF).string()).getNSString();
+ NSString *URLString = _part->xmlDocImpl()->completeURL(e->getAttribute(ATTR_HREF).string()).getNSString();
if (URLString) {
// Look for the first #text node to use as a label.
@@ -560,8 +560,8 @@ NSString *WebCoreElementStringKey = @"WebElementString";
}
DOMString target = e->getAttribute(ATTR_TARGET);
- if (target.isEmpty() && _part->kwq->document()) {
- target = _part->kwq->document()->baseTarget();
+ if (target.isEmpty() && _part->xmlDocImpl()) {
+ target = _part->xmlDocImpl()->baseTarget();
}
if (!target.isEmpty()) {
[element setObject:target.string().getNSString() forKey:WebCoreElementLinkTargetFrameKey];
@@ -578,7 +578,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
attr = i->getAttribute(ATTR_DATA);
}
- NSString *URLString = _part->kwq->document()->completeURL(attr.string()).getNSString();
+ NSString *URLString = _part->xmlDocImpl()->completeURL(attr.string()).getNSString();
if (URLString) {
[element setObject:URLString forKey:WebCoreElementImageURLKey];
@@ -613,7 +613,7 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (void)jumpToSelection
{
- _part->kwq->jumpToSelection();
+ _part->jumpToSelection();
}
- (void)setTextSizeMultiplier:(float)multiplier
@@ -635,38 +635,38 @@ NSString *WebCoreElementStringKey = @"WebElementString";
- (NSView *)nextKeyView
{
- return _part->kwq->nextKeyView(0, KWQSelectingNext);
+ return _part->nextKeyView(0, KWQSelectingNext);
}
- (NSView *)previousKeyView
{
- return _part->kwq->nextKeyView(0, KWQSelectingPrevious);
+ return _part->nextKeyView(0, KWQSelectingPrevious);
}
- (NSView *)nextKeyViewInsideWebViews
{
- return _part->kwq->nextKeyViewInFrameHierarchy(0, KWQSelectingNext);
+ return _part->nextKeyViewInFrameHierarchy(0, KWQSelectingNext);
}
- (NSView *)previousKeyViewInsideWebViews
{
- return _part->kwq->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
+ return _part->nextKeyViewInFrameHierarchy(0, KWQSelectingPrevious);
}
- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)string
{
- _part->kwq->createDummyDocument();
+ _part->createDummyDocument();
return _part->executeScript(QString::fromNSString(string)).asString().getNSString();
}
- (id<WebDOMDocument>)DOMDocument
{
- return [WebCoreDOMDocument documentWithImpl:_part->kwq->document()];
+ return [WebCoreDOMDocument documentWithImpl:_part->xmlDocImpl()];
}
- (void)setSelectionFrom:(id<WebDOMNode>)start startOffset:(int)startOffset to:(id<WebDOMNode>)end endOffset:(int) endOffset
{
- _part->kwq->document()->setSelection([(WebCoreDOMNode *)start impl], startOffset, [(WebCoreDOMNode *)end impl], endOffset);
+ _part->xmlDocImpl()->setSelection([(WebCoreDOMNode *)start impl], startOffset, [(WebCoreDOMNode *)end impl], endOffset);
}
static NSAttributedString *attributedString(DOM::NodeImpl *_startNode, int startOffset, DOM::NodeImpl *endNode, int endOffset)
@@ -826,7 +826,7 @@ DOM::Node next = n.firstChild();
- (NSAttributedString *)selectedAttributedString
{
- return attributedString (_part->kwq->selectionStart(), _part->kwq->selectionStartOffset(), _part->kwq->selectionEnd(), _part->kwq->selectionEndOffset());
+ return attributedString (_part->selectionStart(), _part->selectionStartOffset(), _part->selectionEnd(), _part->selectionEndOffset());
}
- (NSAttributedString *)attributedStringFrom: (id<WebDOMNode>)startNode startOffset: (int)startOffset to: (id<WebDOMNode>)endNode endOffset: (int)endOffset
@@ -837,22 +837,22 @@ DOM::Node next = n.firstChild();
- (id<WebDOMNode>)selectionStart
{
- return [WebCoreDOMNode nodeWithImpl: _part->kwq->selectionStart()];
+ return [WebCoreDOMNode nodeWithImpl: _part->selectionStart()];
}
- (int)selectionStartOffset
{
- return _part->kwq->selectionStartOffset();
+ return _part->selectionStartOffset();
}
- (id<WebDOMNode>)selectionEnd
{
- return [WebCoreDOMNode nodeWithImpl: _part->kwq->selectionEnd()];
+ return [WebCoreDOMNode nodeWithImpl: _part->selectionEnd()];
}
- (int)selectionEndOffset
{
- return _part->kwq->selectionEndOffset();
+ return _part->selectionEndOffset();
}
- (void)setName:(NSString *)name
@@ -872,12 +872,12 @@ DOM::Node next = n.firstChild();
- (NSString *)referrer
{
- return _part->kwq->referrer().getNSString();
+ return _part->referrer().getNSString();
}
- (int)frameBorderStyle
{
- KHTMLView *view = _part->kwq->view();
+ KHTMLView *view = _part->view();
if (view) {
if (view->frameStyle() & QFrame::Sunken)
return SunkenFrameBorder;
@@ -904,13 +904,13 @@ DOM::Node next = n.firstChild();
- (BOOL)needsLayout
{
- RenderObject *renderer = _part->kwq->renderer();
+ RenderObject *renderer = _part->renderer();
return renderer ? !renderer->layouted() : false;
}
- (BOOL)interceptKeyEvent:(NSEvent *)event toView:(NSView *)view
{
- return _part->kwq->keyEvent(event);
+ return _part->keyEvent(event);
}
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list