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

[ap at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit de0cd6f0da3cc750d6d0719d5c0c1e7d11173ba5
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 19:48:53 2011 +0000

            Fixing a typo from a bad merge.
    
            * UIProcess/API/mac/WKView.mm: (-[WKView canChangeFrameLayout:]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75960 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 4df9261..c89369b 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,11 @@
 2011-01-17  Alexey Proskuryakov  <ap at apple.com>
 
+        Fixing a typo from a bad merge.
+
+        * UIProcess/API/mac/WKView.mm: (-[WKView canChangeFrameLayout:]):
+
+2011-01-17  Alexey Proskuryakov  <ap at apple.com>
+
         Reviewed by John Sullivan.
 
         https://bugs.webkit.org/show_bug.cgi?id=52590
diff --git a/Source/WebKit2/UIProcess/API/mac/WKView.mm b/Source/WebKit2/UIProcess/API/mac/WKView.mm
index cb362a8..f52645c 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKView.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKView.mm
@@ -1295,7 +1295,7 @@ static void extractUnderlines(NSAttributedString *string, Vector<CompositionUnde
 - (BOOL)canChangeFrameLayout:(WKFrameRef)frameRef
 {
     // PDF documents are already paginated, so we can't change them to add headers and footers.
-    return !toImpl(frameRef)->isMainFrame() || _data->_pdfViewController;
+    return !toImpl(frameRef)->isMainFrame() || !_data->_pdfViewController;
 }
 
 @end

-- 
WebKit Debian packaging