diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 07:24:31 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 07:24:31 +0000 |
| commit | f5c418cc0844fe832b2beab2f179e1c5afbce7cf (patch) | |
| tree | 22778171c252e1651b2d0269d1b1673b1b0b9fb6 /remoting | |
| parent | d407c9d6e824017564ec086379fcb7119d85ffcf (diff) | |
| download | chromium_src-f5c418cc0844fe832b2beab2f179e1c5afbce7cf.zip chromium_src-f5c418cc0844fe832b2beab2f179e1c5afbce7cf.tar.gz chromium_src-f5c418cc0844fe832b2beab2f179e1c5afbce7cf.tar.bz2 | |
Switch to stable Pepper View and Graphics2D APIs.
Also cleans up work-arounds for Windows' PostMessage macro definition in ChromotingInstance header includes.
BUG=275049
Review URL: https://chromiumcodereview.appspot.com/22923017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.h | 15 | ||||
| -rw-r--r-- | remoting/client/plugin/pepper_view.cc | 8 |
2 files changed, 6 insertions, 17 deletions
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index 2d626ff..3dd36c5 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -16,18 +16,8 @@ #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_rect.h" #include "ppapi/c/pp_resource.h" -#include "ppapi/cpp/var.h" -#include "third_party/skia/include/core/SkPoint.h" -#include "third_party/skia/include/core/SkRegion.h" -#include "third_party/skia/include/core/SkSize.h" - -// Windows defines 'PostMessage', so we have to undef it before we -// include instance_private.h -#if defined(PostMessage) -#undef PostMessage -#endif - #include "ppapi/cpp/instance.h" +#include "ppapi/cpp/var.h" #include "remoting/client/client_context.h" #include "remoting/client/client_user_interface.h" #include "remoting/client/key_event_mapper.h" @@ -43,6 +33,9 @@ #include "remoting/protocol/mouse_input_filter.h" #include "remoting/protocol/negotiating_client_authenticator.h" #include "remoting/protocol/third_party_client_authenticator.h" +#include "third_party/skia/include/core/SkPoint.h" +#include "third_party/skia/include/core/SkRegion.h" +#include "third_party/skia/include/core/SkSize.h" namespace base { class DictionaryValue; diff --git a/remoting/client/plugin/pepper_view.cc b/remoting/client/plugin/pepper_view.cc index 09d8783..c412316 100644 --- a/remoting/client/plugin/pepper_view.cc +++ b/remoting/client/plugin/pepper_view.cc @@ -11,8 +11,6 @@ #include "base/synchronization/waitable_event.h" #include "base/time/time.h" #include "ppapi/cpp/completion_callback.h" -#include "ppapi/cpp/dev/graphics_2d_dev.h" -#include "ppapi/cpp/dev/view_dev.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/point.h" #include "ppapi/cpp/rect.h" @@ -104,8 +102,7 @@ void PepperView::SetView(const pp::View& view) { pp::Rect pp_size = view.GetRect(); SkISize new_dips_size = SkISize::Make(pp_size.width(), pp_size.height()); - pp::ViewDev view_dev(view); - float new_dips_to_device_scale = view_dev.GetDeviceScale(); + float new_dips_to_device_scale = view.GetDeviceScale(); if (dips_size_ != new_dips_size || dips_to_device_scale_ != new_dips_to_device_scale) { @@ -135,8 +132,7 @@ void PepperView::SetView(const pp::View& view) { graphics2d_ = pp::Graphics2D(instance_, pp_size, false); // Specify the scale from our coordinates to DIPs. - pp::Graphics2D_Dev graphics2d_dev(graphics2d_); - graphics2d_dev.SetScale(1.0f / dips_to_view_scale_); + graphics2d_.SetScale(1.0f / dips_to_view_scale_); bool result = instance_->BindGraphics(graphics2d_); |