[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 e72b8ee60ea98d2f9bf6b1bc02850ebfbb92e47f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 23 22:34:55 2002 +0000

            Reviewed by John and Don.
    
    	- fixed 3134282 -- REGRESSION: text encoding setting reverts when you go to a new location
    
            * WebView.subproj/WebFrame.m: (-[WebFrame loadRequest:]): Propagate an override encoding if there
    	was an existing data source and it had an override encoding.
            * WebView.subproj/WebFramePrivate.m: (-[WebFrame _loadRequest:triggeringAction:loadType:]): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 7974cf0..a1f372d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by John and Don.
+
+	- fixed 3134282 -- REGRESSION: text encoding setting reverts when you go to a new location
+
+        * WebView.subproj/WebFrame.m: (-[WebFrame loadRequest:]): Propagate an override encoding if there
+	was an existing data source and it had an override encoding.
+        * WebView.subproj/WebFramePrivate.m: (-[WebFrame _loadRequest:triggeringAction:loadType:]): Ditto.
+
 === Alexander-44 ===
 
 2002-12-20  Trey Matteson  <trey at apple.com>
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 4b66f03..cea8dd6 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -119,6 +119,9 @@
     } else {
         loadType = WebFrameLoadTypeStandard;
     }
+
+    [newDataSource _setOverrideEncoding:[[self dataSource] _overrideEncoding]];
+
     [self _loadDataSource:newDataSource withLoadType:loadType];
     [newDataSource release];
 }
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 056da95..9b004ab 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1144,7 +1144,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 {
     WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
     [newDataSource _setTriggeringAction:action];
+
+    [newDataSource _setOverrideEncoding:[[self dataSource] _overrideEncoding]];
+
     [self _loadDataSource:newDataSource withLoadType:loadType];
+
     [newDataSource release];
 }
 

-- 
WebKit Debian packaging