summaryrefslogtreecommitdiffstats
path: root/WebKit/android/plugins
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2010-03-15 15:50:21 -0700
committerBart Sears <bsears@google.com>2010-03-15 15:50:21 -0700
commit1c7e1d1ea3bcd169a6323fe04dc9fdf8e78e035f (patch)
tree918b7e08fd5516f52b8cf45405dfb41929568dee /WebKit/android/plugins
parent7526b41a72d217ff4bb576fbc92a52bcf58d98dd (diff)
downloadexternal_webkit-1c7e1d1ea3bcd169a6323fe04dc9fdf8e78e035f.zip
external_webkit-1c7e1d1ea3bcd169a6323fe04dc9fdf8e78e035f.tar.gz
external_webkit-1c7e1d1ea3bcd169a6323fe04dc9fdf8e78e035f.tar.bz2
Putting Grace's change back in now that we have the new apk from Adobe.
Revert "Temporary revert the new android_npapi. Waiting for" This reverts commit 31ba9c5b345211c7c89d08a762c09582a3975738.
Diffstat (limited to 'WebKit/android/plugins')
-rw-r--r--WebKit/android/plugins/ANPWindowInterface.cpp2
-rw-r--r--WebKit/android/plugins/android_npapi.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/plugins/ANPWindowInterface.cpp b/WebKit/android/plugins/ANPWindowInterface.cpp
index 6f11a73..0a31ed3 100644
--- a/WebKit/android/plugins/ANPWindowInterface.cpp
+++ b/WebKit/android/plugins/ANPWindowInterface.cpp
@@ -85,5 +85,5 @@ void ANPWindowInterfaceV0_Init(ANPInterface* value) {
ASSIGN(i, showKeyboard);
ASSIGN(i, requestFullScreen);
ASSIGN(i, exitFullScreen);
-// ASSIGN(i, requestCenterFitZoom);
+ ASSIGN(i, requestCenterFitZoom);
}
diff --git a/WebKit/android/plugins/android_npapi.h b/WebKit/android/plugins/android_npapi.h
index 758a8fd..b4974f4 100644
--- a/WebKit/android/plugins/android_npapi.h
+++ b/WebKit/android/plugins/android_npapi.h
@@ -668,7 +668,7 @@ struct ANPWindowInterfaceV0 : ANPInterface {
void (*exitFullScreen)(NPP instance);
/** Called when a plugin wishes to be zoomed and centered in the current view.
*/
-// void (*requestCenterFitZoom)(NPP instance);
+ void (*requestCenterFitZoom)(NPP instance);
};
///////////////////////////////////////////////////////////////////////////////