Changeset 49806 in webkit

Timestamp:

Oct 19, 2009 1:30:27 PM (15 years ago)

Author:

mitz@apple.com

Message:

Split assertions of conjunctions into separate statements or remove
redundant assertions.

Reviewed by Anders Carlsson.

• Plugins/Hosted/NetscapePluginHostProxy.mm:

(WebKit::NetscapePluginHostProxy::deadNameNotificationCallback):

• Plugins/Hosted/WebHostedNetscapePluginView.mm:

(-[WebHostedNetscapePluginView setAttributeKeys:andValues:]):
(-[WebHostedNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]):

• Plugins/WebBaseNetscapePluginView.mm:

(-[WebBaseNetscapePluginView halt]):
(-[WebBaseNetscapePluginView resumeFromHalt]):

• Plugins/WebNetscapePluginView.mm:

(-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
(-[WebNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]):

• WebCoreSupport/WebContextMenuClient.mm:

(WebContextMenuClient::getCustomMenuFromDefaultItems):

• WebCoreSupport/WebEditorClient.mm:

(WebEditorClient::checkGrammarOfString):
(WebEditorClient::checkTextOfParagraph):

• WebView/WebTextCompletionController.mm:

(-[WebTextCompletionController _reflectSelection]):

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Plugins/Hosted/NetscapePluginHostProxy.mm (modified) (1 diff)
• Plugins/Hosted/WebHostedNetscapePluginView.mm (modified) (2 diffs)
• Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)
• Plugins/WebNetscapePluginView.mm (modified) (2 diffs)
• WebCoreSupport/WebContextMenuClient.mm (modified) (1 diff)
• WebCoreSupport/WebEditorClient.mm (modified) (3 diffs)
• WebView/WebTextCompletionController.mm (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2009-10-19  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Anders Carlsson.
+
+        Split assertions of conjunctions into separate statements or remove
+        redundant assertions.
+
+        * Plugins/Hosted/NetscapePluginHostProxy.mm:
+        (WebKit::NetscapePluginHostProxy::deadNameNotificationCallback):
+        * Plugins/Hosted/WebHostedNetscapePluginView.mm:
+        (-[WebHostedNetscapePluginView setAttributeKeys:andValues:]):
+        (-[WebHostedNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]):
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView halt]):
+        (-[WebBaseNetscapePluginView resumeFromHalt]):
+        * Plugins/WebNetscapePluginView.mm:
+        (-[WebNetscapePluginView saveAndSetNewPortStateForUpdate:]):
+        (-[WebNetscapePluginView _webPluginContainerCancelCheckIfAllowedToLoadRequest:]):
+        * WebCoreSupport/WebContextMenuClient.mm:
+        (WebContextMenuClient::getCustomMenuFromDefaultItems):
+        * WebCoreSupport/WebEditorClient.mm:
+        (WebEditorClient::checkGrammarOfString):
+        (WebEditorClient::checkTextOfParagraph):
+        * WebView/WebTextCompletionController.mm:
+        (-[WebTextCompletionController _reflectSelection]):
+
 2009-10-18  Mark Rowe  <mrowe@apple.com>
 

trunk/WebKit/mac/Plugins/Hosted/NetscapePluginHostProxy.mm

