[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 d3f2a61d5016a6d1cdfd184ccae840fdc890e7c3
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 31 18:29:09 2003 +0000

            Reviewed by John.
    
            - fixed 3211730 -- REGRESSION: Flash spawns blank page then loads new page inside banner itself
    
            * Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView loadPluginRequest:]):
            Load the request in the frame we found or created, not always in our own frame (oops!).
    
            - other changes
    
            * History.subproj/WebHistory.h: Update comments to all say "Item" instead of "Entry".
            They didn't match the method names any more.
    
            * WebView.subproj/WebView.m:
            (-[WebView acceptsFirstResponder]): Return YES.
            (-[WebView becomeFirstResponder]): Pass first responder on to the WebFrameView in the same way
            the WebFrameView passes it on to the document view.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c5ecbfa..43d13f0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,22 @@
+2003-03-31  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3211730 -- REGRESSION: Flash spawns blank page then loads new page inside banner itself
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView loadPluginRequest:]):
+        Load the request in the frame we found or created, not always in our own frame (oops!).
+
+        - other changes
+
+        * History.subproj/WebHistory.h: Update comments to all say "Item" instead of "Entry".
+        They didn't match the method names any more.
+        
+        * WebView.subproj/WebView.m:
+        (-[WebView acceptsFirstResponder]): Return YES.
+        (-[WebView becomeFirstResponder]): Pass first responder on to the WebFrameView in the same way
+        the WebFrameView passes it on to the document view.
+
 2003-03-30  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/History.subproj/WebHistory.h b/WebKit/History.subproj/WebHistory.h
index 80e4372..fe26e73 100644
--- a/WebKit/History.subproj/WebHistory.h
+++ b/WebKit/History.subproj/WebHistory.h
@@ -11,7 +11,7 @@
 
 // Notifications sent when history is modified.
 // The first two come with a userInfo dictionary with a single key "Entries", which contains
-// an array of entries that were added or removed.
+// an array of items that were added or removed.
 
 // posted from addItems:
 extern NSString *WebHistoryItemsAddedNotification;
@@ -55,32 +55,32 @@ extern NSString *WebHistoryLoadedNotification;
 - initWithContentsOfURL:(NSURL *)URL;
 
 /*!
-    @method addEntries:
-    @param newEntries An array of WebHistoryItems to add to the WebHistory.
+    @method addItems:
+    @param newItems An array of WebHistoryItems to add to the WebHistory.
 */
-- (void)addItems:(NSArray *)newEntries;
+- (void)addItems:(NSArray *)newItems;
 
 /*!
-    @method removeEntries:
-    @param entries An array of WebHistoryItems to remove from the WebHistory.
+    @method removeItems:
+    @param items An array of WebHistoryItems to remove from the WebHistory.
 */
-- (void)removeItems:(NSArray *)entries;
+- (void)removeItems:(NSArray *)items;
 
 /*!
-    @method removeAllEntries
+    @method removeAllItems
 */
 - (void)removeAllItems;
 
 /*!
     @method orderedLastVisitedDays
     @discussion Get an array of NSCalendarDates, each one representing a unique day that contains one
-    or more history entries, ordered from most recent to oldest.
+    or more history items, ordered from most recent to oldest.
     @result Returns an array of NSCalendarDates for which history items exist in the WebHistory.
 */
 - (NSArray *)orderedLastVisitedDays;
 
 /*!
-    @method orderedEntriesLastVisitedOnDay:
+    @method orderedItemsLastVisitedOnDay:
     @discussion Get an array of WebHistoryItem that were last visited on the day represented by the
     specified NSCalendarDate, ordered from most recent to oldest.
     @param calendarDate A date identifying the unique day of interest.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index a25a737..86d385b 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1058,7 +1058,7 @@ typedef struct {
             NPP_URLNotify(instance, [[URL absoluteString] cString], NPRES_DONE, notifyData);
         }
     } else {
-        [[self webFrame] loadRequest:request];
+        [frame loadRequest:request];
         if (notifyData) {
             // FIXME: How do we notify about failures? It seems this will only notify about success.
         
diff --git a/WebKit/WebView.subproj/WebView.m b/WebKit/WebView.subproj/WebView.m
index d39dd9b..977fe7c 100644
--- a/WebKit/WebView.subproj/WebView.m
+++ b/WebKit/WebView.subproj/WebView.m
@@ -446,6 +446,19 @@ NSString *WebElementLinkTitleKey = 		@"WebElementLinkTitle";
     return userAgent;
 }
 
+-(BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    if ([[self mainFrame] frameView]) {
+        [[self window] makeFirstResponder:[[self mainFrame] frameView]];
+    }
+    return YES;
+}
+
 @end
 
 

-- 
WebKit Debian packaging