Changeset 208255 in webkit


Ignore:
Timestamp:
Nov 1, 2016 3:58:49 PM (8 years ago)
Author:
matthew_hanson@apple.com
Message:

Roll out r208168 via r208173. rdar://problem/28962886

Location:
branches/safari-602-branch/Source
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-602-branch/Source/WebCore/ChangeLog

    r208245 r208255  
     12016-11-01  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Rollout r208173. rdar://problem/28962886
     4
    152016-11-01  Matthew Hanson  <matthew_hanson@apple.com>
    26

  • branches/safari-602-branch/Source/WebCore/editing/AlternativeTextController.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2006-2008, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 *
    … …  
    318318    if (AlternativeTextClient* client = alternativeTextClient())
    319319        client->recordAutocorrectionResponse(AutocorrectionReverted, corrected, correction);
    320 
    321     Ref<Frame> protector(m_frame);
    322320    m_frame.document()->updateLayout();
    323321    m_frame.selection().setSelection(selectionOfCorrected, FrameSelection::defaultSetSelectionOptions() | FrameSelection::SpellCorrectionTriggered);

  • branches/safari-602-branch/Source/WebCore/editing/Editor.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2006-2008, 2011, 2013-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2011, 2013-2015 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 *
    … …  
    17911791void Editor::setComposition(const String& text, const Vector<CompositionUnderline>& underlines, unsigned selectionStart, unsigned selectionEnd)
    17921792{
    1793     Ref<Frame> protection(m_frame);
    1794 
    17951793    UserTypingGestureIndicator typingGestureIndicator(m_frame);
    17961794
    … …  
    19261924void Editor::advanceToNextMisspelling(bool startBeforeSelection)
    19271925{
    1928     Ref<Frame> protection(m_frame);
    1929 
    19301926    // The basic approach is to search in two phases - from the selection end to the end of the doc, and
    19311927    // then we wrap and search from the doc start to (approximately) where we started.
    … …  
    22462242void Editor::markMisspellingsAfterTypingToWord(const VisiblePosition &wordStart, const VisibleSelection& selectionAfterTyping, bool doReplacement)
    22472243{
    2248     Ref<Frame> protection(m_frame);
    2249 
    22502244#if PLATFORM(IOS)
    22512245    UNUSED_PARAM(selectionAfterTyping);
    … …  
    24982492void Editor::markAndReplaceFor(PassRefPtr<SpellCheckRequest> request, const Vector<TextCheckingResult>& results)
    24992493{
    2500     Ref<Frame> protection(m_frame);
    25012494    ASSERT(request);
    25022495
    … …  
    29572950void Editor::changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions options)
    29582951{
    2959     Ref<Frame> protection(m_frame);
    2960 
    29612952    // If the new selection is orphaned, then don't update the selection.
    29622953    if (newSelection.start().isOrphan() || newSelection.end().isOrphan())
    … …  
    31493140bool Editor::findString(const String& target, FindOptions options)
    31503141{
    3151     Ref<Frame> protection(m_frame);
    3152 
    31533142    VisibleSelection selection = m_frame.selection().selection();
    31543143

  • branches/safari-602-branch/Source/WebCore/editing/EditorCommand.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2006-2008, 2014, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
    33 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    44 * Copyright (C) 2009 Igalia S.L.
    … …  
    10621062static bool executeSwapWithMark(Frame& frame, Event*, EditorCommandSource, const String&)
    10631063{
    1064     Ref<Frame> protector(frame);
    10651064    const VisibleSelection& mark = frame.editor().mark();
    10661065    const VisibleSelection& selection = frame.selection().selection();

  • branches/safari-602-branch/Source/WebCore/editing/TypingCommand.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2005-2008, 2016 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    476476{
    477477    Frame& frame = this->frame();
    478     Ref<Frame> protector(frame);
    479478
    480479    frame.editor().updateMarkersForWordsAffectedByEditing(false);
    … …  
    590589{
    591590    Frame& frame = this->frame();
    592     Ref<Frame> protector(frame);
    593591
    594592    frame.editor().updateMarkersForWordsAffectedByEditing(false);

  • branches/safari-602-branch/Source/WebCore/editing/mac/EditorMac.mm

    r208173 r208255  
    261261        return;
    262262
    263     Ref<Frame> protector(m_frame);
    264263    RefPtr<Range> range = Range::create(node->document(), Position(node, Position::PositionIsBeforeAnchor), Position(node, Position::PositionIsAfterAnchor));
    265264    m_frame.selection().setSelection(VisibleSelection(*range), FrameSelection::DoNotSetFocus);

  • branches/safari-602-branch/Source/WebCore/page/ContextMenuController.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2006-2007, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
    33 * Copyright (C) 2010 Igalia S.L
    44 *
    … …  
    224224        return;
    225225
    226     Ref<Frame> protector(*frame);
    227 
    228226    switch (action) {
    229227    case ContextMenuItemTagOpenLinkInNewWindow:

  • branches/safari-602-branch/Source/WebCore/page/DOMSelection.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2007, 2009, 2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
    33 * Copyright (C) 2012 Google Inc. All rights reserved.
    44 *
    … …  
    202202
    203203    // FIXME: Eliminate legacy editing positions
    204     Ref<Frame> protector(*m_frame);
    205204    m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
    206205}
    … …  
    218217    }
    219218
    220     Ref<Frame> protector(*m_frame);
    221219    m_frame->selection().moveTo(selection.end(), DOWNSTREAM);
    222220}
    … …  
    234232    }
    235233
    236     Ref<Frame> protector(*m_frame);
    237234    m_frame->selection().moveTo(selection.start(), DOWNSTREAM);
    238235}
    … …  
    259256
    260257    // FIXME: Eliminate legacy editing positions
    261     Ref<Frame> protector(*m_frame);
    262258    m_frame->selection().moveTo(createLegacyEditingPosition(baseNode, baseOffset), createLegacyEditingPosition(extentNode, extentOffset), DOWNSTREAM);
    263259}
    … …  
    276272
    277273    // FIXME: Eliminate legacy editing positions
    278     Ref<Frame> protector(*m_frame);
    279274    m_frame->selection().moveTo(createLegacyEditingPosition(node, offset), DOWNSTREAM);
    280275}
    … …  
    327322        return;
    328323
    329     Ref<Frame> protector(*m_frame);
    330324    m_frame->selection().modify(alter, direction, granularity);
    331325}
    … …  
    345339
    346340    // FIXME: Eliminate legacy editing positions
    347     Ref<Frame> protector(*m_frame);
    348341    m_frame->selection().setExtent(createLegacyEditingPosition(&node, offset), DOWNSTREAM);
    349342}
    … …  
    384377    if (!r)
    385378        return;
    386 
    387     Ref<Frame> protector(*m_frame);
    388379
    389380    FrameSelection& selection = m_frame->selection();
    … …  
    438429        return;
    439430
    440     Ref<Frame> protector(*m_frame);
    441431    selectedRange->deleteContents(ASSERT_NO_EXCEPTION);
    442432

  • branches/safari-602-branch/Source/WebCore/page/DragController.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2007, 2009-2010, 2013, 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2007, 2009, 2010, 2013, 2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    433433static bool setSelectionToDragCaret(Frame* frame, VisibleSelection& dragCaret, RefPtr<Range>& range, const IntPoint& point)
    434434{
    435     Ref<Frame> protector(*frame);
    436435    frame->selection().setSelection(dragCaret);
    437436    if (frame->selection().selection().isNone()) {
    … …  
    754753        return false;
    755754
    756     Ref<Frame> protector(src);
    757755    HitTestResult hitTestResult = src.eventHandler().hitTestResultAtPoint(dragOrigin, HitTestRequest::ReadOnly | HitTestRequest::Active);
    758756

  • branches/safari-602-branch/Source/WebCore/page/Frame.cpp

    r208173 r208255  
    604604    }
    605605
    606     Ref<Frame> protectedThis(*this);
    607 
    608606    if (action == PerformOverflowScroll && (deltaX || deltaY)) {
    609607        layer->scrollToOffset(layer->scrollOffset() + IntSize(deltaX, deltaY));

  • branches/safari-602-branch/Source/WebCore/page/TextIndicator.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2010, 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    7070        return nullptr;
    7171
    72     Ref<Frame> protector(*frame);
    73 
    7472#if PLATFORM(IOS)
    7573    frame->editor().setIgnoreCompositionSelectionChange(true);

  • branches/safari-602-branch/Source/WebKit2/ChangeLog

    r208173 r208255  
     12016-11-01  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Rollout r208173. rdar://problem/28962886
     4
    152016-10-31  Matthew Hanson  <matthew_hanson@apple.com>
    26

  • branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleRangeHandle.cpp

    r208173 r208255  
    11/*
    2  * Copyright (C) 2010, 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    114114        return nullptr;
    115115
    116     Ref<Frame> protector(*frame);
    117 
    118116    VisibleSelection oldSelection = frame->selection().selection();
    119117    frame->selection().setSelection(VisibleSelection(*m_range));

  • branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r208173 r208255  
    45834583    Frame& frame = m_page->focusController().focusedOrMainFrame();
    45844584
    4585     Ref<Frame> protector(frame);
    4586 
    45874585    if (replacementEditingRange.location != notFound) {
    45884586        RefPtr<Range> replacementRange = rangeFromEditingRange(frame, replacementEditingRange, static_cast<EditingRangeIsRelativeTo>(editingRangeIsRelativeTo));
    … …  
    47484746        return;
    47494747    }
    4750 
    4751     Ref<Frame> protector(*targetFrame);
    47524748
    47534749    if (replacementLength > 0) {

  • branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

    r208173 r208255  
    11/*
    2  * Copyright (C) 2010-2012, 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010, 2011, 2012, 2015 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    328328    Frame& frame = m_page->focusController().focusedOrMainFrame();
    329329
    330     Ref<Frame> protector(frame);
    331 
    332330    if (replacementEditingRange.location != notFound) {
    333331        RefPtr<Range> replacementRange = rangeFromEditingRange(frame, replacementEditingRange);
Note: See TracChangeset for help on using the changeset viewer.