@@ -188 +188 @@
 void NetscapePluginHostProxy::deadNameNotificationCallback(CFMachPortRef port, void *msg, CFIndex size, void *info)
 {
-    ASSERT(msg && static_cast<mach_msg_header_t*>(msg)->msgh_id == MACH_NOTIFY_DEAD_NAME);
+    ASSERT(msg);
+    ASSERT(static_cast<mach_msg_header_t*>(msg)->msgh_id == MACH_NOTIFY_DEAD_NAME);
     
     static_cast<NetscapePluginHostProxy*>(info)->pluginHostDied();

trunk/WebKit/mac/Plugins/Hosted/WebHostedNetscapePluginView.mm

@@ -91 +91 @@
 - (void)setAttributeKeys:(NSArray *)keys andValues:(NSArray *)values
 {
-    ASSERT(!_attributeKeys && !_attributeValues);
+    ASSERT(!_attributeKeys);
+    ASSERT(!_attributeValues);
     
     _attributeKeys.adoptNS([keys copy]);
@@ -422 +423 @@
     
     id contextInfo = [webPluginContainerCheck contextInfo];
-    ASSERT(contextInfo && [contextInfo isKindOfClass:[NSNumber class]]);
+    ASSERT([contextInfo isKindOfClass:[NSNumber class]]);
 
     if (!_proxy)

trunk/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -479 +479 @@
 - (void)halt
 {
-    ASSERT(!_isHalted && _isStarted);
+    ASSERT(!_isHalted);
+    ASSERT(_isStarted);
     Element *element = [self element];
 #if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD)
@@ -500 +501 @@
 - (void)resumeFromHalt
 {
-    ASSERT(_isHalted && !_isStarted);
+    ASSERT(_isHalted);
+    ASSERT(!_isStarted);
     [self start];
     

trunk/WebKit/mac/Plugins/WebNetscapePluginView.mm

@@ -403 +403 @@
                         getQDPixelFormatForBitmapContext(currentContext), &offscreenBounds, 0, 0, 0,
                         static_cast<char*>(offscreenData), CGBitmapContextGetBytesPerRow(currentContext));
-                    ASSERT(newOffscreenGWorld && !err);
+                    ASSERT(newOffscreenGWorld)
+                    ASSERT(!err);
                     if (!err) {
                         if (offscreenGWorld)
@@ -1287 +1288 @@
     ASSERT([webPluginContainerCheck isKindOfClass:[WebPluginContainerCheck class]]);
     WebPluginContainerCheck *check = (WebPluginContainerCheck *)webPluginContainerCheck;
-    ASSERT([check contextInfo] && [[check contextInfo] isKindOfClass:[WebNetscapeContainerCheckContextInfo class]]);
+    ASSERT([[check contextInfo] isKindOfClass:[WebNetscapeContainerCheckContextInfo class]]);
     
     [self cancelCheckIfAllowedToLoadURL:[[check contextInfo] checkRequestID]];

trunk/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm

@@ -271 +271 @@
 NSMutableArray* WebContextMenuClient::getCustomMenuFromDefaultItems(ContextMenu* defaultMenu)
 {
+    return defaultMenu->platformDescription();
     id delegate = [m_webView UIDelegate];
     SEL selector = @selector(webView:contextMenuItemsForElement:defaultMenuItems:);

trunk/WebKit/mac/WebCoreSupport/WebEditorClient.mm

@@ -676 +676 @@
         ASSERT(detailRangeAsNSValue);
         NSRange detailNSRange = [detailRangeAsNSValue rangeValue];
-        ASSERT(detailNSRange.location != NSNotFound && detailNSRange.length > 0);
+        ASSERT(detailNSRange.location != NSNotFound);
+        ASSERT(detailNSRange.length > 0);
         grammarDetail.location = detailNSRange.location;
         grammarDetail.length = detailNSRange.length;
@@ -697 +698 @@
         NSRange resultRange = [incomingResult range];
         NSTextCheckingType resultType = [incomingResult resultType];
-        ASSERT(resultRange.location != NSNotFound && resultRange.length > 0);
+        ASSERT(resultRange.location != NSNotFound);
+        ASSERT(resultRange.length > 0);
         if (NSTextCheckingTypeSpelling == resultType && 0 != (checkingTypes & NSTextCheckingTypeSpelling)) {
             TextCheckingResult result;
@@ -716 +718 @@
                 ASSERT(detailRangeAsNSValue);
                 NSRange detailNSRange = [detailRangeAsNSValue rangeValue];
-                ASSERT(detailNSRange.location != NSNotFound && detailNSRange.length > 0);
+                ASSERT(detailNSRange.location != NSNotFound);
+                ASSERT(detailNSRange.length > 0);
                 detail.location = detailNSRange.location;
                 detail.length = detailNSRange.length;

trunk/WebKit/mac/WebView/WebTextCompletionController.mm

@@ -299 +299 @@
 {
     int selectedRow = [_tableView selectedRow];
-    ASSERT(selectedRow >= 0 && selectedRow < (int)[_completions count]);
+    ASSERT(selectedRow >= 0);
+    ASSERT(selectedRow < (int)[_completions count]);
     [self _insertMatch:[_completions objectAtIndex:selectedRow]];
 }