diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-25 10:53:28 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-25 10:53:28 -0800 |
| commit | 3f8c83a688eb0106be34c27124fa482ff383b635 (patch) | |
| tree | a40f4bd6a99aff01693986707b9a31aa1a9ebd8e /WebCore/plugins | |
| parent | f194ee8ea5e8e00930a6caddc3ef6f5031493c2b (diff) | |
| parent | 98c97471771055661f977820d2101e25b4a51b86 (diff) | |
| download | external_webkit-3f8c83a688eb0106be34c27124fa482ff383b635.zip external_webkit-3f8c83a688eb0106be34c27124fa482ff383b635.tar.gz external_webkit-3f8c83a688eb0106be34c27124fa482ff383b635.tar.bz2 | |
resolved conflicts for merge of 98c97471 to master
Diffstat (limited to 'WebCore/plugins')
| -rw-r--r-- | WebCore/plugins/android/PluginPackageAndroid.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/plugins/android/PluginPackageAndroid.cpp b/WebCore/plugins/android/PluginPackageAndroid.cpp index d55da87..ff672f4 100644 --- a/WebCore/plugins/android/PluginPackageAndroid.cpp +++ b/WebCore/plugins/android/PluginPackageAndroid.cpp @@ -33,8 +33,6 @@ #include "JNIUtility.h" #include "PlatformString.h" #include "PluginDatabase.h" -#include "PluginDebug.h" -#include "PluginDebugAndroid.h" #include "PluginMainThreadScheduler.h" #include "Timer.h" #include "npfunctions.h" @@ -42,7 +40,12 @@ #include <dlfcn.h> #include <errno.h> +// un-comment this to enable logging +//#define PLUGIN_DEBUG_LOCAL #define LOG_TAG "WebKit" +#include "NotImplemented.h" +#include "PluginDebug.h" +#include "PluginDebugAndroid.h" namespace WebCore { |