[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit ca56915454d3a6a6c94711281c264350a4a7c175
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 10 16:56:12 2003 +0000

            Reviewed by Trey.
    
            - speed up startup by not loading the hand cursor until it's used
    
            * khtml/khtml_part.cpp: (KHTMLPart::urlCursor): Use the hand cursor.
            * khtml/khtmlpart_p.h: Don't store the hand cursor in a per-part global.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 3c9636e..a2474c2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-04-10  Darin Adler  <darin at apple.com>
 
+        Reviewed by Trey.
+
+        - speed up startup by not loading the hand cursor until it's used
+
+        * khtml/khtml_part.cpp: (KHTMLPart::urlCursor): Use the hand cursor.
+        * khtml/khtmlpart_p.h: Don't store the hand cursor in a per-part global.
+
+2003-04-10  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3224077 -- REGRESSION: tables on MacNN forums messed up because we reject %% due to style parser
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 3c9636e..a2474c2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-04-10  Darin Adler  <darin at apple.com>
 
+        Reviewed by Trey.
+
+        - speed up startup by not loading the hand cursor until it's used
+
+        * khtml/khtml_part.cpp: (KHTMLPart::urlCursor): Use the hand cursor.
+        * khtml/khtmlpart_p.h: Don't store the hand cursor in a per-part global.
+
+2003-04-10  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
         - fixed 3224077 -- REGRESSION: tables on MacNN forums messed up because we reject %% due to style parser
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 63a6713..59d30dc 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1985,14 +1985,25 @@ void KHTMLPart::setFixedFont( const QString &name )
     d->m_settings->setFixedFontName(name);
 }
 
+#if !APPLE_CHANGES
+
 void KHTMLPart::setURLCursor( const QCursor &c )
 {
   d->m_linkCursor = c;
 }
 
+#endif
+
 QCursor KHTMLPart::urlCursor() const
 {
+#if APPLE_CHANGES
+  // Don't load the link cursor until it's actually used.
+  // Also, we don't need setURLCursor.
+  // This speeds up startup time.
+  return KCursor::handCursor();
+#else
   return d->m_linkCursor;
+#endif
 }
 
 bool KHTMLPart::onlyLocalReferences() const
diff --git a/WebCore/khtml/khtmlpart_p.h b/WebCore/khtml/khtmlpart_p.h
index 75488f2..e3c6a85 100644
--- a/WebCore/khtml/khtmlpart_p.h
+++ b/WebCore/khtml/khtmlpart_p.h
@@ -120,7 +120,9 @@ public:
     m_bDnd = true;
     m_startOffset = m_endOffset = 0;
     m_startBeforeEnd = true;
+#if !APPLE_CHANGES
     m_linkCursor = KCursor::handCursor();
+#endif
     m_loadedObjects = 0;
     m_totalObjectCount = 0;
     m_jobPercent = 0;
@@ -361,7 +363,9 @@ public:
   QPoint m_dragLastPos;
 #endif
 
+#if !APPLE_CHANGES
   QCursor m_linkCursor;
+#endif
   QTimer m_scrollTimer;
 
   unsigned long m_loadedObjects;

-- 
WebKit Debian packaging