Merge 117304

Source/WebCore/html/HTMLAppletElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 97 matching lines @@
     if (!widget)
         return;
     widget->handleEvent(event);
 }
 
 RenderWidget* HTMLAppletElement::renderWidgetForJSBindings()
 {
     if (!canEmbedJava())
         return 0;
 
+    if (!renderer() || !renderer()->isApplet())
+        return 0;
+
     RenderApplet* applet = toRenderApplet(renderer());
-    if (applet)
-        applet->createWidgetIfNecessary();
-
+    applet->createWidgetIfNecessary();
     return applet;
 }
 
 bool HTMLAppletElement::canEmbedJava() const
 {
     if (document()->isSandboxed(SandboxPlugins))
         return false;
 
     Settings* settings = document()->settings();
     return settings && settings->isJavaEnabled();
 }
 
 void HTMLAppletElement::finishParsingChildren()
 {
     // The parser just reached </applet>, so all the params are available now.
     HTMLPlugInElement::finishParsingChildren();
     if (renderer())
         renderer()->setNeedsLayout(true); // This will cause it to create its widget & the Java applet
 }
 
 }