Changeset 81518 in webkit


Ignore:
Timestamp:
Mar 18, 2011 3:20:02 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-03-18 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

REGRESSION(81374, 81384): editing/deleting/5206311-1.html hits assertion on non-Mac platforms
​https://bugs.webkit.org/show_bug.cgi?id=56599

Re-enabled the test on non-Mac platforms.

  • platform/chromium/test_expectations.txt:
  • platform/gtk/Skipped:
  • platform/qt/Skipped:
  • platform/win/Skipped:

2011-03-18 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Eric Seidel.

REGRESSION(81374, 81384): editing/deleting/5206311-1.html hits assertion on non-Mac platforms
​https://bugs.webkit.org/show_bug.cgi?id=56599

Debug build fix.

  • dom/Position.cpp: (WebCore::Position::parentAnchoredEquivalent): If the original position was a position before a node, then we can't necessarily instantiate a position inside the node.
  • editing/VisibleSelection.cpp: (WebCore::VisibleSelection::toNormalizedRange): Even if s and e were not null, container nodes of s and e could be null. Exit early in those cases as well.
Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r81514 r81518  
     12011-03-18  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        REGRESSION(81374, 81384): editing/deleting/5206311-1.html hits assertion on non-Mac platforms
     6        https://bugs.webkit.org/show_bug.cgi?id=56599
     7
     8        Re-enabled the test on non-Mac platforms.
     9
     10        * platform/chromium/test_expectations.txt:
     11        * platform/gtk/Skipped:
     12        * platform/qt/Skipped:
     13        * platform/win/Skipped:
     14
    1152011-03-18  Brady Eidson  <beidson@apple.com>
    216

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r81509 r81518  
    32683268BUGCR76552 DEBUG : fast/dom/HTMLScriptElement/dont-load-unknown-type.html = PASS TEXT
    32693269
    3270 // Assert failed started with WebKit r81384
    3271 BUGWK56599 DEBUG : editing/deleting/5206311-1.html = CRASH PASS
    3272 
    32733270// Flaky
    32743271BUGCR76609 MAC DEBUG : animations/play-state.html = CRASH

  • trunk/LayoutTests/platform/gtk/Skipped

    r81397 r81518  
    13391339svg/W3C-I18N/tspan-dirLTR-ubNone-in-rtl-context.svg
    13401340svg/W3C-I18N/tspan-dirLTR-ubOverride-in-rtl-context.svg
    1341 
    1342 # https://bugs.webkit.org/show_bug.cgi?id=56599
    1343 editing/deleting/5206311-1.html

  • trunk/LayoutTests/platform/qt/Skipped

    r81488 r81518  
    32353235http/tests/appcache/auth.html
    32363236http/tests/xmlhttprequest/basic-auth.html
    3237 
    3238 # REGRESSION(81374, 81384): editing/deleting/5206311-1.html hits assertion on non-Mac platforms
    3239 # https://bugs.webkit.org/show_bug.cgi?id=56599
    3240 editing/deleting/5206311-1.html

  • trunk/LayoutTests/platform/win/Skipped

    r81444 r81518  
    12101210compositing/transitions/scale-transition-no-start.html
    12111211compositing/transitions/singular-scale-transition.html
    1212 
    1213 # https://bugs.webkit.org/show_bug.cgi?id=56599
    1214 editing/deleting/5168598.html

  • trunk/Source/WebCore/ChangeLog

    r81517 r81518  
     12011-03-18  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        REGRESSION(81374, 81384): editing/deleting/5206311-1.html hits assertion on non-Mac platforms
     6        https://bugs.webkit.org/show_bug.cgi?id=56599
     7
     8        Debug build fix.
     9
     10        * dom/Position.cpp:
     11        (WebCore::Position::parentAnchoredEquivalent): If the original position was a position before a node,
     12        then we can't necessarily instantiate a position inside the node.
     13        * editing/VisibleSelection.cpp:
     14        (WebCore::VisibleSelection::toNormalizedRange): Even if s and e were not null, container nodes of s and e
     15        could be null. Exit early in those cases as well.
     16
    1172011-03-18  Adam Barth  <abarth@webkit.org>
    218

  • trunk/Source/WebCore/dom/Position.cpp

    r81374 r81518  
    167167        if (m_anchorNode->parentNode() && (editingIgnoresContent(m_anchorNode.get()) || isTableElement(m_anchorNode.get())))
    168168            return positionInParentBeforeNode(m_anchorNode.get());
    169         return firstPositionInNode(m_anchorNode.get());
     169        return firstPositionInOrBeforeNode(m_anchorNode.get());
    170170    }
    171171    if (!m_anchorNode->offsetInCharacters() && (m_anchorType == PositionIsAfterAnchor || static_cast<unsigned>(m_offset) == m_anchorNode->childNodeCount())

  • trunk/Source/WebCore/editing/VisibleSelection.cpp

    r81165 r81518  
    174174        e = e.parentAnchoredEquivalent();
    175175    }
    176    
    177     if (s.isNull() || e.isNull())
     176
     177    if (!s.containerNode() || !e.containerNode())
    178178        return 0;
    179179
Note: See TracChangeset for help on using the changeset viewer.