Remove format until plugins either need to know or ask to change it.
diff --git a/WebKit/android/plugins/PluginSurface.cpp b/WebKit/android/plugins/PluginSurface.cpp
index e57ecbc..aba0263 100644
--- a/WebKit/android/plugins/PluginSurface.cpp
+++ b/WebKit/android/plugins/PluginSurface.cpp
@@ -150,12 +150,13 @@
static void sendSurfaceEvent(PluginWidgetAndroid* widget,
ANPSurfaceAction action, int format = 0, int width = 0,
int height = 0) {
+ // format is currently not reported to the plugin. The plumbing from Java
+ // to C is still provided in case we add the format back to the event.
ANPEvent event;
SkANP::InitEvent(&event, kSurface_ANPEventType);
event.data.surface.action = action;
if (action == kChanged_ANPSurfaceAction) {
- event.data.surface.data.changed.format = format;
event.data.surface.data.changed.width = width;
event.data.surface.data.changed.height = height;
}
diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h
index 2d86b9c..cfea681 100644
--- a/WebKit/android/plugins/android_npapi.h
+++ b/WebKit/android/plugins/android_npapi.h
@@ -765,7 +765,7 @@
lock/unlock before this action will fail.
*/
kCreated_ANPSurfaceAction = 0,
- /** The surface has changed format or dimensions.
+ /** The surface's dimension has changed.
*/
kChanged_ANPSurfaceAction = 1,
/** The surface has been destroyed. This happens when the view system has
@@ -829,7 +829,6 @@
this struct is undefined.
*/
struct {
- int32_t format;
int32_t width;
int32_t height;
} changed;
