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

Unified Diff: webkit/plugins/npapi/webplugin_impl.cc

Issue 11148031: webkit: Check that delegate_ isn't NULL before trying to updateGeometry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/webplugin_impl.cc
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index a8b9672ffaf33c554acf329e3827aa82fecec8cc..702e373ca5f932b750cf0d4ddc81906b3dd09b94 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -347,9 +347,9 @@ void WebPluginImpl::updateGeometry(
}
// Only UpdateGeometry if either the window or clip rects have changed.
- if (first_geometry_update_ ||
+ if (delegate_ && (first_geometry_update_ ||
new_geometry.window_rect != geometry_.window_rect ||
- new_geometry.clip_rect != geometry_.clip_rect) {
+ new_geometry.clip_rect != geometry_.clip_rect)) {
// Notify the plugin that its parameters have changed.
delegate_->UpdateGeometry(new_geometry.window_rect, new_geometry.clip_rect);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698