[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a833b9d93b7189923ea15bdbb9edc75d7090de33
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 01:53:20 2010 +0000

    Fix a bug uncovered by clang++.
    
    * WebView/WebHTMLView.mm:
    (-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73667 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index b718f33..5f936a4 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-09  Anders Carlsson  <andersca at apple.com>
 
+        Fix a bug uncovered by clang++.
+
+        * WebView/WebHTMLView.mm:
+        (-[WebHTMLView _documentFragmentFromPasteboard:forType:inContext:subresources:]):
+
+2010-12-09  Anders Carlsson  <andersca at apple.com>
+
         Clang++ build fixes.
 
         Silence a couple of warnings.
diff --git a/WebKit/mac/WebView/WebHTMLView.mm b/WebKit/mac/WebView/WebHTMLView.mm
index aef8e3d..3e8be9a 100644
--- a/WebKit/mac/WebView/WebHTMLView.mm
+++ b/WebKit/mac/WebView/WebHTMLView.mm
@@ -2135,7 +2135,7 @@ static void _updateMouseoverTimerCallback(CFRunLoopTimerRef timer, void *info)
     // The _hasHTMLDocument clause here is a workaround for a bug in NSAttributedString: Radar 5052369.
     // If we call _documentFromRange on an XML document we'll get "setInnerHTML: method not found".
     // FIXME: Remove this once bug 5052369 is fixed.
-    if ([self _hasHTMLDocument] && pboardType == NSRTFPboardType || pboardType == NSRTFDPboardType) {
+    if ([self _hasHTMLDocument] && (pboardType == NSRTFPboardType || pboardType == NSRTFDPboardType)) {
         NSAttributedString *string = nil;
         if (pboardType == NSRTFDPboardType)
             string = [[NSAttributedString alloc] initWithRTFD:[pasteboard dataForType:NSRTFDPboardType] documentAttributes:NULL];

-- 
WebKit Debian packaging