Changeset 192567 in webkit


Ignore:
Timestamp:
Nov 17, 2015 11:52:47 PM (8 years ago)
Author:
Carlos Garcia Campos
Message:

Null dereference loading Blink layout test editing/execCommand/indent-button-crash.html
​https://bugs.webkit.org/show_bug.cgi?id=151187

Reviewed by Darin Adler.

Source/WebCore:

This is a merge of Blink r174671:
​https://codereview.chromium.org/291143002

Fixes imported/blink/editing/execCommand/indent-button-crash.html.

  • editing/ApplyBlockElementCommand.cpp:

(WebCore::ApplyBlockElementCommand::doApply):

LayoutTests:

Unskip the test.

  • platform/gtk/TestExpectations:
  • platform/win/TestExpectations:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r192564 r192567  
     12015-11-17  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Null dereference loading Blink layout test editing/execCommand/indent-button-crash.html
     4        https://bugs.webkit.org/show_bug.cgi?id=151187
     5
     6        Reviewed by Darin Adler.
     7
     8        Unskip the test.
     9
     10        * platform/gtk/TestExpectations:
     11        * platform/win/TestExpectations:
     12
    1132015-11-17  Zalan Bujtas  <zalan@apple.com>
    214

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r192503 r192567  
    699699
    700700webkit.org/b/144771 editing/selection/selection-invalid-offset.html [ Crash ]
    701 
    702 webkit.org/b/151260 imported/blink/editing/execCommand/indent-button-crash.html [ Crash ]
    703701
    704702#////////////////////////////////////////////////////////////////////////////////////////

  • trunk/LayoutTests/platform/win/TestExpectations

    r192503 r192567  
    32333233imported/blink/compositing/iframes/ancestor-clipping-layer.html [ Skip ]
    32343234imported/blink/compositing/perspective-origin-overflow-hidden.html [ Skip ]
    3235 imported/blink/editing/execCommand/indent-button-crash.html [ Skip ]
    32363235imported/blink/http/tests/plugins/get-url-notify-on-removal.html [ Skip ]
    32373236imported/blink/plugins/empty-per-context-data.html [ Skip ]

  • trunk/Source/WebCore/ChangeLog

    r192566 r192567  
     12015-11-17  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        Null dereference loading Blink layout test editing/execCommand/indent-button-crash.html
     4        https://bugs.webkit.org/show_bug.cgi?id=151187
     5
     6        Reviewed by Darin Adler.
     7
     8        This is a merge of Blink r174671:
     9        https://codereview.chromium.org/291143002
     10
     11        Fixes imported/blink/editing/execCommand/indent-button-crash.html.
     12
     13        * editing/ApplyBlockElementCommand.cpp:
     14        (WebCore::ApplyBlockElementCommand::doApply):
     15
    1162015-11-17  Carlos Garcia Campos  <cgarcia@igalia.com>
    217

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

    r191647 r192567  
    7171    // margin/padding, but not others.  We should make the gap painting more consistent and
    7272    // then use a left margin/padding rule here.
    73     if (visibleEnd != visibleStart && isStartOfParagraph(visibleEnd))
    74         setEndingSelection(VisibleSelection(visibleStart, visibleEnd.previous(CannotCrossEditingBoundary), endingSelection().isDirectional()));
     73    if (visibleEnd != visibleStart && isStartOfParagraph(visibleEnd)) {
     74        VisibleSelection newSelection(visibleStart, visibleEnd.previous(CannotCrossEditingBoundary), endingSelection().isDirectional());
     75        if (newSelection.isNone())
     76            return;
     77        setEndingSelection(newSelection);
     78    }
    7579
    7680    VisibleSelection selection = selectionForParagraphIteration(endingSelection());
Note: See TracChangeset for help on using the changeset viewer.