Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(903)

Unified Diff: scripts/slave/unittests/data/patch_path_filter/svn_patch1.patch

Issue 505153002: WebRTC: Remove android_apk recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/unittests/data/patch_path_filter/svn_patch1.patch
diff --git a/scripts/slave/unittests/data/patch_path_filter/svn_patch1.patch b/scripts/slave/unittests/data/patch_path_filter/svn_patch1.patch
deleted file mode 100644
index 9578c08bee4299bf64f80ee8aae7127f4b182978..0000000000000000000000000000000000000000
--- a/scripts/slave/unittests/data/patch_path_filter/svn_patch1.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Index: webkit/tools/pepper_test_plugin/plugin_object.cc
-===================================================================
---- webkit/tools/pepper_test_plugin/plugin_object.cc (revision 34298)
-+++ webkit/tools/pepper_test_plugin/plugin_object.cc (working copy)
-@@ -276,7 +276,7 @@
-
- SkBitmap bitmap;
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, window.width, window.height);
-- bitmap.setPixels(context.u.graphicsRgba.region);
-+ bitmap.setPixels(context.region);
-
- SkCanvas canvas(bitmap);
- DrawSampleBitmap(canvas, window.width, window.height);
-Index: third_party/npapi/bindings/npapi_extensions.h
-===================================================================
---- third_party/npapi/bindings/npapi_extensions.h (revision 34298)
-+++ third_party/npapi/bindings/npapi_extensions.h (working copy)
-@@ -203,24 +203,21 @@
-
- typedef struct _NPDeviceContext2D
- {
-- union {
-- struct {
-- void* region;
-- int32 stride;
-+ void* reserved;
-+ void* region;
-+ int32 stride;
-
-- /* The dirty region that the plugin has painted into the buffer. This
-- * will be initialized to the size of the plugin image in
-- * initializeRenderContextPtr. The plugin can change the values to only
-- * update portions of the image.
-- */
-- struct {
-- int32 left;
-- int32 top;
-- int32 right;
-- int32 bottom;
-- } dirty;
-- } graphicsRgba;
-- } u;
-+ /* The dirty region that the plugin has painted into the buffer. This
-+ * will be initialized to the size of the plugin image in
-+ * initializeContextPtr. The plugin can change the values to only
-+ * update portions of the image.
-+ */
-+ struct {
-+ int32 left;
-+ int32 top;
-+ int32 right;
-+ int32 bottom;
-+ } dirty;
- } NPDeviceContext2D;
-
- /* 3D -----------------------------------------------------------------------*/
-@@ -232,6 +229,7 @@
-
- typedef struct _NPDeviceContext3D
- {
-+ void* reserved;
- void* buffer;
- int32 bufferLength;
- } NPDeviceContext3D;
-Index: chrome/renderer/webplugin_delegate_pepper.cc
-===================================================================
---- chrome/renderer/webplugin_delegate_pepper.cc (revision 34298)
-+++ chrome/renderer/webplugin_delegate_pepper.cc (working copy)
-@@ -272,13 +272,13 @@
-
- // Save the canvas to the output context structure and save the
- // OpenPaintContext for future reference.
-- context->u.graphicsRgba.region = plugin_bitmap.getAddr32(0, 0);
-- context->u.graphicsRgba.stride = width * kBytesPerPixel;
-- context->u.graphicsRgba.dirty.left = 0;
-- context->u.graphicsRgba.dirty.top = 0;
-- context->u.graphicsRgba.dirty.right = width;
-- context->u.graphicsRgba.dirty.bottom = height;
-- open_paint_contexts_[context->u.graphicsRgba.region] =
-+ context->region = plugin_bitmap.getAddr32(0, 0);
-+ context->stride = width * kBytesPerPixel;
-+ context->dirty.left = 0;
-+ context->dirty.top = 0;
-+ context->dirty.right = width;
-+ context->dirty.bottom = height;
-+ open_paint_contexts_[context->region] =
- linked_ptr<OpenPaintContext>(paint_context.release());
- return NPERR_NO_ERROR;
- }
-@@ -304,7 +304,7 @@
- void* user_data) {
- // Get the bitmap data associated with the incoming context.
- OpenPaintContextMap::iterator found = open_paint_contexts_.find(
-- context->u.graphicsRgba.region);
-+ context->region);
- if (found == open_paint_contexts_.end())
- return NPERR_INVALID_PARAM; // TODO(brettw) call callback.
-
-@@ -316,14 +316,14 @@
- // updated by actually taking ownership of the buffer and not telling the
- // plugin we're done using it. This wat we can avoid the copy when the entire
- // canvas has been updated.
-- SkIRect src_rect = { context->u.graphicsRgba.dirty.left,
-- context->u.graphicsRgba.dirty.top,
-- context->u.graphicsRgba.dirty.right,
-- context->u.graphicsRgba.dirty.bottom };
-- SkRect dest_rect = { SkIntToScalar(context->u.graphicsRgba.dirty.left),
-- SkIntToScalar(context->u.graphicsRgba.dirty.top),
-- SkIntToScalar(context->u.graphicsRgba.dirty.right),
-- SkIntToScalar(context->u.graphicsRgba.dirty.bottom) };
-+ SkIRect src_rect = { context->dirty.left,
-+ context->dirty.top,
-+ context->dirty.right,
-+ context->dirty.bottom };
-+ SkRect dest_rect = { SkIntToScalar(context->dirty.left),
-+ SkIntToScalar(context->dirty.top),
-+ SkIntToScalar(context->dirty.right),
-+ SkIntToScalar(context->dirty.bottom) };
- SkCanvas committed_canvas(committed_bitmap_);
-
- // We want to replace the contents of the bitmap rather than blend.
-@@ -350,7 +350,7 @@
- NPError WebPluginDelegatePepper::Device2DDestroyContext(
- NPDeviceContext2D* context) {
- OpenPaintContextMap::iterator found = open_paint_contexts_.find(
-- context->u.graphicsRgba.region);
-+ context->region);
- if (found == open_paint_contexts_.end())
- return NPERR_INVALID_PARAM;
-

Powered by Google App Engine
This is Rietveld 408576698