Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/WebCore/html/HTMLAppletElement.cpp

Issue 10409072: Merge 117304 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/java/inline-applet-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLAppletElement.cpp
===================================================================
--- Source/WebCore/html/HTMLAppletElement.cpp (revision 118016)
+++ Source/WebCore/html/HTMLAppletElement.cpp (working copy)
@@ -115,10 +115,11 @@
if (!canEmbedJava())
return 0;
+ if (!renderer() || !renderer()->isApplet())
+ return 0;
+
RenderApplet* applet = toRenderApplet(renderer());
- if (applet)
- applet->createWidgetIfNecessary();
-
+ applet->createWidgetIfNecessary();
return applet;
}
« no previous file with comments | « LayoutTests/java/inline-applet-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698