[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jhoneycutt at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 961695a25c1914396c47498d76525c5ba0a9bfe8
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 04:07:58 2010 +0000

    Allow some tests to pass in WebKitTestRunner before SharedMemory and
    PluginInfoStore are implemented on Windows.
    
    Reviewed by Sam Weinig.
    
    * Platform/win/SharedMemoryWin.cpp:
    Disable not implemented warnings.
    * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
    Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1d6fdf5..c341c51 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-16  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        Allow some tests to pass in WebKitTestRunner before SharedMemory and
+        PluginInfoStore are implemented on Windows.
+
+        Reviewed by Sam Weinig.
+
+        * Platform/win/SharedMemoryWin.cpp:
+        Disable not implemented warnings.
+        * UIProcess/Plugins/win/PluginInfoStoreWin.cpp:
+        Ditto.
+
 2010-08-16  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebKit2/Platform/win/SharedMemoryWin.cpp b/WebKit2/Platform/win/SharedMemoryWin.cpp
index 7b5cb6a..b9ccc4c 100644
--- a/WebKit2/Platform/win/SharedMemoryWin.cpp
+++ b/WebKit2/Platform/win/SharedMemoryWin.cpp
@@ -25,6 +25,7 @@
 
 #include "SharedMemory.h"
 
+#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
 #include "NotImplemented.h"
 
 namespace WebKit {
diff --git a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
index 852d76f..472bb9c 100644
--- a/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
+++ b/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
@@ -25,6 +25,7 @@
 
 #include "PluginInfoStore.h"
 
+#define DISABLE_NOT_IMPLEMENTED_WARNINGS 1
 #include "NotImplemented.h"
 #include <WebCore/FileSystem.h>
 #include <wtf/OwnArrayPtr.h>

-- 
WebKit Debian packaging