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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit fb12c5b2b128fea82dbb757405dc65f405616d0d
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 15 07:16:03 2002 +0000

            More workarounds for the Objective C++ typecasting bug.
    
    	* WebView.subproj/IFDOMNode.mm:
            (-[IFDOMNode initWithWebView:]):
            * WebView.subproj/IFHTMLViewPrivate.mm:
            (-[NSView _IF_stopIfPluginView]):
            * WebView.subproj/IFRenderNode.mm:
            (-[IFRenderNode initWithWebView:]):
            * WebView.subproj/IFWebFrame.mm:
            (-[IFWebFrame reset]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1558 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 677b9fb..c1cff7a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+        More workarounds for the Objective C++ typecasting bug.
+
+	* WebView.subproj/IFDOMNode.mm:
+        (-[IFDOMNode initWithWebView:]):
+        * WebView.subproj/IFHTMLViewPrivate.mm:
+        (-[NSView _IF_stopIfPluginView]):
+        * WebView.subproj/IFRenderNode.mm:
+        (-[IFRenderNode initWithWebView:]):
+        * WebView.subproj/IFWebFrame.mm:
+        (-[IFWebFrame reset]):
+
 2002-07-14  Darin Adler  <darin at apple.com>
 
 	Wean WebKit completely from getting at the C++ parts of WebCore.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 677b9fb..c1cff7a 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+        More workarounds for the Objective C++ typecasting bug.
+
+	* WebView.subproj/IFDOMNode.mm:
+        (-[IFDOMNode initWithWebView:]):
+        * WebView.subproj/IFHTMLViewPrivate.mm:
+        (-[NSView _IF_stopIfPluginView]):
+        * WebView.subproj/IFRenderNode.mm:
+        (-[IFRenderNode initWithWebView:]):
+        * WebView.subproj/IFWebFrame.mm:
+        (-[IFWebFrame reset]):
+
 2002-07-14  Darin Adler  <darin at apple.com>
 
 	Wean WebKit completely from getting at the C++ parts of WebCore.
diff --git a/WebKit/WebView.subproj/IFDOMNode.mm b/WebKit/WebView.subproj/IFDOMNode.mm
index a13b83a..73d412b 100644
--- a/WebKit/WebView.subproj/IFDOMNode.mm
+++ b/WebKit/WebView.subproj/IFDOMNode.mm
@@ -40,7 +40,8 @@
     }
     
     copier = [[WebKitDOMTreeCopier alloc] init];
-    self = [[[(IFHTMLView *)[view documentView] _bridge] copyDOMTree:copier] retain];
+    IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+    self = [[[htmlView _bridge] copyDOMTree:copier] retain];
     [copier release];
     
     return self;
diff --git a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm b/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
index 2ed2b65..8a6561b 100644
--- a/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFHTMLViewPrivate.mm
@@ -25,7 +25,8 @@
 - (void)_IF_stopIfPluginView
 {
     if ([self isKindOfClass:[IFPluginView class]]) {
-        [(IFPluginView *)self stop];
+	IFPluginView *pluginView = (IFPluginView *)self;
+        [pluginView stop];
     }
 }
 @end
diff --git a/WebKit/WebView.subproj/IFRenderNode.mm b/WebKit/WebView.subproj/IFRenderNode.mm
index e77046e..7f89e5d 100644
--- a/WebKit/WebView.subproj/IFRenderNode.mm
+++ b/WebKit/WebView.subproj/IFRenderNode.mm
@@ -54,7 +54,8 @@
     }
     
     copier = [[WebKitRenderTreeCopier alloc] init];
-    self = [[[(IFHTMLView *)[view documentView] _bridge] copyRenderTree:copier] retain];
+    IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+    self = [[[htmlView _bridge] copyRenderTree:copier] retain];
     [copier release];
     
     return self;
