Not reviewed.

        - fix build breakage

        * Loader/WebFrameLoader.m:
        (-[WebFrameLoader willChangeTitleForDocumentLoadState:]):
        (-[WebFrameLoader didChangeTitleForDocumentLoadState:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 74d999753839127b30675995c4785e268f818ff4..f37e6eebb2aa58b080954f2291a010e903186ccc 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-06  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed.
+        
+        - fix build breakage
+
+        * Loader/WebFrameLoader.m:
+        (-[WebFrameLoader willChangeTitleForDocumentLoadState:]):
+        (-[WebFrameLoader didChangeTitleForDocumentLoadState:]):
+
 2006-10-06  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/WebKit/Loader/WebFrameLoader.m b/WebKit/Loader/WebFrameLoader.m
index 297ea2ce88c4e7b4a20c794c8764d1a1720afea9..51e8fac62de9d21b00a8a13a907273364bb72e72 100644 (file)
--- a/WebKit/Loader/WebFrameLoader.m
+++ b/WebKit/Loader/WebFrameLoader.m
@@ -33,6 +33,7 @@
 #import "WebFrameBridge.h"
 #import "WebFrameInternal.h"
 #import "WebFrameLoadDelegate.h"
+#import "WebHistory.h"
 #import "WebIconDatabasePrivate.h"
 #import "WebKitErrorsPrivate.h"
 #import "WebKitLogging.h"
@@ -900,38 +901,36 @@ static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
     return [client _subframeIsLoading];
 }
 
-<<<<<<< .mine
 - (void)willChangeTitleForDocumentLoadState:(WebDocumentLoadState *)loadState
 {
     // FIXME: should do this only in main frame case, right?
-    [[webFrame webView] _willChangeValueForKey:_WebMainFrameTitleKey];
+    [[client webView] _willChangeValueForKey:_WebMainFrameTitleKey];
 }
 
 - (void)didChangeTitleForDocumentLoadState:(WebDocumentLoadState *)loadState
 {
     // FIXME: should do this only in main frame case, right?
-    [[webFrame webView] _didChangeValueForKey:_WebMainFrameTitleKey];
+    [[client webView] _didChangeValueForKey:_WebMainFrameTitleKey];
 
     // The title doesn't get communicated to the WebView until we are committed.
     if ([loadState isCommitted]) {
-        NSURL *URLForHistory = [[webFrame _dataSourceForDocumentLoadState:loadState] _URLForHistory];
+        NSURL *URLForHistory = [[client _dataSourceForDocumentLoadState:loadState] _URLForHistory];
         if (URLForHistory != nil) {
             WebHistoryItem *entry = [[WebHistory optionalSharedHistory] itemForURL:URLForHistory];
             [entry setTitle:[loadState title]];
         
             // Must update the entries in the back-forward list too.  This must go through the WebFrame because
             // it has the right notion of the current b/f item.
-            [webFrame _setTitle:[loadState title]];
+            [client _setTitle:[loadState title]];
         
-            [[webFrame webView] setMainFrameDocumentReady:YES];    // update observers with new DOMDocument
-            [[[webFrame webView] _frameLoadDelegateForwarder] webView:[webFrame webView]
+            [[client webView] setMainFrameDocumentReady:YES];    // update observers with new DOMDocument
+            [[[client webView] _frameLoadDelegateForwarder] webView:[client webView]
                                                       didReceiveTitle:[loadState title]
-                                                             forFrame:webFrame];
+                                                             forFrame:client];
         }
     }
 }
 
-=======
 - (WebFrameLoadType)loadType
 {
     return loadType;
@@ -942,5 +941,4 @@ static BOOL isCaseInsensitiveEqual(NSString *a, NSString *b)
     loadType = type;
 }
 
->>>>>>> .r16864
 @end

diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 6a2ab7242a1f039d2f9e602b38b33d5c4af65bf3..eec1cf1fb20f7a6723bbd871bea4f339e9708db4 100644 (file)
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -1259,7 +1259,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKit" */;
-                       compatibilityVersion = "Xcode 2.4";
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
@@ -1273,8 +1272,6 @@
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        projectDirPath = "";
-                       projectRoot = "";
-                       shouldCheckCompatibility = 1;
                        targets = (
                                9398100A0824BF01008DF038 /* WebKit */,
                        );