Changeset 127495 in webkit


Ignore:
Timestamp:
Sep 4, 2012 1:30:09 PM (12 years ago)
Author:
dominik.rottsches@intel.com
Message:

ResourceErrorBase needs to identify timeouts
https://bugs.webkit.org/show_bug.cgi?id=95755

Reviewed by Alexey Proskuryakov.

Adding a property to check whether this ResourceError was raised due to a timeout.
This is preparatory work for bug 74802. In order to implement XHR2 timeout functionality,
I need to identify some layers up whether the original network problem has been a timeout.

No new tests, no change in behavior yet.

  • platform/network/ResourceErrorBase.cpp:

(WebCore::ResourceErrorBase::copy): Copying new member.
(WebCore::ResourceErrorBase::compare): Comparing new member.

  • platform/network/ResourceErrorBase.h:

(WebCore::ResourceErrorBase::setIsTimeout): New setter.
(WebCore::ResourceErrorBase::isTimeout): New getter.
(ResourceErrorBase),
(WebCore::ResourceErrorBase::ResourceErrorBase): Adding m_isTimeout member.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r127485 r127495  
     12012-09-04  Dominik Röttsches  <dominik.rottsches@intel.com>
     2
     3        ResourceErrorBase needs to identify timeouts
     4        https://bugs.webkit.org/show_bug.cgi?id=95755
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Adding a property to check whether this ResourceError was raised due to a timeout.
     9        This is preparatory work for bug 74802. In order to implement XHR2 timeout functionality,
     10        I need to identify some layers up whether the original network problem has been a timeout.
     11
     12        No new tests, no change in behavior yet.
     13
     14        * platform/network/ResourceErrorBase.cpp:
     15        (WebCore::ResourceErrorBase::copy): Copying new member.
     16        (WebCore::ResourceErrorBase::compare): Comparing new member.
     17        * platform/network/ResourceErrorBase.h:
     18        (WebCore::ResourceErrorBase::setIsTimeout): New setter.
     19        (WebCore::ResourceErrorBase::isTimeout): New getter.
     20        (ResourceErrorBase),
     21        (WebCore::ResourceErrorBase::ResourceErrorBase): Adding m_isTimeout member.
     22
    1232012-09-04  Tommy Widenflycht  <tommyw@google.com>
    224
  • trunk/Source/WebCore/platform/network/ResourceErrorBase.cpp

    r98316 r127495  
    4343    errorCopy.m_isNull = m_isNull;
    4444    errorCopy.m_isCancellation = m_isCancellation;
     45    errorCopy.m_isTimeout = m_isTimeout;
    4546    platformCopy(errorCopy);
    4647    return errorCopy;
     
    7576        return false;
    7677
     78    if (a.isTimeout() != b.isTimeout())
     79        return false;
     80
    7781    return platformCompare(a, b);
    7882}
  • trunk/Source/WebCore/platform/network/ResourceErrorBase.h

    r82137 r127495  
    5050    bool isCancellation() const { return m_isCancellation; }
    5151
     52    void setIsTimeout(bool isTimeout) { m_isTimeout = isTimeout; }
     53    bool isTimeout() const { return m_isTimeout; }
     54
    5255    static bool compare(const ResourceError&, const ResourceError&);
    5356
     
    5760        , m_isNull(true)
    5861        , m_isCancellation(false)
     62        , m_isTimeout(false)
    5963    {
    6064    }
     
    6771        , m_isNull(false)
    6872        , m_isCancellation(false)
     73        , m_isTimeout(false)
    6974    {
    7075    }
     
    8792    bool m_isNull;
    8893    bool m_isCancellation;
     94    bool m_isTimeout;
    8995};
    9096
Note: See TracChangeset for help on using the changeset viewer.