[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8668a9217ab6ea157d7b0ba1829e0e0beecffa60
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 07:42:39 2010 +0000

    2010-01-13  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Timothy Hatcher.
    
            Web Inspector: use hidden text area for clipboard in order to
            workaround windows setData bug.
    
            https://bugs.webkit.org/show_bug.cgi?id=33633
    
            * inspector/front-end/TextEditor.js:
            (WebInspector.TextEditor):
            (WebInspector.TextEditor.prototype._copy):
            * inspector/front-end/inspector.css:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1e921f9..8480112 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-13  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: use hidden text area for clipboard in order to
+        workaround windows setData bug.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33633
+
+        * inspector/front-end/TextEditor.js:
+        (WebInspector.TextEditor):
+        (WebInspector.TextEditor.prototype._copy):
+        * inspector/front-end/inspector.css:
+
 2010-01-13  Mads Ager  <ager at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/front-end/TextEditor.js b/WebCore/inspector/front-end/TextEditor.js
index c7b07bf..81055b7 100644
--- a/WebCore/inspector/front-end/TextEditor.js
+++ b/WebCore/inspector/front-end/TextEditor.js
@@ -49,6 +49,10 @@ WebInspector.TextEditor = function(platform)
     this._sheet.className = "text-editor-sheet";
     this._container.appendChild(this._sheet);
 
+    this._clipboard = document.createElement("textarea");
+    this._clipboard.className = "text-editor-clip";
+    this._container.appendChild(this._clipboard);
+
     var cursorElement = document.createElement("div");
     cursorElement.className = "text-editor-cursor";
     this._container.appendChild(cursorElement);
@@ -735,9 +739,8 @@ WebInspector.TextEditor.prototype = {
         var range = this._selection.range();
         var text = this._textModel.copyRange(range);
 
-        e.preventDefault();
-        e.clipboardData.clearData();
-        e.clipboardData.setData("Text", text);
+        this._clipboard.value = text;
+        this._clipboard.select();
     },
 
     _beforeCut: function(e)
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 151c6d3..18e52f3 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -3788,7 +3788,7 @@ ol.breakpoint-list {
     overflow: auto;
 }
 
-.text-editor-sheet {
+.text-editor-sheet, .text-editor-clip {
     opacity: 0;
 }
 

-- 
WebKit Debian packaging