Skip to content

Commit

Permalink
Revert 277208 "[PPAPI] Compositor API implementation."
Browse files Browse the repository at this point in the history
This CL seems to cause perf bot failure.
The log said nacl_helper-data size gained exceeds expectation.

http://build.chromium.org/p/chromium/builders/Linux/builds/50560
https://chromeperf.appspot.com/report?masters=Chromium&bots=chromium-rel-linux&tests=sizes%2Fnacl_helper-data&rev=277212&checked=core

> [PPAPI] Compositor API implementation.
>
> Implement the compositor API which allows a plugin to combine different sources of visual data efficiently, such as PPB_ImageData and OpengGL texture.
>
> API Proposal http://goo.gl/V7xcu3
>
> BUG=374383
>
> Review URL: https://codereview.chromium.org/298023004

TBR=penghuang@chromium.org

Review URL: https://codereview.chromium.org/331123003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277372 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
tzik@chromium.org committed Jun 16, 2014
1 parent cadbc71 commit 20068a0
Show file tree
Hide file tree
Showing 26 changed files with 40 additions and 2,300 deletions.
2 changes: 0 additions & 2 deletions content/content_renderer.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,6 @@
'renderer/pepper/pepper_broker.h',
'renderer/pepper/pepper_browser_connection.cc',
'renderer/pepper/pepper_browser_connection.h',
'renderer/pepper/pepper_compositor_host.cc',
'renderer/pepper/pepper_compositor_host.h',
'renderer/pepper/pepper_device_enumeration_host_helper.cc',
'renderer/pepper/pepper_device_enumeration_host_helper.h',
'renderer/pepper/pepper_file_chooser_host.cc',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "content/public/common/content_client.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/renderer/pepper/pepper_audio_input_host.h"
#include "content/renderer/pepper/pepper_compositor_host.h"
#include "content/renderer/pepper/pepper_file_chooser_host.h"
#include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
#include "content/renderer/pepper/pepper_file_system_host.h"
Expand Down Expand Up @@ -83,10 +82,6 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost(

// Public interfaces.
switch (message.type()) {
case PpapiHostMsg_Compositor_Create::ID: {
return scoped_ptr<ResourceHost>(
new PepperCompositorHost(host_, instance, params.pp_resource()));
}
case PpapiHostMsg_FileRef_CreateForFileAPI::ID: {
PP_Resource file_system;
std::string internal_path;
Expand Down
5 changes: 0 additions & 5 deletions content/renderer/pepper/gfx_conversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "ppapi/c/pp_size.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/rect_f.h"
#include "ui/gfx/size.h"

// Conversions for graphics types between our gfx library and PPAPI.
Expand All @@ -30,10 +29,6 @@ inline gfx::Rect PP_ToGfxRect(const PP_Rect& r) {
return gfx::Rect(r.point.x, r.point.y, r.size.width, r.size.height);
}

inline gfx::RectF PP_ToGfxRectF(const PP_FloatRect& r) {
return gfx::RectF(r.point.x, r.point.y, r.size.width, r.size.height);
}

inline PP_Rect PP_FromGfxRect(const gfx::Rect& r) {
return PP_MakeRectFromXYWH(r.x(), r.y(), r.width(), r.height());
}
Expand Down
Loading

0 comments on commit 20068a0

Please sign in to comment.