[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[beidson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 577f47cacb7ccf26a2ec79bb7dcb2d0b3923c760
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 18:01:09 2010 +0000

    2010-07-16  Brady Eidson  <beidson at apple.com>
    
            Reviewed by Sam Weinig.
    
            Make revalidation of back/forward work a little better with page loads
            https://bugs.webkit.org/show_bug.cgi?id=42470
    
            * MiniBrowser/mac/BrowserWindow.xib:
            * MiniBrowser/mac/BrowserWindowController.h:
            * MiniBrowser/mac/BrowserWindowController.m:
            (-[BrowserWindowController validateToolbar]):
            (_didStartProvisionalLoadForFrame):
            (_didCommitLoadForFrame):
            (_didFailLoadWithErrorForFrame):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63564 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 60405e0..d42847f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-16  Brady Eidson  <beidson at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Make revalidation of back/forward work a little better with page loads
+        https://bugs.webkit.org/show_bug.cgi?id=42470
+
+        * MiniBrowser/mac/BrowserWindow.xib:
+        * MiniBrowser/mac/BrowserWindowController.h:
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController validateToolbar]):
+        (_didStartProvisionalLoadForFrame):
+        (_didCommitLoadForFrame):
+        (_didFailLoadWithErrorForFrame):
+
 2010-07-16  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindow.xib b/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
index 7164aa2..52558a7 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindow.xib
@@ -417,6 +417,14 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">toolbar</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="726585754"/>
+					</object>
+					<int key="connectionID">67</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -623,9 +631,9 @@
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>{{342, 173}, {776, 608}}</string>
+					<string>{{276, 45}, {776, 608}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{342, 173}, {776, 608}}</string>
+					<string>{{276, 45}, {776, 608}}</string>
 					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{202, 428}, {480, 270}}</string>
@@ -667,7 +675,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">66</int>
+			<int key="maxID">67</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -707,6 +715,7 @@
 							<string>forwardButton</string>
 							<string>progressIndicator</string>
 							<string>reloadButton</string>
+							<string>toolbar</string>
 							<string>urlText</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -716,6 +725,7 @@
 							<string>NSButton</string>
 							<string>NSProgressIndicator</string>
 							<string>NSButton</string>
+							<string>NSToolbar</string>
 							<string>NSTextField</string>
 						</object>
 					</object>
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.h b/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
index c958fef..aad8240 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.h
@@ -28,6 +28,7 @@
     IBOutlet NSButton *reloadButton;
     IBOutlet NSButton *backButton;
     IBOutlet NSButton *forwardButton;
+    IBOutlet NSToolbar *toolbar;
     IBOutlet NSTextField *urlText;
     IBOutlet NSView *containerView;
 
diff --git a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
index 0e51311..9e8f48a 100644
--- a/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
+++ b/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
@@ -121,6 +121,11 @@
     return YES;
 }
 
+- (void)validateToolbar
+{
+    [toolbar validateVisibleItems];
+}
+
 - (BOOL)windowShouldClose:(id)sender
 {
     LOG(@"windowShouldClose");
@@ -145,6 +150,7 @@
 static void _didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
 {
     LOG(@"didStartProvisionalLoadForFrame");
+    [(BrowserWindowController *)clientInfo validateToolbar];
 }
 
 static void _didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
@@ -160,6 +166,7 @@ static void _didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef
 static void _didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
 {
     LOG(@"didCommitLoadForFrame");
+    [(BrowserWindowController *)clientInfo validateToolbar];
 }
 
 static void _didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
@@ -170,6 +177,7 @@ static void _didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, const void
 static void _didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
 {
     LOG(@"didFailLoadWithErrorForFrame");
+    [(BrowserWindowController *)clientInfo validateToolbar];
 }
 
 static void _didReceiveTitleForFrame(WKPageRef page, WKStringRef title, WKFrameRef frame, const void *clientInfo)

-- 
WebKit Debian packaging