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

Side by Side Diff: webkit/plugins/ppapi/ppapi_plugin_instance.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
« no previous file with comments | « webkit/plugins/ppapi/host_globals.cc ('k') | webkit/plugins/ppapi/quota_file_io.cc » ('j') | 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 "webkit/plugins/ppapi/ppapi_plugin_instance.h" 5 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after
1765 return bound_graphics_2d_platform_; 1765 return bound_graphics_2d_platform_;
1766 } 1766 }
1767 1767
1768 static void IgnoreCallback(unsigned, bool) {} 1768 static void IgnoreCallback(unsigned, bool) {}
1769 1769
1770 void PluginInstance::UpdateLayer() { 1770 void PluginInstance::UpdateLayer() {
1771 if (!container_) 1771 if (!container_)
1772 return; 1772 return;
1773 1773
1774 gpu::Mailbox mailbox; 1774 gpu::Mailbox mailbox;
1775 if (bound_graphics_3d_) { 1775 if (bound_graphics_3d_.get()) {
1776 PluginDelegate::PlatformContext3D* context = 1776 PluginDelegate::PlatformContext3D* context =
1777 bound_graphics_3d_->platform_context(); 1777 bound_graphics_3d_->platform_context();
1778 context->GetBackingMailbox(&mailbox); 1778 context->GetBackingMailbox(&mailbox);
1779 } 1779 }
1780 bool want_layer = !mailbox.IsZero(); 1780 bool want_layer = !mailbox.IsZero();
1781 1781
1782 if (want_layer == !!texture_layer_.get() && 1782 if (want_layer == !!texture_layer_.get() &&
1783 layer_bound_to_fullscreen_ == !!fullscreen_container_) 1783 layer_bound_to_fullscreen_ == !!fullscreen_container_)
1784 return; 1784 return;
1785 1785
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 screen_size_for_fullscreen_ = gfx::Size(); 2592 screen_size_for_fullscreen_ = gfx::Size();
2593 WebElement element = container_->element(); 2593 WebElement element = container_->element();
2594 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_); 2594 element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
2595 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_); 2595 element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
2596 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_); 2596 element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
2597 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_); 2597 element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
2598 } 2598 }
2599 2599
2600 } // namespace ppapi 2600 } // namespace ppapi
2601 } // namespace webkit 2601 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/host_globals.cc ('k') | webkit/plugins/ppapi/quota_file_io.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698