[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 767b3718e126d6e6d1e1e7a96116564b55f81b5f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 13 05:53:59 2003 +0000

            * WebCorePrefix.h: Needed to touch this file since we now have plain C source (expat).
            * kwq/KWQKHTMLPart.cpp: Reformatted a bit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3312 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7398515..a80901e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2003-01-12  Darin Adler  <darin at apple.com>
 
+        * WebCorePrefix.h: Needed to touch this file since we now have plain C source (expat).
+        * kwq/KWQKHTMLPart.cpp: Reformatted a bit.
+
+2003-01-12  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
 	- first step towards integrating expat for XML support: make it compile and link
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7398515..a80901e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2003-01-12  Darin Adler  <darin at apple.com>
 
+        * WebCorePrefix.h: Needed to touch this file since we now have plain C source (expat).
+        * kwq/KWQKHTMLPart.cpp: Reformatted a bit.
+
+2003-01-12  Darin Adler  <darin at apple.com>
+
         Reviewed by Maciej.
 
 	- first step towards integrating expat for XML support: make it compile and link
diff --git a/WebCore/WebCorePrefix.h b/WebCore/WebCorePrefix.h
index f8e4ef9..6f0dac0 100644
--- a/WebCore/WebCorePrefix.h
+++ b/WebCore/WebCorePrefix.h
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <pthread.h>
 #include <regex.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -11,10 +12,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #ifdef __cplusplus
 
+#include <algorithm>
 #include <cstddef>
 #include <new>
 
diff --git a/WebCore/kwq/KWQKHTMLPart.cpp b/WebCore/kwq/KWQKHTMLPart.cpp
index 3bbb19b..24beb44 100644
--- a/WebCore/kwq/KWQKHTMLPart.cpp
+++ b/WebCore/kwq/KWQKHTMLPart.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2002 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2001, 2002, 2003 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,12 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include <KWQKHTMLPart.h>
+#include "KWQKHTMLPart.h"
 
-#include <html_documentimpl.h>
-#include <html_elementimpl.h>
-#include <htmltokenizer.h>
-#include <khtmlpart_p.h>
+#include "html_documentimpl.h"
+#include "html_elementimpl.h"
+#include "htmltokenizer.h"
+#include "khtmlpart_p.h"
 
 using DOM::DocumentImpl;
 using DOM::HTMLDocumentImpl;
@@ -43,7 +43,22 @@ bool KWQKHTMLPart::isFrameSet() const
     return body && body->renderer() && body->id() == ID_FRAMESET;
 }
 
-int KWQKHTMLPart::selectionStartOffset() const { return d->m_startOffset; }
-int KWQKHTMLPart::selectionEndOffset() const { return d->m_endOffset; }
-NodeImpl *KWQKHTMLPart::selectionStart() const { return d->m_selectionStart.handle(); }
-NodeImpl *KWQKHTMLPart::selectionEnd() const { return d->m_selectionEnd.handle(); }
+int KWQKHTMLPart::selectionStartOffset() const
+{
+    return d->m_startOffset;
+}
+
+int KWQKHTMLPart::selectionEndOffset() const
+{
+    return d->m_endOffset;
+}
+
+NodeImpl *KWQKHTMLPart::selectionStart() const
+{
+    return d->m_selectionStart.handle();
+}
+
+NodeImpl *KWQKHTMLPart::selectionEnd() const
+{
+    return d->m_selectionEnd.handle();
+}

-- 
WebKit Debian packaging