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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 35b00714d2632dd77aa8f93a12701da33a2cf63c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 01:22:44 2002 +0000

            Turn on find related code in part in preparation for
            implementing find in WebKit.
    
            * khtml/khtml_part.cpp:
            (KHTMLPart::init):
            (KHTMLPart::clear):
            (KHTMLPart::findTextNext):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 260f697..dbf203e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-07-23  Richard Williamson (Local)  <rjw at apple.com>
+
+        Turn on find related code in part in preparation for
+        implementing find in WebKit.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::init):
+        (KHTMLPart::clear):
+        (KHTMLPart::findTextNext):
+
 2002-07-23  David Hyatt  <hyatt at apple.com>
 
 	Fixing two bugs here.  The first is bug with @import sheets not inheriting strict parsing mode from their parent sheet.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 260f697..dbf203e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-07-23  Richard Williamson (Local)  <rjw at apple.com>
+
+        Turn on find related code in part in preparation for
+        implementing find in WebKit.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::init):
+        (KHTMLPart::clear):
+        (KHTMLPart::findTextNext):
+
 2002-07-23  David Hyatt  <hyatt at apple.com>
 
 	Fixing two bugs here.  The first is bug with @import sheets not inheriting strict parsing mode from their parent sheet.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 260f697..dbf203e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-07-23  Richard Williamson (Local)  <rjw at apple.com>
+
+        Turn on find related code in part in preparation for
+        implementing find in WebKit.
+        
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::init):
+        (KHTMLPart::clear):
+        (KHTMLPart::findTextNext):
+
 2002-07-23  David Hyatt  <hyatt at apple.com>
 
 	Fixing two bugs here.  The first is bug with @import sheets not inheriting strict parsing mode from their parent sheet.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index e2c582e..6e612d7 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -245,9 +245,9 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
   connect( khtml::Cache::loader(), SIGNAL( requestFailed( khtml::DocLoader*, khtml::CachedObject *) ),
            this, SLOT( slotLoaderRequestDone( khtml::DocLoader*, khtml::CachedObject *) ) );
 
-#ifndef APPLE_CHANGES
   findTextBegin(); //reset find variables
 
+#ifndef APPLE_CHANGES
   connect( &d->m_redirectionTimer, SIGNAL( timeout() ),
            this, SLOT( slotRedirect() ) );
 
@@ -913,9 +913,9 @@ void KHTMLPart::clear()
     }
   }
 
+#endif
 
   findTextBegin(); // resets d->m_findNode and d->m_findPos
-#endif
 
   d->m_mousePressNode = DOM::Node();
 
@@ -1883,8 +1883,6 @@ void KHTMLPart::setOnlyLocalReferences(bool enable)
   d->m_onlyLocalReferences = enable;
 }
 
-#ifndef APPLE_CHANGES
-
 void KHTMLPart::findTextBegin()
 {
   d->m_findPos = -1;
@@ -1923,6 +1921,7 @@ bool KHTMLPart::findTextNext( const QString &str, bool forward, bool caseSensiti
             QConstString s(t->s, t->l);
 
             int matchLen = 0;
+#ifndef APPLE_CHANGES
             if ( isRegExp ) {
               QRegExp matcher( str );
               matcher.setCaseSensitive( caseSensitive );
@@ -1934,6 +1933,10 @@ bool KHTMLPart::findTextNext( const QString &str, bool forward, bool caseSensiti
               d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive);
               matchLen = str.length();
             }
+#else
+            d->m_findPos = s.string().find(str, d->m_findPos+1, caseSensitive);
+            matchLen = str.length();
+#endif
 
             if(d->m_findPos != -1)
             {
@@ -1990,8 +1993,6 @@ bool KHTMLPart::findTextNext( const QString &str, bool forward, bool caseSensiti
     }
 }
 
-#endif
-
 QString KHTMLPart::selectedText() const
 {
   bool hasNewLine = true;

-- 
WebKit Debian packaging