Changeset 54523 in webkit

Timestamp:

Feb 8, 2010 6:48:44 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-08 Kinuko Yasuda <​kinuko@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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/ClipboardChromium.cpp (modified) (1 diff)
• platform/chromium/PasteboardChromium.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-02-08  Kinuko Yasuda  <kinuko@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@apple.com>
 

trunk/WebCore/platform/chromium/ClipboardChromium.cpp

@@ -364 +364 @@
     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();
 

trunk/WebCore/platform/chromium/PasteboardChromium.cpp

@@ -83 +83 @@
 {
     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();
@@ -171 +168 @@
         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 =