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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 07fed8dd3a280607b12b06a7579f503f54951c53
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 06:17:04 2010 +0000

    2010-10-11  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Attempt to fix windows build failure.
    
            Remove WebIconFetcher from WebKit and IconFetcher from WebCore
            https://bugs.webkit.org/show_bug.cgi?id=47523
    
            * Interfaces/IWebFramePrivate.idl: s/unused1/unused2/
            * Interfaces/WebKit.idl: Touched.
            * WebFrame.cpp: s/unused1/unused2/
            (WebFrame::unused2):
            * WebFrame.h: s/unused1/unused2/
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69561 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index ffb2b4e..f1a33d6 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-11  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Attempt to fix windows build failure.
+
+        Remove WebIconFetcher from WebKit and IconFetcher from WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=47523
+
+        * Interfaces/IWebFramePrivate.idl: s/unused1/unused2/
+        * Interfaces/WebKit.idl: Touched.
+        * WebFrame.cpp: s/unused1/unused2/
+        (WebFrame::unused2):
+        * WebFrame.h: s/unused1/unused2/
+
 2010-10-11  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index 5085dc7..190681c 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -79,7 +79,7 @@ interface IWebFramePrivate : IUnknown
 
     HRESULT pendingFrameUnloadEventCount([out, retval] UINT* result);
 
-    HRESULT unused1();
+    HRESULT unused2();
 
     HRESULT paintDocumentRectToContext([in] RECT rect, [in] OLE_HANDLE deviceContext);
 
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index b4ce410..470b052 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -300,3 +300,4 @@ library WebKit
         [default] interface IWebUserContentURLPattern;
     }
 }
+
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 13e6865..8dfe8bb 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -1014,7 +1014,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::pendingFrameUnloadEventCount(
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE WebFrame::unused1()
+HRESULT STDMETHODCALLTYPE WebFrame::unused2()
 {
     return E_NOTIMPL;
 }
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index 5c0ac5e..147daa8 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -187,7 +187,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE pendingFrameUnloadEventCount( 
         /* [retval][out] */ UINT* result);
 
-    virtual HRESULT STDMETHODCALLTYPE unused1();
+    virtual HRESULT STDMETHODCALLTYPE unused2();
     
     virtual HRESULT STDMETHODCALLTYPE setInPrintingMode( 
         /* [in] */ BOOL value,

-- 
WebKit Debian packaging