2011-03-10 Oleg Romashin <romaxa@gmail.com>

        Reviewed by Andreas Kling.

        Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part3
        Solving conflict of Qt and Xlib includes

        * Shared/Plugins/NPIdentifierData.cpp:
        * Shared/Plugins/NPIdentifierData.h:
        * Shared/Plugins/NPObjectProxy.cpp:
        * Shared/Plugins/NPVariantData.h:

git-svn-id: svn://svn.chromium.org/blink/trunk@80784 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit2/ChangeLog

+2011-03-10  Oleg Romashin  <romaxa@gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        Make Qt port compiling with ENABLE_PLUGIN_PROCESS=1, part3
+        Solving conflict of Qt and Xlib includes
+
+        * Shared/Plugins/NPIdentifierData.cpp:
+        * Shared/Plugins/NPIdentifierData.h:
+        * Shared/Plugins/NPObjectProxy.cpp:
+        * Shared/Plugins/NPVariantData.h:
+
 2011-03-10  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Mark Rowe.

third_party/WebKit/Source/WebKit2/Shared/Plugins/NPIdentifierData.h

@@ -28,7 +28,7 @@
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include <WebCore/npruntime.h>
+#include <WebCore/npruntime_internal.h>
 #include <wtf/text/CString.h>
 
 namespace CoreIPC {

third_party/WebKit/Source/WebKit2/Shared/Plugins/NPObjectProxy.h

@@ -28,7 +28,7 @@
 
 #if ENABLE(PLUGIN_PROCESS)
 
-#include <WebCore/npruntime.h>
+#include <WebCore/npruntime_internal.h>
 #include <wtf/Noncopyable.h>
 
 namespace WebKit {