diff options
| -rw-r--r-- | WebKit/android/plugins/ANPLogInterface.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/plugins/ANPWindowInterface.cpp | 24 | ||||
| -rw-r--r-- | WebKit/android/plugins/android_npapi.h | 19 |
3 files changed, 3 insertions, 44 deletions
diff --git a/WebKit/android/plugins/ANPLogInterface.cpp b/WebKit/android/plugins/ANPLogInterface.cpp index b7a931f..23a4ed6 100644 --- a/WebKit/android/plugins/ANPLogInterface.cpp +++ b/WebKit/android/plugins/ANPLogInterface.cpp @@ -23,13 +23,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#define LOG_TAG "plugin" +#define LOG_TAG "webkitPlugin" #include "utils/Log.h" #include "android_npapi.h" #include <stdarg.h> -static void anp_log(NPP inst, ANPLogType logType, const char format[], ...) { +static void anp_log(ANPLogType logType, const char format[], ...) { va_list args; va_start(args, format); diff --git a/WebKit/android/plugins/ANPWindowInterface.cpp b/WebKit/android/plugins/ANPWindowInterface.cpp index c634212..b35dfd3 100644 --- a/WebKit/android/plugins/ANPWindowInterface.cpp +++ b/WebKit/android/plugins/ANPWindowInterface.cpp @@ -30,27 +30,6 @@ #include "PluginView.h" #include "PluginWidgetAndroid.h" -static bool anp_lockRect(void* window, const ANPRectI* inval, - ANPBitmap* bitmap) { - if (window) { - // todo - return true; - } - return false; -} - -static bool anp_lockRegion(void* window, const ANPRegion* inval, - ANPBitmap* bitmap) { - if (window) { - // todo - return true; - } - return false; -} - -static void anp_unlock(void* window) { -} - static PluginView* pluginViewForInstance(NPP instance) { if (instance && instance->ndata) return static_cast<PluginView*>(instance->ndata); @@ -85,11 +64,8 @@ static void anp_requestFullScreen(NPP instance) { void ANPWindowInterfaceV0_Init(ANPInterface* value) { ANPWindowInterfaceV0* i = reinterpret_cast<ANPWindowInterfaceV0*>(value); - ASSIGN(i, lockRect); - ASSIGN(i, lockRegion); ASSIGN(i, setVisibleRects); ASSIGN(i, clearVisibleRects); ASSIGN(i, showKeyboard); - ASSIGN(i, unlock); ASSIGN(i, requestFullScreen); } diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h index 88c45f4..40a31fa 100644 --- a/WebKit/android/plugins/android_npapi.h +++ b/WebKit/android/plugins/android_npapi.h @@ -216,7 +216,7 @@ struct ANPLogInterfaceV0 : ANPInterface { /** dumps printf messages to the log file e.g. interface->log(instance, kWarning_ANPLogType, "value is %d", value); */ - void (*log)(NPP instance, ANPLogType, const char format[], ...); + void (*log)(ANPLogType, const char format[], ...); }; struct ANPBitmapInterfaceV0 : ANPInterface { @@ -622,23 +622,6 @@ struct ANPCanvasInterfaceV0 : ANPInterface { }; struct ANPWindowInterfaceV0 : ANPInterface { - /** Given the window field from the NPWindow struct, and an optional rect - describing the subset of the window that will be drawn to (may be null) - return true if the bitmap for that window can be accessed, and if so, - fill out the specified ANPBitmap to point to the window's pixels. - - When drawing is complete, call unlock(window) - */ - bool (*lockRect)(void* window, const ANPRectI* inval, ANPBitmap*); - /** The same as lockRect, but takes a region instead of a rect to specify - the area that will be changed/drawn. - */ - bool (*lockRegion)(void* window, const ANPRegion* inval, ANPBitmap*); - /** Given a successful call to lock(window, inval, &bitmap), call unlock - to release access to the pixels, and allow the browser to display the - results. If lock returned false, unlock should not be called. - */ - void (*unlock)(void* window); /** Registers a set of rectangles that the plugin would like to keep on screen. The rectangles are listed in order of priority with the highest priority rectangle in location rects[0]. The browser will attempt to keep |