[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 06:57:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit d20fb42d640ee98a46eeb6d0126856eeffda5fee
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 5 17:27:48 2002 +0000
- re-fixed 3070484 -- icon rollovers are very slow on Mac OS X website
Had to roll back some of the files I changed yesterday. I had missed the
one line of useful code among much stuff we don't need.
* khtml/khtml_part.cpp:
(KHTMLPart::init):
(KHTMLPart::~KHTMLPart):
(KHTMLPart::slotLoaderRequestStarted):
(KHTMLPart::slotLoaderRequestDone):
* kwq/KWQSignal.h:
* kwq/KWQSignal.mm:
(KWQSignal::call):
* kwq/KWQSignalStubs.mm:
(Loader::requestDone):
(Loader::requestFailed):
(Loader::requestStarted):
* kwq/KWQSlot.h:
* kwq/KWQSlot.mm:
(KWQSlot::KWQSlot):
(KWQSlot::call):
Just roll back all the changes from my 3091714 check-in below, except
for the bug fix itself in loader.cpp and KWQResourceLoader.mm.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2563 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7d55194..1e1a4ed 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,29 @@
+2002-11-05 Darin Adler <darin at apple.com>
+
+ - re-fixed 3070484 -- icon rollovers are very slow on Mac OS X website
+
+ Had to roll back some of the files I changed yesterday. I had missed the
+ one line of useful code among much stuff we don't need.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::init):
+ (KHTMLPart::~KHTMLPart):
+ (KHTMLPart::slotLoaderRequestStarted):
+ (KHTMLPart::slotLoaderRequestDone):
+ * kwq/KWQSignal.h:
+ * kwq/KWQSignal.mm:
+ (KWQSignal::call):
+ * kwq/KWQSignalStubs.mm:
+ (Loader::requestDone):
+ (Loader::requestFailed):
+ (Loader::requestStarted):
+ * kwq/KWQSlot.h:
+ * kwq/KWQSlot.mm:
+ (KWQSlot::KWQSlot):
+ (KWQSlot::call):
+ Just roll back all the changes from my 3091714 check-in below, except
+ for the bug fix itself in loader.cpp and KWQResourceLoader.mm.
+
2002-11-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3027404 - pop-up ads not always suppressed
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7d55194..1e1a4ed 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,29 @@
+2002-11-05 Darin Adler <darin at apple.com>
+
+ - re-fixed 3070484 -- icon rollovers are very slow on Mac OS X website
+
+ Had to roll back some of the files I changed yesterday. I had missed the
+ one line of useful code among much stuff we don't need.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::init):
+ (KHTMLPart::~KHTMLPart):
+ (KHTMLPart::slotLoaderRequestStarted):
+ (KHTMLPart::slotLoaderRequestDone):
+ * kwq/KWQSignal.h:
+ * kwq/KWQSignal.mm:
+ (KWQSignal::call):
+ * kwq/KWQSignalStubs.mm:
+ (Loader::requestDone):
+ (Loader::requestFailed):
+ (Loader::requestStarted):
+ * kwq/KWQSlot.h:
+ * kwq/KWQSlot.mm:
+ (KWQSlot::KWQSlot):
+ (KWQSlot::call):
+ Just roll back all the changes from my 3091714 check-in below, except
+ for the bug fix itself in loader.cpp and KWQResourceLoader.mm.
+
2002-11-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3027404 - pop-up ads not always suppressed
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7d55194..1e1a4ed 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,29 @@
+2002-11-05 Darin Adler <darin at apple.com>
+
+ - re-fixed 3070484 -- icon rollovers are very slow on Mac OS X website
+
+ Had to roll back some of the files I changed yesterday. I had missed the
+ one line of useful code among much stuff we don't need.
+
+ * khtml/khtml_part.cpp:
+ (KHTMLPart::init):
+ (KHTMLPart::~KHTMLPart):
+ (KHTMLPart::slotLoaderRequestStarted):
+ (KHTMLPart::slotLoaderRequestDone):
+ * kwq/KWQSignal.h:
+ * kwq/KWQSignal.mm:
+ (KWQSignal::call):
+ * kwq/KWQSignalStubs.mm:
+ (Loader::requestDone):
+ (Loader::requestFailed):
+ (Loader::requestStarted):
+ * kwq/KWQSlot.h:
+ * kwq/KWQSlot.mm:
+ (KWQSlot::KWQSlot):
+ (KWQSlot::call):
+ Just roll back all the changes from my 3091714 check-in below, except
+ for the bug fix itself in loader.cpp and KWQResourceLoader.mm.
+
2002-11-05 Maciej Stachowiak <mjs at apple.com>
- fixed 3027404 - pop-up ads not always suppressed
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 9af325a..c01a74f 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -223,10 +223,6 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_bJavaEnabled = KHTMLFactory::defaultHTMLSettings()->isJavaEnabled();
d->m_bPluginsEnabled = KHTMLFactory::defaultHTMLSettings()->isPluginsEnabled();
-#if APPLE_CHANGES
- kwq = new KWQKHTMLPart(this);
-#endif
-
#if !APPLE_CHANGES
connect( this, SIGNAL( completed() ),
this, SLOT( updateActions() ) );
@@ -236,6 +232,11 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
this, SLOT( updateActions() ) );
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* ) ) );
@@ -243,7 +244,6 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
connect( khtml::Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-#endif
findTextBegin(); //reset find variables
@@ -278,14 +278,12 @@ KHTMLPart::~KHTMLPart()
if (!d->m_bComplete)
closeURL();
-#if !APPLE_CHANGES
disconnect( khtml::Cache::loader(), SIGNAL( requestStarted( khtml::DocLoader*, khtml::CachedObject* ) ),
this, SLOT( slotLoaderRequestStarted( khtml::DocLoader*, khtml::CachedObject* ) ) );
disconnect( khtml::Cache::loader(), SIGNAL( requestDone( khtml::DocLoader*, khtml::CachedObject *) ),
this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
disconnect( khtml::Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
-#endif
clear();
@@ -1510,10 +1508,9 @@ void KHTMLPart::slotFinishedParsing()
checkCompleted();
}
-#if !APPLE_CHANGES
-
void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObject *obj )
{
+#if !APPLE_CHANGES
if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
KHTMLPart* p = this;
while ( p ) {
@@ -1524,10 +1521,12 @@ void KHTMLPart::slotLoaderRequestStarted( khtml::DocLoader* dl, khtml::CachedObj
QTimer::singleShot( 200, op, SLOT( slotProgressUpdate() ) );
}
}
+#endif
}
void KHTMLPart::slotLoaderRequestDone( khtml::DocLoader* dl, khtml::CachedObject *obj )
{
+#if !APPLE_CHANGES
if ( obj && obj->type() == khtml::CachedObject::Image && d->m_doc && d->m_doc->docLoader() == dl ) {
KHTMLPart* p = this;
while ( p ) {
@@ -1538,10 +1537,13 @@ void KHTMLPart::slotLoaderRequestDone( khtml::DocLoader* dl, khtml::CachedObject
QTimer::singleShot( 200, op, SLOT( slotProgressUpdate() ) );
}
}
+#endif
checkCompleted();
}
+#if !APPLE_CHANGES
+
void KHTMLPart::slotProgressUpdate()
{
int percent;
diff --git a/WebCore/kwq/KWQSignal.h b/WebCore/kwq/KWQSignal.h
index 4be7555..05d0a4c 100644
--- a/WebCore/kwq/KWQSignal.h
+++ b/WebCore/kwq/KWQSignal.h
@@ -42,6 +42,7 @@ public:
void call(int) const;
void call(const QString &) const;
void call(KIO::Job *) const;
+ void call(khtml::DocLoader *, khtml::CachedObject *) const;
private:
// forbid copying and assignment
diff --git a/WebCore/kwq/KWQSignal.mm b/WebCore/kwq/KWQSignal.mm
index ec21627..8f7e05e 100644
--- a/WebCore/kwq/KWQSignal.mm
+++ b/WebCore/kwq/KWQSignal.mm
@@ -30,6 +30,9 @@
using KIO::Job;
+using khtml::CachedObject;
+using khtml::DocLoader;
+
KWQSignal::KWQSignal(QObject *object, const char *name)
: _object(object), _next(object->_signalListHead), _name(name)
{
@@ -128,3 +131,15 @@ void KWQSignal::call(Job *j) const
}
}
}
+
+void KWQSignal::call(DocLoader *l, CachedObject *o) const
+{
+ if (!_object->_signalsBlocked) {
+ KWQObjectSenderScope senderScope(_object);
+ QValueList<KWQSlot> copiedSlots(_slots);
+ QValueListConstIterator<KWQSlot> end = copiedSlots.end();
+ for (QValueListConstIterator<KWQSlot> it = copiedSlots.begin(); it != end; ++it) {
+ (*it).call(l, o);
+ }
+ }
+}
diff --git a/WebCore/kwq/KWQSignalStubs.mm b/WebCore/kwq/KWQSignalStubs.mm
index 5314fe6..5ebb7ea 100644
--- a/WebCore/kwq/KWQSignalStubs.mm
+++ b/WebCore/kwq/KWQSignalStubs.mm
@@ -39,14 +39,17 @@ void KHTMLView::cleared()
void Loader::requestDone(DocLoader *l, CachedObject *o)
{
+ kwq->_requestDone.call(l, o);
}
void Loader::requestFailed(DocLoader *l, CachedObject *o)
{
+ kwq->_requestFailed.call(l, o);
}
void Loader::requestStarted(DocLoader *l, CachedObject *o)
{
+ kwq->_requestStarted.call(l, o);
}
Tokenizer::Tokenizer()
diff --git a/WebCore/kwq/KWQSlot.h b/WebCore/kwq/KWQSlot.h
index 0e35b8d..334272f 100644
--- a/WebCore/kwq/KWQSlot.h
+++ b/WebCore/kwq/KWQSlot.h
@@ -34,6 +34,11 @@ namespace KIO {
class Job;
}
+namespace khtml {
+ class CachedObject;
+ class DocLoader;
+}
+
// Like strcmp, but ignores spaces.
bool KWQNamesMatch(const char *a, const char *b);
@@ -50,6 +55,7 @@ public:
void call(int) const;
void call(const QString &) const;
void call(KIO::Job *) const;
+ void call(khtml::DocLoader *, khtml::CachedObject *) const;
friend bool operator==(const KWQSlot &, const KWQSlot &);
diff --git a/WebCore/kwq/KWQSlot.mm b/WebCore/kwq/KWQSlot.mm
index e4ca0f3..7ec58e8 100644
--- a/WebCore/kwq/KWQSlot.mm
+++ b/WebCore/kwq/KWQSlot.mm
@@ -53,6 +53,8 @@ enum FunctionNumber {
slotChildStarted,
slotClicked,
slotFinishedParsing,
+ slotLoaderRequestDone,
+ slotLoaderRequestStarted,
slotParentCompleted,
slotParentDestroyed,
slotRedirect,
@@ -88,6 +90,12 @@ KWQSlot::KWQSlot(QObject *object, const char *member) : m_object(0)
} else if (KWQNamesMatch(member, SLOT(slotFinishedParsing()))) {
ASSERT(dynamic_cast<KHTMLPart *>(object));
m_function = slotFinishedParsing;
+ } else if (KWQNamesMatch(member, SLOT(slotLoaderRequestDone(khtml::DocLoader *, khtml::CachedObject *)))) {
+ ASSERT(dynamic_cast<KHTMLPart *>(object));
+ m_function = slotLoaderRequestDone;
+ } else if (KWQNamesMatch(member, SLOT(slotLoaderRequestStarted(khtml::DocLoader *, khtml::CachedObject *)))) {
+ ASSERT(dynamic_cast<KHTMLPart *>(object));
+ m_function = slotLoaderRequestStarted;
} else if (KWQNamesMatch(member, SLOT(slotParentCompleted()))) {
ASSERT(dynamic_cast<KHTMLPart *>(object));
m_function = slotParentCompleted;
@@ -230,6 +238,24 @@ void KWQSlot::call(Job *job) const
call();
}
+void KWQSlot::call(DocLoader *loader, CachedObject *cachedObject) const
+{
+ if (!m_object) {
+ return;
+ }
+
+ switch (m_function) {
+ case slotLoaderRequestDone:
+ static_cast<KHTMLPart *>(m_object.pointer())->slotLoaderRequestDone(loader, cachedObject);
+ return;
+ case slotLoaderRequestStarted:
+ static_cast<KHTMLPart *>(m_object.pointer())->slotLoaderRequestStarted(loader, cachedObject);
+ return;
+ }
+
+ call();
+}
+
bool operator==(const KWQSlot &a, const KWQSlot &b)
{
return a.m_object == b.m_object && (a.m_object == 0 || a.m_function == b.m_function);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list