| Index: content/renderer/pepper/pepper_flash_renderer_host.cc
|
| diff --git a/content/renderer/pepper/pepper_flash_renderer_host.cc b/content/renderer/pepper/pepper_flash_renderer_host.cc
|
| index e17511d274ea554f2213b15165385fc149c14482..1afabe08e0f165236a57969840834cf311e5ef24 100644
|
| --- a/content/renderer/pepper/pepper_flash_renderer_host.cc
|
| +++ b/content/renderer/pepper/pepper_flash_renderer_host.cc
|
| @@ -4,14 +4,34 @@
|
|
|
| #include "content/renderer/pepper/pepper_flash_renderer_host.h"
|
|
|
| +#include <vector>
|
| +
|
| #include "content/public/renderer/render_thread.h"
|
| #include "content/public/renderer/renderer_ppapi_host.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "ppapi/c/pp_errors.h"
|
| +#include "ppapi/c/trusted/ppb_browser_font_trusted.h"
|
| #include "ppapi/host/dispatch_host_message.h"
|
| +#include "ppapi/proxy/host_dispatcher.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/resource_message_params.h"
|
| +#include "ppapi/proxy/serialized_structs.h"
|
| +#include "ppapi/thunk/enter.h"
|
| +#include "ppapi/thunk/ppb_image_data_api.h"
|
| +#include "skia/ext/platform_canvas.h"
|
| +#include "third_party/skia/include/core/SkCanvas.h"
|
| +#include "third_party/skia/include/core/SkMatrix.h"
|
| +#include "third_party/skia/include/core/SkPaint.h"
|
| +#include "third_party/skia/include/core/SkPoint.h"
|
| +#include "third_party/skia/include/core/SkTemplates.h"
|
| +#include "third_party/skia/include/core/SkTypeface.h"
|
| +#include "ui/gfx/rect.h"
|
| +#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
|
| +#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
|
| +
|
| +using ppapi::thunk::EnterResourceNoLock;
|
| +using ppapi::thunk::PPB_ImageData_API;
|
|
|
| namespace content {
|
|
|
| @@ -19,10 +39,17 @@ PepperFlashRendererHost::PepperFlashRendererHost(
|
| RendererPpapiHost* host,
|
| PP_Instance instance,
|
| PP_Resource resource)
|
| - : ResourceHost(host->GetPpapiHost(), instance, resource) {
|
| + : ResourceHost(host->GetPpapiHost(), instance, resource),
|
| + weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
|
| + host_(host) {
|
| }
|
|
|
| PepperFlashRendererHost::~PepperFlashRendererHost() {
|
| + // This object may be destroyed in the middle of a sync message. If that is
|
| + // the case, make sure we respond to all the pending navigate calls.
|
| + std::vector<ppapi::host::ReplyMessageContext>::reverse_iterator it;
|
| + for (it = navigate_replies_.rbegin(); it != navigate_replies_.rend(); ++it)
|
| + SendReply(*it, IPC::Message());
|
| }
|
|
|
| int32_t PepperFlashRendererHost::OnResourceMessageReceived(
|
| @@ -31,6 +58,14 @@ int32_t PepperFlashRendererHost::OnResourceMessageReceived(
|
| IPC_BEGIN_MESSAGE_MAP(PepperFlashRendererHost, msg)
|
| PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_GetProxyForURL,
|
| OnMsgGetProxyForURL);
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_SetInstanceAlwaysOnTop,
|
| + OnMsgSetInstanceAlwaysOnTop);
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_DrawGlyphs,
|
| + OnMsgDrawGlyphs);
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_Navigate,
|
| + OnMsgNavigate);
|
| + PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_Flash_IsRectTopmost,
|
| + OnMsgIsRectTopmost);
|
| IPC_END_MESSAGE_MAP()
|
| return PP_ERROR_FAILED;
|
| }
|
| @@ -49,4 +84,160 @@ int32_t PepperFlashRendererHost::OnMsgGetProxyForURL(
|
| return PP_OK;
|
| }
|
|
|
| +int32_t PepperFlashRendererHost::OnMsgSetInstanceAlwaysOnTop(
|
| + ppapi::host::HostMessageContext* host_context,
|
| + bool on_top) {
|
| + webkit::ppapi::PluginInstance* plugin_instance =
|
| + host_->GetPluginInstance(pp_instance());
|
| + if (plugin_instance)
|
| + plugin_instance->set_always_on_top(on_top);
|
| + // Since no reply is sent for this message, it doesn't make sense to return an
|
| + // error.
|
| + return PP_OK;
|
| +}
|
| +
|
| +int32_t PepperFlashRendererHost::OnMsgDrawGlyphs(
|
| + ppapi::host::HostMessageContext* host_context,
|
| + ppapi::proxy::PPBFlash_DrawGlyphs_Params params) {
|
| + if (params.glyph_indices.size() != params.glyph_advances.size() ||
|
| + params.glyph_indices.empty())
|
| + return PP_ERROR_FAILED;
|
| +
|
| + EnterResourceNoLock<PPB_ImageData_API> enter(
|
| + params.image_data.host_resource(), true);
|
| + if (enter.failed())
|
| + return PP_ERROR_FAILED;
|
| + webkit::ppapi::PPB_ImageData_Impl* image_resource =
|
| + static_cast<webkit::ppapi::PPB_ImageData_Impl*>(enter.object());
|
| +
|
| + webkit::ppapi::ImageDataAutoMapper mapper(image_resource);
|
| + if (!mapper.is_valid())
|
| + return PP_ERROR_FAILED;
|
| +
|
| + // Set up the typeface.
|
| + int style = SkTypeface::kNormal;
|
| + if (static_cast<PP_BrowserFont_Trusted_Weight>(params.font_desc.weight) >=
|
| + PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD)
|
| + style |= SkTypeface::kBold;
|
| + if (params.font_desc.italic)
|
| + style |= SkTypeface::kItalic;
|
| + skia::RefPtr<SkTypeface> typeface = skia::AdoptRef(
|
| + SkTypeface::CreateFromName(params.font_desc.face.c_str(),
|
| + static_cast<SkTypeface::Style>(style)));
|
| + if (!typeface)
|
| + return PP_ERROR_FAILED;
|
| +
|
| + // Set up the canvas.
|
| + SkCanvas* canvas = image_resource->GetPlatformCanvas();
|
| + SkAutoCanvasRestore acr(canvas, true);
|
| +
|
| + // Clip is applied in pixels before the transform.
|
| + SkRect clip_rect = {
|
| + SkIntToScalar(params.clip.point.x),
|
| + SkIntToScalar(params.clip.point.y),
|
| + SkIntToScalar(params.clip.point.x + params.clip.size.width),
|
| + SkIntToScalar(params.clip.point.y + params.clip.size.height)
|
| + };
|
| + canvas->clipRect(clip_rect);
|
| +
|
| + // Convert & set the matrix.
|
| + SkMatrix matrix;
|
| + matrix.set(SkMatrix::kMScaleX, SkFloatToScalar(params.transformation[0][0]));
|
| + matrix.set(SkMatrix::kMSkewX, SkFloatToScalar(params.transformation[0][1]));
|
| + matrix.set(SkMatrix::kMTransX, SkFloatToScalar(params.transformation[0][2]));
|
| + matrix.set(SkMatrix::kMSkewY, SkFloatToScalar(params.transformation[1][0]));
|
| + matrix.set(SkMatrix::kMScaleY, SkFloatToScalar(params.transformation[1][1]));
|
| + matrix.set(SkMatrix::kMTransY, SkFloatToScalar(params.transformation[1][2]));
|
| + matrix.set(SkMatrix::kMPersp0, SkFloatToScalar(params.transformation[2][0]));
|
| + matrix.set(SkMatrix::kMPersp1, SkFloatToScalar(params.transformation[2][1]));
|
| + matrix.set(SkMatrix::kMPersp2, SkFloatToScalar(params.transformation[2][2]));
|
| + canvas->concat(matrix);
|
| +
|
| + SkPaint paint;
|
| + paint.setColor(params.color);
|
| + paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
|
| + paint.setAntiAlias(true);
|
| + paint.setHinting(SkPaint::kFull_Hinting);
|
| + paint.setTextSize(SkIntToScalar(params.font_desc.size));
|
| + paint.setTypeface(typeface.get()); // Takes a ref and manages lifetime.
|
| + if (params.allow_subpixel_aa) {
|
| + paint.setSubpixelText(true);
|
| + paint.setLCDRenderText(true);
|
| + }
|
| +
|
| + SkScalar x = SkIntToScalar(params.position.x);
|
| + SkScalar y = SkIntToScalar(params.position.y);
|
| +
|
| + // Build up the skia advances.
|
| + size_t glyph_count = params.glyph_indices.size();
|
| + if (glyph_count == 0)
|
| + return PP_OK;
|
| + std::vector<SkPoint> storage;
|
| + storage.resize(glyph_count);
|
| + SkPoint* sk_positions = &storage[0];
|
| + for (uint32_t i = 0; i < glyph_count; i++) {
|
| + sk_positions[i].set(x, y);
|
| + x += SkFloatToScalar(params.glyph_advances[i].x);
|
| + y += SkFloatToScalar(params.glyph_advances[i].y);
|
| + }
|
| +
|
| + canvas->drawPosText(¶ms.glyph_indices[0], glyph_count * 2, sk_positions,
|
| + paint);
|
| +
|
| + return PP_OK;
|
| +}
|
| +
|
| +// CAUTION: This code is subtle because Navigate is a sync call which may
|
| +// cause re-entrancy or cause the instance to be destroyed. If the instance
|
| +// is destroyed we need to ensure that we respond to all outstanding sync
|
| +// messages so that the plugin process does not remain blocked.
|
| +int32_t PepperFlashRendererHost::OnMsgNavigate(
|
| + ppapi::host::HostMessageContext* host_context,
|
| + const ppapi::URLRequestInfoData& data,
|
| + const std::string& target,
|
| + bool from_user_action) {
|
| + // If our PluginInstance is already destroyed, just return a failure.
|
| + webkit::ppapi::PluginInstance* plugin_instance =
|
| + host_->GetPluginInstance(pp_instance());
|
| + if (!plugin_instance)
|
| + return PP_ERROR_FAILED;
|
| +
|
| + // Navigate may call into Javascript (e.g. with a "javascript:" URL),
|
| + // or do things like navigate away from the page, either one of which will
|
| + // need to re-enter into the plugin. It is safe, because it is essentially
|
| + // equivalent to NPN_GetURL, where Flash would expect re-entrancy.
|
| + ppapi::proxy::HostDispatcher* host_dispatcher =
|
| + ppapi::proxy::HostDispatcher::GetForInstance(pp_instance());
|
| + host_dispatcher->set_allow_plugin_reentrancy();
|
| +
|
| + // Grab a weak pointer to ourselves on the stack so we can check if we are
|
| + // still alive.
|
| + base::WeakPtr<PepperFlashRendererHost> weak_ptr = weak_factory_.GetWeakPtr();
|
| + // Keep track of reply contexts in case we are destroyed during a Navigate
|
| + // call. Even if we are destroyed, we still need to send these replies to
|
| + // unblock the plugin process.
|
| + navigate_replies_.push_back(host_context->MakeReplyMessageContext());
|
| + plugin_instance->Navigate(data, target.c_str(), from_user_action);
|
| + // This object might have been destroyed by this point. If it is destroyed
|
| + // the reply will be sent in the destructor. Otherwise send the reply here.
|
| + if (weak_ptr) {
|
| + SendReply(navigate_replies_.back(), IPC::Message());
|
| + navigate_replies_.pop_back();
|
| + }
|
| +
|
| + // Return PP_OK_COMPLETIONPENDING so that no reply is automatically sent.
|
| + return PP_OK_COMPLETIONPENDING;
|
| +}
|
| +
|
| +int32_t PepperFlashRendererHost::OnMsgIsRectTopmost(
|
| + ppapi::host::HostMessageContext* host_context,
|
| + const PP_Rect& rect) {
|
| + webkit::ppapi::PluginInstance* plugin_instance =
|
| + host_->GetPluginInstance(pp_instance());
|
| + if (plugin_instance && plugin_instance->IsRectTopmost(
|
| + gfx::Rect(rect.point.x, rect.point.y,rect.size.width, rect.size.height)))
|
| + return PP_OK;
|
| + return PP_ERROR_FAILED;
|
| +}
|
| +
|
| } // namespace content
|
|
|