[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[jam at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit e1ac282d9ac1e5587144f7442d930507d9dae7c9
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 21:52:37 2011 +0000

    2011-01-13  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Tony Chang.
    
            [chromium]: Only swallow ctrl+c for windowless plugins if we know the plugin has a selection
            https://bugs.webkit.org/show_bug.cgi?id=52393
    
            * src/WebPluginContainerImpl.cpp:
            (WebKit::WebPluginContainerImpl::copy):
            (WebKit::WebPluginContainerImpl::handleKeyboardEvent):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75734 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 0531e1e..ba8b800 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-13  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium]: Only swallow ctrl+c for windowless plugins if we know the plugin has a selection
+        https://bugs.webkit.org/show_bug.cgi?id=52393
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::copy):
+        (WebKit::WebPluginContainerImpl::handleKeyboardEvent):
+
 2011-01-11  John Abd-El-Malek  <jam at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/chromium/src/WebPluginContainerImpl.cpp b/WebKit/chromium/src/WebPluginContainerImpl.cpp
index 90c7f65..5f62077 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -255,10 +255,10 @@ void WebPluginContainerImpl::printEnd()
 
 void WebPluginContainerImpl::copy()
 {
-    if (!plugin()->hasSelection())
+    if (!m_webPlugin->hasSelection())
         return;
 
-    webKitClient()->clipboard()->writeHTML(plugin()->selectionAsMarkup(), WebURL(), plugin()->selectionAsText(), false);
+    webKitClient()->clipboard()->writeHTML(m_webPlugin->selectionAsMarkup(), WebURL(), m_webPlugin->selectionAsText(), false);
 }
 
 WebElement WebPluginContainerImpl::element()
@@ -514,7 +514,11 @@ void WebPluginContainerImpl::handleKeyboardEvent(KeyboardEvent* event)
 #else
         if (webEvent.modifiers == WebInputEvent::ControlKey
 #endif
-            && webEvent.windowsKeyCode == VKEY_C) {
+            && webEvent.windowsKeyCode == VKEY_C
+            // Only copy if there's a selection, so that we only ever do this
+            // for Pepper plugins that support copying.  Windowless NPAPI
+            // plugins will get the event as before.
+            && m_webPlugin->hasSelection()) {
             copy();
             event->setDefaultHandled();
             return;

-- 
WebKit Debian packaging