[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 97f49c8ec0658ddbdaff4956f3506df4df32d7c7
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 02:48:44 2010 +0000

    2010-02-08  Kinuko Yasuda  <kinuko at chromium.org>
    
            Reviewed by David Levin.
    
            Remove special utf-8 tag from Chromium cilpboard code because
            we now have the corresponding code in generic clipboard framework
            code in chromium (since it's needed by other places than in Web
            page rendering) and no longer need the separate workaround code in
            WebKit.
            https://bugs.webkit.org/show_bug.cgi?id=34567
    
            Test: (for regression) editing/pasteboard
    
            * platform/chromium/ClipboardChromium.cpp:
            (WebCore::ClipboardChromium::writeRange):
            * platform/chromium/PasteboardChromium.cpp:
            (WebCore::Pasteboard::writeSelection):
            (WebCore::Pasteboard::documentFragment):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54523 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a89951e..3b236e4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-02-08  Kinuko Yasuda  <kinuko at chromium.org>
+
+        Reviewed by David Levin.
+
+        Remove special utf-8 tag from Chromium cilpboard code because
+        we now have the corresponding code in generic clipboard framework
+        code in chromium (since it's needed by other places than in Web
+        page rendering) and no longer need the separate workaround code in
+        WebKit.
+        https://bugs.webkit.org/show_bug.cgi?id=34567
+
+        Test: (for regression) editing/pasteboard
+
+        * platform/chromium/ClipboardChromium.cpp:
+        (WebCore::ClipboardChromium::writeRange):
+        * platform/chromium/PasteboardChromium.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::documentFragment):
+
 2010-02-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/chromium/ClipboardChromium.cpp b/WebCore/platform/chromium/ClipboardChromium.cpp
index becf169..933d839 100644
--- a/WebCore/platform/chromium/ClipboardChromium.cpp
+++ b/WebCore/platform/chromium/ClipboardChromium.cpp
@@ -363,9 +363,6 @@ void ClipboardChromium::writeRange(Range* selectedRange, Frame* frame)
 
     m_dataObject->textHtml = createMarkup(selectedRange, 0,
         AnnotateForInterchange);
-#if OS(DARWIN)
-    m_dataObject->textHtml = String("<meta charset='utf-8' id='webkit-interchange-charset'>") + m_dataObject->textHtml;
-#endif
     m_dataObject->htmlBaseUrl = frame->document()->url();
 
     String str = frame->selectedText();
diff --git a/WebCore/platform/chromium/PasteboardChromium.cpp b/WebCore/platform/chromium/PasteboardChromium.cpp
index 3b3aea6..d4f9a27 100644
--- a/WebCore/platform/chromium/PasteboardChromium.cpp
+++ b/WebCore/platform/chromium/PasteboardChromium.cpp
@@ -82,9 +82,6 @@ void Pasteboard::setSelectionMode(bool selectionMode)
 void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete, Frame* frame)
 {
     String html = createMarkup(selectedRange, 0, AnnotateForInterchange);
-#if OS(DARWIN)
-    html = String("<meta charset='utf-8' id='webkit-interchange-charset'>") + html;
-#endif
     ExceptionCode ec = 0;
     KURL url = selectedRange->startContainer(ec)->document()->url();
     String plainText = frame->selectedText();
@@ -170,11 +167,6 @@ PassRefPtr<DocumentFragment> Pasteboard::documentFragment(Frame* frame, PassRefP
         String markup;
         KURL srcURL;
         ChromiumBridge::clipboardReadHTML(buffer, &markup, &srcURL);
-#if OS(DARWIN)
-        DEFINE_STATIC_LOCAL(const String, forceUtf8String, ("<meta charset='utf-8' id='webkit-interchange-charset'>"));
-        if (markup.startsWith(forceUtf8String))
-            markup = markup.substring(forceUtf8String.length());
-#endif
 
         RefPtr<DocumentFragment> fragment =
             createFragmentFromMarkup(frame->document(), markup, srcURL, FragmentScriptingNotAllowed);

-- 
WebKit Debian packaging