| Index: ppapi/cpp/private/flash.h
|
| diff --git a/ppapi/cpp/private/flash.h b/ppapi/cpp/private/flash.h
|
| index e60cc013a74dd96bebdd07f73009a839fe6b68a5..9eafac384dfe9a5530800d8b2a31251b07e6b663 100644
|
| --- a/ppapi/cpp/private/flash.h
|
| +++ b/ppapi/cpp/private/flash.h
|
| @@ -16,7 +16,7 @@ namespace pp {
|
|
|
| class FontDescription_Dev;
|
| class ImageData;
|
| -class Instance;
|
| +class InstanceHandle;
|
| class Module;
|
| class Point;
|
| class Rect;
|
| @@ -30,8 +30,9 @@ class Flash {
|
| // Returns true if the required interface is available.
|
| static bool IsAvailable();
|
|
|
| - static void SetInstanceAlwaysOnTop(Instance* instance, bool on_top);
|
| - static bool DrawGlyphs(Instance* instance,
|
| + static void SetInstanceAlwaysOnTop(const InstanceHandle& instance,
|
| + bool on_top);
|
| + static bool DrawGlyphs(const InstanceHandle& instance,
|
| ImageData* image,
|
| const FontDescription_Dev& font_desc,
|
| uint32_t color,
|
| @@ -42,18 +43,20 @@ class Flash {
|
| uint32_t glyph_count,
|
| const uint16_t glyph_indices[],
|
| const PP_Point glyph_advances[]);
|
| - static Var GetProxyForURL(Instance* instance, const std::string& url);
|
| + static Var GetProxyForURL(const InstanceHandle& instance,
|
| + const std::string& url);
|
| static int32_t Navigate(const URLRequestInfo& request_info,
|
| const std::string& target,
|
| bool from_user_action);
|
| - static void RunMessageLoop(Instance* instance);
|
| - static void QuitMessageLoop(Instance* instance);
|
| - static double GetLocalTimeZoneOffset(Instance* instance, PP_Time t);
|
| + static void RunMessageLoop(const InstanceHandle& instance);
|
| + static void QuitMessageLoop(const InstanceHandle& instance);
|
| + static double GetLocalTimeZoneOffset(const InstanceHandle& instance,
|
| + PP_Time t);
|
| static Var GetCommandLineArgs(Module* module);
|
| static void PreloadFontWin(const void* logfontw);
|
| - static bool IsRectTopmost(Instance* instance, const Rect& rect);
|
| - static int32_t InvokePrinting(Instance* instance);
|
| - static void UpdateActivity(Instance* instance);
|
| + static bool IsRectTopmost(const InstanceHandle& instance, const Rect& rect);
|
| + static int32_t InvokePrinting(const InstanceHandle& instance);
|
| + static void UpdateActivity(const InstanceHandle& instance);
|
|
|
| };
|
|
|
|
|