diff --git a/WebKit/WebView.subproj/IFWebFrame.mm b/WebKit/WebView.subproj/IFWebFrame.mm
index 96a5f32..cb2e32f 100644
--- a/WebKit/WebView.subproj/IFWebFrame.mm
+++ b/WebKit/WebView.subproj/IFWebFrame.mm
@@ -205,8 +205,10 @@
 - (void)reset
 {
     [_private setDataSource: nil];
-    if ([[self webView] isDocumentHTML])
-        [(IFHTMLView *)[[self webView] documentView] _reset];
+    if ([[self webView] isDocumentHTML]) {
+	IFHTMLView *htmlView = (IFHTMLView *)[[self webView] documentView];
+	[htmlView _reset];
+    }
     [_private setWebView: nil];
 }
 
diff --git a/WebKit/WebView.subproj/WebDOMNode.m b/WebKit/WebView.subproj/WebDOMNode.m
index a13b83a..73d412b 100644
--- a/WebKit/WebView.subproj/WebDOMNode.m
+++ b/WebKit/WebView.subproj/WebDOMNode.m
@@ -40,7 +40,8 @@
     }
     
     copier = [[WebKitDOMTreeCopier alloc] init];
-    self = [[[(IFHTMLView *)[view documentView] _bridge] copyDOMTree:copier] retain];
+    IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+    self = [[[htmlView _bridge] copyDOMTree:copier] retain];
     [copier release];
     
     return self;
diff --git a/WebKit/WebView.subproj/WebDebugDOMNode.m b/WebKit/WebView.subproj/WebDebugDOMNode.m
index a13b83a..73d412b 100644
--- a/WebKit/WebView.subproj/WebDebugDOMNode.m
+++ b/WebKit/WebView.subproj/WebDebugDOMNode.m
@@ -40,7 +40,8 @@
     }
     
     copier = [[WebKitDOMTreeCopier alloc] init];
-    self = [[[(IFHTMLView *)[view documentView] _bridge] copyDOMTree:copier] retain];
+    IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+    self = [[[htmlView _bridge] copyDOMTree:copier] retain];
     [copier release];
     
     return self;
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 96a5f32..cb2e32f 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -205,8 +205,10 @@
 - (void)reset
 {
     [_private setDataSource: nil];
-    if ([[self webView] isDocumentHTML])
-        [(IFHTMLView *)[[self webView] documentView] _reset];
+    if ([[self webView] isDocumentHTML]) {
+	IFHTMLView *htmlView = (IFHTMLView *)[[self webView] documentView];
+	[htmlView _reset];
+    }
     [_private setWebView: nil];
 }
 
diff --git a/WebKit/WebView.subproj/WebHTMLViewPrivate.m b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
index 2ed2b65..8a6561b 100644
--- a/WebKit/WebView.subproj/WebHTMLViewPrivate.m
+++ b/WebKit/WebView.subproj/WebHTMLViewPrivate.m
@@ -25,7 +25,8 @@
 - (void)_IF_stopIfPluginView
 {
     if ([self isKindOfClass:[IFPluginView class]]) {
-        [(IFPluginView *)self stop];
+	IFPluginView *pluginView = (IFPluginView *)self;
+        [pluginView stop];
     }
 }
 @end
diff --git a/WebKit/WebView.subproj/WebRenderNode.m b/WebKit/WebView.subproj/WebRenderNode.m
index e77046e..7f89e5d 100644
--- a/WebKit/WebView.subproj/WebRenderNode.m
+++ b/WebKit/WebView.subproj/WebRenderNode.m
@@ -54,7 +54,8 @@
     }
     
     copier = [[WebKitRenderTreeCopier alloc] init];
-    self = [[[(IFHTMLView *)[view documentView] _bridge] copyRenderTree:copier] retain];
+    IFHTMLView *htmlView = (IFHTMLView *)[view documentView];
+    self = [[[htmlView _bridge] copyRenderTree:copier] retain];
     [copier release];
     
     return self;

-- 
WebKit Debian packaging