[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[sullivan at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 82a2a6517aec01b9b06dc860793a742de1312cb2
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 8 16:55:36 2009 +0000

    Split two-clause assertions into two separate assertions.
    
    Reviewed by Dan Bernstein
    
    * DOMHTMLClasses.cpp:
    (DOMHTMLInputElement::isTextField):
    Split a two-clause assertion into two separate assertions.
    (DOMHTMLInputElement::rectOnScreen):
    Added the two assertions here that all other functions in this group shared.
    (DOMHTMLInputElement::selectedRange):
    Split a two-clause assertion into two separate assertions.
    (DOMHTMLInputElement::setAutofilled):
    Split a two-clause assertion into two separate assertions.
    (DOMHTMLInputElement::isAutofilled):
    Split a two-clause assertion into two separate assertions.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index cbdc811..531ca00 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-08  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Dan Bernstein
+
+        Split two-clause assertions into two separate assertions.
+
+        * DOMHTMLClasses.cpp:
+        (DOMHTMLInputElement::isTextField):
+        Split a two-clause assertion into two separate assertions.
+        (DOMHTMLInputElement::rectOnScreen):
+        Added the two assertions here that all other functions in this group shared.
+        (DOMHTMLInputElement::selectedRange):
+        Split a two-clause assertion into two separate assertions.
+        (DOMHTMLInputElement::setAutofilled):
+        Split a two-clause assertion into two separate assertions.
+        (DOMHTMLInputElement::isAutofilled):
+        Split a two-clause assertion into two separate assertions.
+
 2009-12-08  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Rubber-stamped by Maciej Stachowiak.
diff --git a/WebKit/win/DOMHTMLClasses.cpp b/WebKit/win/DOMHTMLClasses.cpp
index 2adaaa7..4889ba9 100644
--- a/WebKit/win/DOMHTMLClasses.cpp
+++ b/WebKit/win/DOMHTMLClasses.cpp
@@ -1291,7 +1291,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectionEnd(
 HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isTextField(
     /* [retval][out] */ BOOL* result)
 {
-    ASSERT(m_element && m_element->hasTagName(inputTag));
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(inputTag));
     HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
     *result = inputElement->isTextField() ? TRUE : FALSE;
     return S_OK;
@@ -1300,6 +1301,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isTextField(
 HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::rectOnScreen( 
     /* [retval][out] */ LPRECT rect)
 {
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(inputTag));
     rect->left = rect->top = rect->right = rect->bottom = 0;
     RenderObject* renderer = m_element->renderer();
     FrameView* view = m_element->document()->view();
@@ -1341,7 +1344,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectedRange(
     /* [out] */ int* start,
     /* [out] */ int* end)
 {
-    ASSERT(m_element && m_element->hasTagName(inputTag));
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(inputTag));
     HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
     *start = inputElement->selectionStart();
     *end = inputElement->selectionEnd();
@@ -1351,7 +1355,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::selectedRange(
 HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAutofilled( 
     /* [in] */ BOOL filled)
 {
-    ASSERT(m_element && m_element->hasTagName(inputTag));
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(inputTag));
     HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
     inputElement->setAutofilled(!!filled);
     return S_OK;
@@ -1360,7 +1365,8 @@ HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::setAutofilled(
 HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::isAutofilled(
     /* [retval][out] */ BOOL* result)
 {
-    ASSERT(m_element && m_element->hasTagName(inputTag));
+    ASSERT(m_element);
+    ASSERT(m_element->hasTagName(inputTag));
     HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
     *result = inputElement->isAutofilled() ? TRUE : FALSE;
     return S_OK;

-- 
WebKit Debian packaging