[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kdecker at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 8009251f30b71517f14fd623eea48519ac2e86f8
Author: kdecker at apple.com <kdecker at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 17 00:11:53 2009 +0000

            Reviewed by Anders Carlson.
    
            Small code cleanup
    
            * Plugins/WebBaseNetscapePluginView.mm:
            (WebHaltablePlugin::halt): Just call -[WebBaseNetscapePluginView halt].
            (WebHaltablePlugin::restart): Just call -[WebBaseNetscapePluginView resumeFromHalt]
            (-[WebBaseNetscapePluginView halt]):
            (-[WebBaseNetscapePluginView resumeFromHalt]):
            * WebView/WebView.mm:
            (_pluginViewForNode): Added a check if a render is a widget. This prevents a later assertion.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49710 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 4c0fdfe..531b8dd 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Anders Carlson.
 
+        Small code cleanup
+        
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (WebHaltablePlugin::halt): Just call -[WebBaseNetscapePluginView halt].
+        (WebHaltablePlugin::restart): Just call -[WebBaseNetscapePluginView resumeFromHalt]
+        (-[WebBaseNetscapePluginView halt]): 
+        (-[WebBaseNetscapePluginView resumeFromHalt]):
+        * WebView/WebView.mm:
+        (_pluginViewForNode): Added a check if a render is a widget. This prevents a later assertion.
+
+2009-10-16  Kevin Decker  <kdecker at apple.com>
+
+        Reviewed by Anders Carlson.
+
         Last part of:
         <rdar://problem/7273354>
 
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index ea66bf4..00526db 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -83,27 +83,11 @@ private:
 
 void WebHaltablePlugin::halt()
 {
-    Element* element = [m_view element];
-#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
-    CGImageRef cgImage = CGImageRetain([core([m_view webFrame])->nodeImage(element) CGImageForProposedRect:nil context:nil hints:nil]);
-#else
-    RetainPtr<CGImageSourceRef> imageRef(AdoptCF, CGImageSourceCreateWithData((CFDataRef)[core([m_view webFrame])->nodeImage(element) TIFFRepresentation], 0));
-    CGImageRef cgImage = CGImageSourceCreateImageAtIndex(imageRef.get(), 0, 0);
-#endif
-    ASSERT(cgImage);
-    
-    // BitmapImage will release the passed in CGImage on destruction.
-    RefPtr<Image> nodeImage = BitmapImage::create(cgImage);
-    ASSERT(element->renderer());
-    toRenderWidget(element->renderer())->showSubstituteImage(nodeImage);
     [m_view halt];
 }
 
 void WebHaltablePlugin::restart()
 { 
-    Element* element = [m_view element];
-    ASSERT(element->renderer());
-    toRenderWidget(element->renderer())->showSubstituteImage(0);
     [m_view resumeFromHalt];
 }
     
@@ -495,8 +479,21 @@ Node* WebHaltablePlugin::node() const
 - (void)halt
 {
     ASSERT(!_isHalted && _isStarted);
+    Element *element = [self element];
+#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
+    CGImageRef cgImage = CGImageRetain([core([self webFrame])->nodeImage(element) CGImageForProposedRect:nil context:nil hints:nil]);
+#else
+    RetainPtr<CGImageSourceRef> imageRef(AdoptCF, CGImageSourceCreateWithData((CFDataRef)[core([self webFrame])->nodeImage(element) TIFFRepresentation], 0));
+    CGImageRef cgImage = CGImageSourceCreateImageAtIndex(imageRef.get(), 0, 0);
+#endif
+    ASSERT(cgImage);
+    
+    // BitmapImage will release the passed in CGImage on destruction.
+    RefPtr<Image> nodeImage = BitmapImage::create(cgImage);
+    ASSERT(element->renderer());
+    toRenderWidget(element->renderer())->showSubstituteImage(nodeImage);
     [self stop];
-    _isHalted = YES;
+    _isHalted = YES;    
 }
 
 - (void)resumeFromHalt
@@ -506,6 +503,9 @@ Node* WebHaltablePlugin::node() const
     
     if (_isStarted)
         _isHalted = NO;
+    
+    ASSERT([self element]->renderer());
+    toRenderWidget([self element]->renderer())->showSubstituteImage(0);
 }
 
 - (BOOL)isHalted
diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index b1955d9..ac851d8 100644
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -2126,7 +2126,7 @@ static WebBaseNetscapePluginView *_pluginViewForNode(DOMNode *node)
         return nil;
     
     RenderObject* renderer = coreNode->renderer();
-    if (!renderer)
+    if (!renderer || !renderer->isWidget())
         return nil;
     
     Widget* widget = toRenderWidget(renderer)->widget();

-- 
WebKit Debian packaging