[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 68b1fe4b2425c4636b93709fc7cc3cee295a2184
Author: jam at chromium.org <jam at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 01:31:35 2011 +0000

    2011-01-13  John Abd-El-Malek  <jam at chromium.org>
    
            Reviewed by Mihai Parparita.
    
            [chromium] Fix minor type in plugin printing
            https://bugs.webkit.org/show_bug.cgi?id=52410
    
            * src/WebFrameImpl.cpp:
            (WebKit::WebFrameImpl::printBegin):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75759 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 189b59b..8267e7c 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-13  John Abd-El-Malek  <jam at chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        [chromium] Fix minor type in plugin printing
+        https://bugs.webkit.org/show_bug.cgi?id=52410
+
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::printBegin):
+
 2011-01-13  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit/chromium/src/WebFrameImpl.cpp b/WebKit/chromium/src/WebFrameImpl.cpp
index 18e6d4c..0d0c401 100644
--- a/WebKit/chromium/src/WebFrameImpl.cpp
+++ b/WebKit/chromium/src/WebFrameImpl.cpp
@@ -1287,7 +1287,7 @@ int WebFrameImpl::printBegin(const WebSize& pageSize,
     } else {
         // We only support printing plugin nodes for now.
         const Node* coreNode = constrainToNode.constUnwrap<Node>();
-        if (coreNode->hasTagName(HTMLNames::objectTag) && coreNode->hasTagName(HTMLNames::embedTag)) {
+        if (coreNode->hasTagName(HTMLNames::objectTag) || coreNode->hasTagName(HTMLNames::embedTag)) {
             RenderObject* object = coreNode->renderer();
             if (object && object->isWidget()) {
                 Widget* widget = toRenderWidget(object)->widget();

-- 
WebKit Debian packaging