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

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

Issue 10905036: Pepper Flash Mac: Fix crash when playing video on MB retina (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disable test on windows Created 8 years, 3 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 | Annotate | Revision Log
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_plugin_delegate_impl.h" 5 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <cstddef> 8 #include <cstddef>
9 #include <map> 9 #include <map>
10 #include <queue> 10 #include <queue>
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 if (active_instances_.find(*i) != active_instances_.end()) 529 if (active_instances_.find(*i) != active_instances_.end())
530 (*i)->ViewFlushedPaint(); 530 (*i)->ViewFlushedPaint();
531 } 531 }
532 } 532 }
533 533
534 webkit::ppapi::PluginInstance* 534 webkit::ppapi::PluginInstance*
535 PepperPluginDelegateImpl::GetBitmapForOptimizedPluginPaint( 535 PepperPluginDelegateImpl::GetBitmapForOptimizedPluginPaint(
536 const gfx::Rect& paint_bounds, 536 const gfx::Rect& paint_bounds,
537 TransportDIB** dib, 537 TransportDIB** dib,
538 gfx::Rect* location, 538 gfx::Rect* location,
539 gfx::Rect* clip) { 539 gfx::Rect* clip,
540 float* scale_factor) {
540 for (std::set<webkit::ppapi::PluginInstance*>::iterator i = 541 for (std::set<webkit::ppapi::PluginInstance*>::iterator i =
541 active_instances_.begin(); 542 active_instances_.begin();
542 i != active_instances_.end(); ++i) { 543 i != active_instances_.end(); ++i) {
543 webkit::ppapi::PluginInstance* instance = *i; 544 webkit::ppapi::PluginInstance* instance = *i;
544 if (instance->GetBitmapForOptimizedPluginPaint( 545 if (instance->GetBitmapForOptimizedPluginPaint(
545 paint_bounds, dib, location, clip)) 546 paint_bounds, dib, location, clip, scale_factor))
546 return *i; 547 return *i;
547 } 548 }
548 return NULL; 549 return NULL;
549 } 550 }
550 551
551 void PepperPluginDelegateImpl::PluginFocusChanged( 552 void PepperPluginDelegateImpl::PluginFocusChanged(
552 webkit::ppapi::PluginInstance* instance, 553 webkit::ppapi::PluginInstance* instance,
553 bool focused) { 554 bool focused) {
554 if (focused) 555 if (focused)
555 focused_plugin_ = instance; 556 focused_plugin_ = instance;
(...skipping 1263 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 else 1820 else
1820 return render_view_->mouse_lock_dispatcher(); 1821 return render_view_->mouse_lock_dispatcher();
1821 } 1822 }
1822 1823
1823 webkit_glue::ClipboardClient* 1824 webkit_glue::ClipboardClient*
1824 PepperPluginDelegateImpl::CreateClipboardClient() const { 1825 PepperPluginDelegateImpl::CreateClipboardClient() const {
1825 return new RendererClipboardClient; 1826 return new RendererClipboardClient;
1826 } 1827 }
1827 1828
1828 } // namespace content 1829 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_plugin_delegate_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698