Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | From dc1292fc8c2b9da900ebcac953120eaffd0d329e Mon Sep 17 00:00:00 2001 |
michael@0 | 2 | From: George Wright <gwright@mozilla.com> |
michael@0 | 3 | Date: Wed, 23 May 2012 14:52:36 -0400 |
michael@0 | 4 | Subject: [PATCH 10/10] Bug 755869 - [13] Re-apply bug 750733 - Use |
michael@0 | 5 | handles in API object hooks where possible |
michael@0 | 6 | r=mattwoodrow |
michael@0 | 7 | |
michael@0 | 8 | --- |
michael@0 | 9 | gfx/skia/src/xml/SkJS.cpp | 4 ++-- |
michael@0 | 10 | 1 files changed, 2 insertions(+), 2 deletions(-) |
michael@0 | 11 | |
michael@0 | 12 | diff --git a/gfx/skia/src/xml/SkJS.cpp b/gfx/skia/src/xml/SkJS.cpp |
michael@0 | 13 | index f2e7a83..b2717d7 100644 |
michael@0 | 14 | --- a/gfx/skia/src/xml/SkJS.cpp |
michael@0 | 15 | +++ b/gfx/skia/src/xml/SkJS.cpp |
michael@0 | 16 | @@ -74,7 +74,7 @@ extern "C" { |
michael@0 | 17 | #endif |
michael@0 | 18 | |
michael@0 | 19 | static bool |
michael@0 | 20 | -global_enumerate(JSContext *cx, JSObject *obj) |
michael@0 | 21 | +global_enumerate(JSContext *cx, JSHandleObject *obj) |
michael@0 | 22 | { |
michael@0 | 23 | #ifdef LAZY_STANDARD_CLASSES |
michael@0 | 24 | return JS_EnumerateStandardClasses(cx, obj); |
michael@0 | 25 | @@ -84,7 +84,7 @@ global_enumerate(JSContext *cx, JSObject *obj) |
michael@0 | 26 | } |
michael@0 | 27 | |
michael@0 | 28 | static bool |
michael@0 | 29 | -global_resolve(JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp) |
michael@0 | 30 | +global_resolve(JSContext *cx, JSHandleObject obj, JSHandleId id, unsigned flags, JSObject **objp) |
michael@0 | 31 | { |
michael@0 | 32 | #ifdef LAZY_STANDARD_CLASSES |
michael@0 | 33 | if ((flags & JSRESOLVE_ASSIGNING) == 0) { |
michael@0 | 34 | -- |
michael@0 | 35 | 1.7.5.4 |
michael@0 | 36 |