[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:24:02 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 5cb2aa6bc3824db76a0312a659a385941d68d6be
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 12 00:43:09 2002 +0000

            * WebView.subproj/IFWebViewPrivate.mm:
            (+[IFWebView _viewTypes]): Changed back to a mutable dictionary. Oops.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d18876d..31a3135 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-11  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/IFWebViewPrivate.mm:
+        (+[IFWebView _viewTypes]): Changed back to a mutable dictionary. Oops.
+
 2002-07-11  John Sullivan   <sullivan at apple.com>
 
 	- fixed 2980779 -- no scroll bar in history window
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d18876d..31a3135 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-07-11  Darin Adler  <darin at apple.com>
+
+        * WebView.subproj/IFWebViewPrivate.mm:
+        (+[IFWebView _viewTypes]): Changed back to a mutable dictionary. Oops.
+
 2002-07-11  John Sullivan   <sullivan at apple.com>
 
 	- fixed 2980779 -- no scroll bar in history window
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 27ce8b2..35af3c7 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -199,12 +199,12 @@
     [self _scrollLineHorizontally: NO];
 }
 
-+ (NSDictionary *)_viewTypes
++ (NSMutableDictionary *)_viewTypes
 {
-    static NSDictionary *viewTypes;
+    static NSMutableDictionary *viewTypes;
 
     if (!viewTypes) {
-        viewTypes = [[NSDictionary alloc] initWithObjectsAndKeys:
+        viewTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
             [IFHTMLView class], @"text/html",
             [IFTextView class], @"text/",
             [IFImageView class], @"image/jpeg",
@@ -219,7 +219,7 @@
 
 + (BOOL)_canShowMIMEType:(NSString *)MIMEType
 {
-    NSMutableDictionary *viewTypes = [[self class] _viewTypes];
+    NSDictionary *viewTypes = [[self class] _viewTypes];
     NSArray *keys;
     unsigned i;
     
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 27ce8b2..35af3c7 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -199,12 +199,12 @@
     [self _scrollLineHorizontally: NO];
 }
 
-+ (NSDictionary *)_viewTypes
++ (NSMutableDictionary *)_viewTypes
 {
-    static NSDictionary *viewTypes;
+    static NSMutableDictionary *viewTypes;
 
     if (!viewTypes) {
-        viewTypes = [[NSDictionary alloc] initWithObjectsAndKeys:
+        viewTypes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
             [IFHTMLView class], @"text/html",
             [IFTextView class], @"text/",
             [IFImageView class], @"image/jpeg",
@@ -219,7 +219,7 @@
 
 + (BOOL)_canShowMIMEType:(NSString *)MIMEType
 {
-    NSMutableDictionary *viewTypes = [[self class] _viewTypes];
+    NSDictionary *viewTypes = [[self class] _viewTypes];
     NSArray *keys;
     unsigned i;
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list