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

Side by Side Diff: content/renderer/pepper/pepper_webplugin_impl.cc

Issue 1137433004: Pepper: Fix nullptr crash in PepperWebPluginImpl::updateGeometry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/pepper/pepper_webplugin_impl.h" 5 #include "content/renderer/pepper/pepper_webplugin_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/debug/crash_logging.h" 9 #include "base/debug/crash_logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 instance_->Paint(canvas, plugin_rect_, rect); 167 instance_->Paint(canvas, plugin_rect_, rect);
168 } 168 }
169 169
170 void PepperWebPluginImpl::updateGeometry( 170 void PepperWebPluginImpl::updateGeometry(
171 const WebRect& window_rect, 171 const WebRect& window_rect,
172 const WebRect& clip_rect, 172 const WebRect& clip_rect,
173 const WebRect& unobscured_rect, 173 const WebRect& unobscured_rect,
174 const WebVector<WebRect>& cut_outs_rects, 174 const WebVector<WebRect>& cut_outs_rects,
175 bool is_visible) { 175 bool is_visible) {
176 plugin_rect_ = window_rect; 176 plugin_rect_ = window_rect;
177 if (!instance_->FlashIsFullscreenOrPending()) { 177 if (instance_ && !instance_->FlashIsFullscreenOrPending()) {
178 std::vector<gfx::Rect> cut_outs; 178 std::vector<gfx::Rect> cut_outs;
179 for (size_t i = 0; i < cut_outs_rects.size(); ++i) 179 for (size_t i = 0; i < cut_outs_rects.size(); ++i)
180 cut_outs.push_back(cut_outs_rects[i]); 180 cut_outs.push_back(cut_outs_rects[i]);
181 instance_->ViewChanged(plugin_rect_, clip_rect, unobscured_rect, cut_outs); 181 instance_->ViewChanged(plugin_rect_, clip_rect, unobscured_rect, cut_outs);
182 } 182 }
183 } 183 }
184 184
185 void PepperWebPluginImpl::updateFocus(bool focused, 185 void PepperWebPluginImpl::updateFocus(bool focused,
186 blink::WebFocusType focus_type) { 186 blink::WebFocusType focus_type) {
187 instance_->SetWebKitFocus(focused); 187 instance_->SetWebKitFocus(focused);
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 288
289 bool PepperWebPluginImpl::canRotateView() { return instance_->CanRotateView(); } 289 bool PepperWebPluginImpl::canRotateView() { return instance_->CanRotateView(); }
290 290
291 void PepperWebPluginImpl::rotateView(RotationType type) { 291 void PepperWebPluginImpl::rotateView(RotationType type) {
292 instance_->RotateView(type); 292 instance_->RotateView(type);
293 } 293 }
294 294
295 bool PepperWebPluginImpl::isPlaceholder() { return false; } 295 bool PepperWebPluginImpl::isPlaceholder() { return false; }
296 296
297 } // namespace content 297 } // namespace content
OLDNEW
« 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