diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:31:44 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-07 22:31:44 +0000 |
| commit | d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3 (patch) | |
| tree | 8249e5b0757af4c6ad5077941771591771f45a84 /ppapi/cpp | |
| parent | 635b82774a9961b7e404674d2d08615397e7861f (diff) | |
| download | chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.zip chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.tar.gz chromium_src-d0e3b4abd1a6c1a3de008e267bd457e9e2ce95f3.tar.bz2 | |
Use PP_BrowserFont_Trusted_Description
instead of PP_FontDescription_Dev for the FLash interface
This changes the old interface without revving the version. This is because the new struct is exactly the same as the old one with a different name, so it will not break binary compat.
BUG=
Review URL: https://codereview.chromium.org/11475006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/cpp')
| -rw-r--r-- | ppapi/cpp/private/DEPS | 1 | ||||
| -rw-r--r-- | ppapi/cpp/private/flash.cc | 4 | ||||
| -rw-r--r-- | ppapi/cpp/private/flash.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/ppapi/cpp/private/DEPS b/ppapi/cpp/private/DEPS index f11fdd6..18adee2 100644 --- a/ppapi/cpp/private/DEPS +++ b/ppapi/cpp/private/DEPS @@ -1,3 +1,4 @@ include_rules = [ "+ppapi/c/private", + "+ppapi/cpp/trusted", ] diff --git a/ppapi/cpp/private/flash.cc b/ppapi/cpp/private/flash.cc index bdf86f5..757dbec 100644 --- a/ppapi/cpp/private/flash.cc +++ b/ppapi/cpp/private/flash.cc @@ -9,7 +9,6 @@ #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" #include "ppapi/cpp/dev/device_ref_dev.h" -#include "ppapi/cpp/dev/font_dev.h" #include "ppapi/cpp/dev/video_capture_dev.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/instance_handle.h" @@ -17,6 +16,7 @@ #include "ppapi/cpp/module_impl.h" #include "ppapi/cpp/point.h" #include "ppapi/cpp/rect.h" +#include "ppapi/cpp/trusted/browser_font_trusted.h" #include "ppapi/cpp/url_request_info.h" #include "ppapi/cpp/var.h" #include "ppapi/c/private/ppb_flash.h" @@ -100,7 +100,7 @@ void Flash::SetInstanceAlwaysOnTop(const InstanceHandle& instance, // static bool Flash::DrawGlyphs(const InstanceHandle& instance, ImageData* image, - const FontDescription_Dev& font_desc, + const BrowserFontDescription& font_desc, uint32_t color, const Point& position, const Rect& clip, diff --git a/ppapi/cpp/private/flash.h b/ppapi/cpp/private/flash.h index 857c689..6a6b7c3 100644 --- a/ppapi/cpp/private/flash.h +++ b/ppapi/cpp/private/flash.h @@ -16,8 +16,8 @@ struct PP_Point; namespace pp { +class BrowserFontDescription; class DeviceRef_Dev; -class FontDescription_Dev; class ImageData; class InstanceHandle; class Module; @@ -38,7 +38,7 @@ class Flash { bool on_top); static bool DrawGlyphs(const InstanceHandle& instance, ImageData* image, - const FontDescription_Dev& font_desc, + const BrowserFontDescription& font_desc, uint32_t color, const Point& position, const Rect& clip, |