[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:45:30 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 1065867db3aef1f4521969a7732d816d92910103
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 28 00:16:35 2002 +0000

            * LocationChangeError.m:
            (-[LocationChangeHandler displayLocationChangeError:]): Add back the
    	WebErrorCodeCancelled case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2193 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index c5ff351..034b93c 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -254,7 +254,7 @@
 	[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
         break;
     default:
-        [NSException raise:NSInvalidArgumentException format:@"contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy."];
+        ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");
     }
 
     [self receivedProgressWithHandle:handle complete:NO];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index c5ff351..034b93c 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -254,7 +254,7 @@
 	[[[dataSource controller] locationChangeDelegate] locationChangeDone:nil forDataSource:dataSource];
         break;
     default:
-        [NSException raise:NSInvalidArgumentException format:@"contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy."];
+        ERROR("contentPolicyForMIMEType:URL:inFrame: returned an invalid content policy.");
     }
 
     [self receivedProgressWithHandle:handle complete:NO];

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list