[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 9da3e6746750ade296f79cd45631fa9b64f477ec
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 01:49:06 2010 +0000

    Clang++ build fixes.
    
    Silence a couple of warnings.
    
    * WebView/WebFrame.mm:
    (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
    (-[WebFrame _stringByEvaluatingJavaScriptFromString:withGlobalObject:inScriptWorld:]):
    * WebView/WebTextCompletionController.mm:
    (-[WebTextCompletionController filterKeyDown:]):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 61c16fd..b718f33 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-09  Anders Carlsson  <andersca at apple.com>
+
+        Clang++ build fixes.
+
+        Silence a couple of warnings.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _stringByEvaluatingJavaScriptFromString:forceUserGesture:]):
+        (-[WebFrame _stringByEvaluatingJavaScriptFromString:withGlobalObject:inScriptWorld:]):
+        * WebView/WebTextCompletionController.mm:
+        (-[WebTextCompletionController filterKeyDown:]):
+
 2010-12-09  David Hyatt  <hyatt at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index d1d4953..b0f9bb9 100644
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -653,7 +653,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     // This bizarre set of rules matches behavior from WebKit for Safari 2.0.
     // If you don't like it, use -[WebScriptObject evaluateWebScript:] or 
     // JSEvaluateScript instead, since they have less surprising semantics.
-    if (!result || !result.isBoolean() && !result.isString() && !result.isNumber())
+    if (!result || (!result.isBoolean() && !result.isString() && !result.isNumber()))
         return @"";
 
     JSLock lock(SilenceAssertionsOnly);
@@ -1297,7 +1297,7 @@ static inline WebDataSource *dataSource(DocumentLoader* loader)
     // This bizarre set of rules matches behavior from WebKit for Safari 2.0.
     // If you don't like it, use -[WebScriptObject evaluateWebScript:] or 
     // JSEvaluateScript instead, since they have less surprising semantics.
-    if (!result || !result.isBoolean() && !result.isString() && !result.isNumber())
+    if (!result || (!result.isBoolean() && !result.isString() && !result.isNumber()))
         return @"";
 
     JSLock lock(SilenceAssertionsOnly);
diff --git a/WebKit/mac/WebView/WebTextCompletionController.mm b/WebKit/mac/WebView/WebTextCompletionController.mm
index ab0e621..82ad16c 100644
--- a/WebKit/mac/WebView/WebTextCompletionController.mm
+++ b/WebKit/mac/WebView/WebTextCompletionController.mm
@@ -285,7 +285,7 @@ using namespace std;
         [self endRevertingChange:YES moveLeft:NO];
         return YES;
     }
-    if (c == ' ' || c >= 0x21 && c <= 0x2F || c >= 0x3A && c <= 0x40 || c >= 0x5B && c <= 0x60 || c >= 0x7B && c <= 0x7D) {
+    if (c == ' ' || (c >= 0x21 && c <= 0x2F) || (c >= 0x3A && c <= 0x40) || (c >= 0x5B && c <= 0x60) || (c >= 0x7B && c <= 0x7D)) {
         // FIXME: Is the above list of keys really definitive?
         // Originally this code called ispunct; aren't there other punctuation keys on international keyboards?
         [self endRevertingChange:NO moveLeft:NO];

-- 
WebKit Debian packaging