[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 558be62ec01aac78909026024dbb20e372dfc0ce
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 18 16:55:52 2004 +0000

            Reviewed by John.
    
            - fixed <rdar://problem/3520322>: "can't use <WebKit/HIWebView.h> or <WebKit/CarbonUtils.h> from non-Objective C"
    
            * Carbon.subproj/CarbonUtils.h: Added ifdefs so file compiles when included from non-Objective-C.
            Changed style to match other Carbon headers a bit more closely. Also remove unnecessary includes.
            * Carbon.subproj/HIWebView.h: Ditto.
    
            - fixed <rdar://problem/3648505>: "this text file scrolls to the second line instead of first when pressing home"
    
            * WebView.subproj/WebFrameView.m:
            (-[WebFrameView _scrollToTopLeft]): Scroll to origin.y instead of assuming that top is 0; can be non-0 for text view.
            (-[WebFrameView _scrollToBottomLeft]): Use NSMaxY instead of height for the same reason.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6623 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.h b/WebKit/Carbon.subproj/CarbonUtils.h
index 298bdfa..282a113 100644
--- a/WebKit/Carbon.subproj/CarbonUtils.h
+++ b/WebKit/Carbon.subproj/CarbonUtils.h
@@ -1,24 +1,34 @@
 /*
     CarbonUtils.h
-    Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+    Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
     
     Public header file.
 */
+
 #ifndef __HIWEBCARBONUTILS__
 #define __HIWEBCARBONUTILS__
 
-#import <Carbon/Carbon.h>
-#import <WebKit/WebKit.h>
+#ifdef __OBJC__
+#import <CoreGraphics/CGImage.h>
+ at class NSImage;
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern void 		WebInitForCarbon( void );
-extern CGImageRef 	WebConvertNSImageToCGImageRef( NSImage* inImage );
+extern void
+WebInitForCarbon(void);
+
+#ifdef __OBJC__
+
+extern CGImageRef
+WebConvertNSImageToCGImageRef(NSImage * inImage);
+
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // __HIWEBCARBONUTILS__
\ No newline at end of file
+#endif // __HIWEBCARBONUTILS__
diff --git a/WebKit/Carbon.subproj/HIWebView.h b/WebKit/Carbon.subproj/HIWebView.h
index 17dfd8c..b99a876 100644
--- a/WebKit/Carbon.subproj/HIWebView.h
+++ b/WebKit/Carbon.subproj/HIWebView.h
@@ -1,6 +1,6 @@
 /*
     HIWebView.h
-    Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+    Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
     
     Public header file.
 */
@@ -8,7 +8,7 @@
 #ifndef __HIWebView__
 #define __HIWebView__
 
-#include <WebKit/WebView.h>
+#include <Carbon/Carbon.h>
 
 #include <AvailabilityMacros.h>
 
@@ -20,6 +20,10 @@
 extern "C" {
 #endif
 
+#ifdef __OBJC__
+ at class WebView;
+#endif
+
 /*
  *  HIWebViewCreate()
  *  
@@ -42,6 +46,7 @@ extern "C" {
 extern OSStatus 
 HIWebViewCreate(HIViewRef * outControl);
 
+#ifdef __OBJC__
 
 /*
  *  HIWebViewCreateWithClass(HIViewRef * outControl, Class aClass)
@@ -51,6 +56,8 @@ HIWebViewCreate(HIViewRef * outControl);
  *  
  *  Parameters:
  *    
+ *    aClass:
+ *      Either WebView, or a subclass, to be created and wrapped in an HIWebView.
  *    outControl:
  *      The new web view.
  *  
@@ -62,7 +69,10 @@ HIWebViewCreate(HIViewRef * outControl);
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  */
-extern OSStatus HIWebViewCreateWithClass(Class aClass, HIViewRef * outControl);
+extern OSStatus
+HIWebViewCreateWithClass(
+  Class       aClass,
+  HIViewRef * outControl);
 
 /*
  *  HIWebViewGetWebView()
@@ -83,12 +93,13 @@ extern OSStatus HIWebViewCreateWithClass(Class aClass, HIViewRef * outControl);
  *    CarbonLib:        not available
  *    Non-Carbon CFM:   not available
  */
-extern WebView*
-HIWebViewGetWebView( HIViewRef inView );
+extern WebView *
+HIWebViewGetWebView(HIViewRef inView);
+
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* __HIWebView__ */
-
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a5737e6..90cce53 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,7 +1,23 @@
+2004-05-18  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed <rdar://problem/3520322>: "can't use <WebKit/HIWebView.h> or <WebKit/CarbonUtils.h> from non-Objective C"
+
+        * Carbon.subproj/CarbonUtils.h: Added ifdefs so file compiles when included from non-Objective-C.
+        Changed style to match other Carbon headers a bit more closely. Also remove unnecessary includes.
+        * Carbon.subproj/HIWebView.h: Ditto.
+
+        - fixed <rdar://problem/3648505>: "this text file scrolls to the second line instead of first when pressing home"
+
+        * WebView.subproj/WebFrameView.m:
+        (-[WebFrameView _scrollToTopLeft]): Scroll to origin.y instead of assuming that top is 0; can be non-0 for text view.
+        (-[WebFrameView _scrollToBottomLeft]): Use NSMaxY instead of height for the same reason.
+
 2004-05-17  David Hyatt  <hyatt at apple.com>
 
-	Fix for performance "regression."  This wasn't really a regression... I just forgot to update a variable that
-	I can only assume is used by the PLT.
+	Fix for performance regression in PLT caused by not setting _timeOfLastCompletedLoad, causing
+        page cache to release during the benchmark.
 	
         * WebView.subproj/WebFrame.m:
         (-[WebFrame _setState:]):
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 1ce68b0..2c4c1de 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -244,12 +244,13 @@ enum {
 
 - (void)_scrollToTopLeft
 {
-    [[self _contentView] scrollPoint: NSMakePoint(0, 0)];
+    [[self _contentView] scrollPoint:[[[self _scrollView] documentView] frame].origin];
 }
 
 - (void)_scrollToBottomLeft
 {
-    [[self _contentView] scrollPoint: NSMakePoint(0, [[[self _scrollView] documentView] bounds].size.height)];
+    NSRect frame = [[[self _scrollView] documentView] frame];
+    [[self _contentView] scrollPoint:NSMakePoint(frame.origin.x, NSMaxY(frame))];
 }
 
 - (void)scrollLineUp:(id)sender

-- 
WebKit Debian packaging