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

[adachan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ae3cd3098c3b0cacc6b8989919e8d1478d9282c7
Author: adachan at apple.com <adachan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 21:22:59 2010 +0000

            Reviewed by Adam Roben.
    
            Add an IWebFramePrivate API to load string as plain text into the WebFrame.
            https://bugs.webkit.org/show_bug.cgi?id=45782
    
            * Interfaces/IWebFramePrivate.idl:
            * Interfaces/WebKit.idl: Touch the file.
            * WebFrame.cpp:
            (WebFrame::loadPlainTextString):
            * WebFrame.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67497 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 8c8e7a3..6f6a75d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14  Ada Chan  <adachan at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add an IWebFramePrivate API to load string as plain text into the WebFrame.
+        https://bugs.webkit.org/show_bug.cgi?id=45782
+
+        * Interfaces/IWebFramePrivate.idl:
+        * Interfaces/WebKit.idl: Touch the file.
+        * WebFrame.cpp:
+        (WebFrame::loadPlainTextString):
+        * WebFrame.h:
+
 2010-09-13  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/win/Interfaces/IWebFramePrivate.idl b/WebKit/win/Interfaces/IWebFramePrivate.idl
index bc9a4bd..499aa03 100644
--- a/WebKit/win/Interfaces/IWebFramePrivate.idl
+++ b/WebKit/win/Interfaces/IWebFramePrivate.idl
@@ -117,4 +117,6 @@ interface IWebFramePrivate : IUnknown
 
     HRESULT suspendAnimations();
     HRESULT resumeAnimations();
+
+    HRESULT loadPlainTextString([in] BSTR string, [in] BSTR url);
 }
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 98f5da8..d25cdfe 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -300,4 +300,3 @@ library WebKit
         [default] interface IWebUserContentURLPattern;
     }
 }
-
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 8653f03..d7f95e3 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -602,6 +602,17 @@ HRESULT STDMETHODCALLTYPE WebFrame::loadData(
     return S_OK;
 }
 
+HRESULT WebFrame::loadPlainTextString(
+    /* [in] */ BSTR string,
+    /* [in] */ BSTR url)
+{
+    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<char*>(string), sizeof(UChar) * SysStringLen(string));
+    BString plainTextMimeType(TEXT("text/plain"), 10);
+    BString utf16Encoding(TEXT("utf-16"), 6);
+    loadData(sharedBuffer.release(), plainTextMimeType, utf16Encoding, url, 0);
+    return S_OK;
+}
+
 void WebFrame::loadHTMLString(BSTR string, BSTR baseURL, BSTR unreachableURL)
 {
     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<char*>(string), sizeof(UChar) * SysStringLen(string));
diff --git a/WebKit/win/WebFrame.h b/WebKit/win/WebFrame.h
index e09925f..21c3027 100644
--- a/WebKit/win/WebFrame.h
+++ b/WebKit/win/WebFrame.h
@@ -260,6 +260,7 @@ public:
     virtual HRESULT STDMETHODCALLTYPE numberOfActiveAnimations(UINT*);
     virtual HRESULT STDMETHODCALLTYPE suspendAnimations();
     virtual HRESULT STDMETHODCALLTYPE resumeAnimations();
+    virtual HRESULT STDMETHODCALLTYPE loadPlainTextString(BSTR string, BSTR url);
 
     virtual HRESULT STDMETHODCALLTYPE isDisplayingStandaloneImage(BOOL*);
 

-- 
WebKit Debian packaging