Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / Source / WebKit2 / Shared / Plugins / NPObjectProxy.cpp

diff --git a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
index e7fc47f..04a6e7d 100644 (file)
--- a/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
+++ b/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp
@@ -23,10 +23,11 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if ENABLE(PLUGIN_PROCESS)
-
+#include "config.h"
 #include "NPObjectProxy.h"
 
+#if ENABLE(PLUGIN_PROCESS)
+
 #include "ArgumentCoders.h"
 #include "Connection.h"
 #include "NPIdentifierData.h"