[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:29:05 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit eb001c09843fcc3078516580655952e2f893505f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 5 08:13:57 2002 +0000
Merged KHTMLPart::begin method with khtml original.
* khtml/khtml_part.cpp:
(KHTMLPart::begin): Restore this method and don't call the impl
version. ifdef out the parts that don't compile.
* kwq/KWQKHTMLPartImpl.h:
* kwq/KWQKHTMLPartImpl.mm:
(KWQKHTMLPartImpl::begin): Removed.
* kwq/KWQKHTMLSettings.mm:
(KHTMLSettings::showAnimations): Implemented; always return false.
(KHTMLSettings::userStyleSheet): Implemented; always return empty
string.
* kwq/kdecore/kurl.h: Implemented isValid as inline method.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1730 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 373f7b2..7c51760 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,19 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Merged KHTMLPart::begin method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin): Restore this method and don't call the impl
+ version. ifdef out the parts that don't compile.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Removed.
+ * kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::showAnimations): Implemented; always return false.
+ (KHTMLSettings::userStyleSheet): Implemented; always return empty
+ string.
+ * kwq/kdecore/kurl.h: Implemented isValid as inline method.
+
2002-08-04 David Hyatt <hyatt at apple.com>
Fix my bungled CSS for input fields in the user agent style
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 373f7b2..7c51760 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,19 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Merged KHTMLPart::begin method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin): Restore this method and don't call the impl
+ version. ifdef out the parts that don't compile.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Removed.
+ * kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::showAnimations): Implemented; always return false.
+ (KHTMLSettings::userStyleSheet): Implemented; always return empty
+ string.
+ * kwq/kdecore/kurl.h: Implemented isValid as inline method.
+
2002-08-04 David Hyatt <hyatt at apple.com>
Fix my bungled CSS for input fields in the user agent style
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 373f7b2..7c51760 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2002-08-05 Maciej Stachowiak <mjs at apple.com>
+
+ Merged KHTMLPart::begin method with khtml original.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::begin): Restore this method and don't call the impl
+ version. ifdef out the parts that don't compile.
+ * kwq/KWQKHTMLPartImpl.h:
+ * kwq/KWQKHTMLPartImpl.mm:
+ (KWQKHTMLPartImpl::begin): Removed.
+ * kwq/KWQKHTMLSettings.mm:
+ (KHTMLSettings::showAnimations): Implemented; always return false.
+ (KHTMLSettings::userStyleSheet): Implemented; always return empty
+ string.
+ * kwq/kdecore/kurl.h: Implemented isValid as inline method.
+
2002-08-04 David Hyatt <hyatt at apple.com>
Fix my bungled CSS for input fields in the user agent style
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 101eca6..0b4312c 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1305,9 +1305,6 @@ void KHTMLPart::slotFinished( KIO::Job * job )
void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
{
-#ifdef APPLE_CHANGES
- impl->begin(url, xOffset, xOffset);
-#else
clear();
d->m_bCleared = false;
d->m_cacheId = 0;
@@ -1335,6 +1332,13 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
m_url = url;
KURL baseurl;
+#ifdef APPLE_CHANGES
+ // We don't need KDE chained URI handling or window caption setting
+ if ( !m_url.isEmpty() )
+ {
+ baseurl = m_url;
+ }
+#else
if ( !m_url.isEmpty() )
{
KURL::List lst = KURL::split( m_url );
@@ -1348,6 +1352,7 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
}
else
emit setWindowCaption( i18n( "no title", "* Unknown *" ) );
+#endif
// ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
if (args.serviceType == "text/xml")
@@ -1364,24 +1369,29 @@ void KHTMLPart::begin( const KURL &url, int xOffset, int yOffset )
d->m_doc->setBaseURL( baseurl.url() );
d->m_doc->docLoader()->setShowAnimations( KHTMLFactory::defaultHTMLSettings()->showAnimations() );
+#ifndef APPLE_CHANGES
d->m_paUseStylesheet->setItems(QStringList());
d->m_paUseStylesheet->setEnabled( false );
+#endif
setAutoloadImages( KHTMLFactory::defaultHTMLSettings()->autoLoadImages() );
QString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet();
if ( !userStyleSheet.isEmpty() )
setUserStyleSheet( KURL( userStyleSheet ) );
+#ifndef APPLE_CHANGES
d->m_doc->setRestoreState(args.docState);
+#endif
d->m_doc->open();
// clear widget
d->m_view->resizeContents( 0, 0 );
connect(d->m_doc,SIGNAL(finishedParsing()),this,SLOT(slotFinishedParsing()));
+#ifndef APPLE_CHANGES
emit d->m_extension->enableAction( "print", true );
+#endif
d->m_doc->setParsing(true);
-#endif // APPLE_CHANGES
}
void KHTMLPart::write( const char *str, int len )
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index bd6395d..d14d46f 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -68,7 +68,6 @@ public:
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
void openURL(const KURL &);
- void begin(const KURL &, int xOffset, int yOffset);
void write(const char *str, int len);
void end();
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 07ed1ed..446e4bf 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -132,74 +132,6 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
}
// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
-{
- KParts::URLArgs args;
- args.xOffset = xOffset;
- args.yOffset = yOffset;
- d->m_extension->setURLArgs( args );
-
- d->m_bComplete = false;
- // d->m_referrer = url.url();
- part->m_url = url;
-
- // ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
- if (args.serviceType == "text/xml")
- d->m_doc = DOM::DOMImplementationImpl::instance()->createDocument( d->m_view );
- else
- d->m_doc = DOM::DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
-
- //DomShared::instanceToCheck = (void *)((DomShared *)d->m_doc);
- d->m_doc->ref();
-
- d->m_workingURL = url;
-
- /* FIXME: this is a pretty gross way to make sure the decoder gets reinitialized for each page. */
- if (d->m_decoder != NULL) {
- delete d->m_decoder;
- d->m_decoder = NULL;
- }
-
- //FIXME: do we need this?
- if (!d->m_doc->attached())
- d->m_doc->attach();
- d->m_doc->setURL( url.url() );
-
- // do not set base URL if it has already been set
- if (!d->m_workingURL.isEmpty())
- {
- // We're not planning to support the KDE chained URL feature, AFAIK
-#if KDE_CHAINED_URIS
- KURL::List lst = KURL::split( d->m_workingURL );
- KURL baseurl;
- if ( !lst.isEmpty() )
- baseurl = *lst.begin();
- // Use this for relative links.
- setBaseURL(baseurl);
-#else
- if (d->m_doc != NULL) {
- d->m_doc->setBaseURL(d->m_workingURL.url());
- }
-#endif
- }
-
- /* FIXME: we'll need to make this work....
- QString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet();
- if ( !userStyleSheet.isEmpty() ) {
- setUserStyleSheet( KURL( userStyleSheet ) );
- }
- */
-
- d->m_doc->open();
-
- d->m_doc->setParsing(true);
-
-#ifdef _KWQ_TIMING
- d->totalWriteTime = 0;
-#endif
-}
-
-// FIXME: Need to remerge this with code in khtml_part.cpp?
void KWQKHTMLPartImpl::end()
{
KWQ_ASSERT(d->m_doc != NULL);
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.h b/WebCore/kwq/KWQKHTMLPartImpl.h
index bd6395d..d14d46f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.h
+++ b/WebCore/kwq/KWQKHTMLPartImpl.h
@@ -68,7 +68,6 @@ public:
bool openURLInFrame(const KURL &, const KParts::URLArgs &);
void openURL(const KURL &);
- void begin(const KURL &, int xOffset, int yOffset);
void write(const char *str, int len);
void end();
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 07ed1ed..446e4bf 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -132,74 +132,6 @@ void KWQKHTMLPartImpl::slotData(NSString *encoding, const char *bytes, int lengt
}
// FIXME: Need to remerge this with code in khtml_part.cpp?
-void KWQKHTMLPartImpl::begin( const KURL &url, int xOffset, int yOffset )
-{
- KParts::URLArgs args;
- args.xOffset = xOffset;
- args.yOffset = yOffset;
- d->m_extension->setURLArgs( args );
-
- d->m_bComplete = false;
- // d->m_referrer = url.url();
- part->m_url = url;
-
- // ### not sure if XHTML documents served as text/xml should use DocumentImpl or HTMLDocumentImpl
- if (args.serviceType == "text/xml")
- d->m_doc = DOM::DOMImplementationImpl::instance()->createDocument( d->m_view );
- else
- d->m_doc = DOM::DOMImplementationImpl::instance()->createHTMLDocument( d->m_view );
-
- //DomShared::instanceToCheck = (void *)((DomShared *)d->m_doc);
- d->m_doc->ref();
-
- d->m_workingURL = url;
-
- /* FIXME: this is a pretty gross way to make sure the decoder gets reinitialized for each page. */
- if (d->m_decoder != NULL) {
- delete d->m_decoder;
- d->m_decoder = NULL;
- }
-
- //FIXME: do we need this?
- if (!d->m_doc->attached())
- d->m_doc->attach();
- d->m_doc->setURL( url.url() );
-
- // do not set base URL if it has already been set
- if (!d->m_workingURL.isEmpty())
- {
- // We're not planning to support the KDE chained URL feature, AFAIK
-#if KDE_CHAINED_URIS
- KURL::List lst = KURL::split( d->m_workingURL );
- KURL baseurl;
- if ( !lst.isEmpty() )
- baseurl = *lst.begin();
- // Use this for relative links.
- setBaseURL(baseurl);
-#else
- if (d->m_doc != NULL) {
- d->m_doc->setBaseURL(d->m_workingURL.url());
- }
-#endif
- }
-
- /* FIXME: we'll need to make this work....
- QString userStyleSheet = KHTMLFactory::defaultHTMLSettings()->userStyleSheet();
- if ( !userStyleSheet.isEmpty() ) {
- setUserStyleSheet( KURL( userStyleSheet ) );
- }
- */
-
- d->m_doc->open();
-
- d->m_doc->setParsing(true);
-
-#ifdef _KWQ_TIMING
- d->totalWriteTime = 0;
-#endif
-}
-
-// FIXME: Need to remerge this with code in khtml_part.cpp?
void KWQKHTMLPartImpl::end()
{
KWQ_ASSERT(d->m_doc != NULL);
diff --git a/WebCore/kwq/KWQKHTMLSettings.mm b/WebCore/kwq/KWQKHTMLSettings.mm
index 12082c0..b55d385 100644
--- a/WebCore/kwq/KWQKHTMLSettings.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -90,6 +90,11 @@ bool KHTMLSettings::isFormCompletionEnabled() const
return false;
}
+KHTMLSettings::KAnimationAdvice KHTMLSettings::showAnimations() const
+{
+ return KAnimationEnabled;
+}
+
int KHTMLSettings::maxFormCompletionItems() const
{
return 0;
@@ -135,3 +140,8 @@ bool KHTMLSettings::isJavaScriptDebugEnabled() const
{
return false;
}
+
+QString KHTMLSettings::userStyleSheet() const
+{
+ return QString();
+}
diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index 5601cd5..8b2cdfc 100644
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -50,6 +50,7 @@ public:
bool isEmpty() const;
bool isMalformed() const;
+ bool isValid() const { return !isMalformed(); }
bool hasPath() const;
QString url() const;
diff --git a/WebCore/kwq/kdecore/kurl.h b/WebCore/kwq/kdecore/kurl.h
index 5601cd5..8b2cdfc 100644
--- a/WebCore/kwq/kdecore/kurl.h
+++ b/WebCore/kwq/kdecore/kurl.h
@@ -50,6 +50,7 @@ public:
bool isEmpty() const;
bool isMalformed() const;
+ bool isValid() const { return !isMalformed(); }
bool hasPath() const;
QString url() const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list