Changeset 177502 in webkit
- Timestamp:
- Dec 18, 2014 10:23:18 AM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r177498 r177502 1 2014-12-18 Daniel Bates <dabates@apple.com> 2 3 Attempt to fix the iOS build after <http://trac.webkit.org/changeset/177486> 4 (https://bugs.webkit.org/show_bug.cgi?id=139755) 5 6 * WebProcess/WebPage/ios/WebPageIOS.mm: 7 (WebKit::WebPage::selectWithGesture): Wrap return value of Range::create() in RefPtr<Range>() 8 to make the the compiler happy since it wants clauses of the ternary operator to have the same data type 9 and Ref<Range> object does not support nullptr. 10 (WebKit::WebPage::selectWordBackward): Substitute Ref::ptr() for PassRefPtr::get(). 11 (WebKit::WebPage::moveSelectionByOffset): Ditto. 12 (WebKit::WebPage::selectPositionAtPoint): Ditto. 13 (WebKit::WebPage::selectPositionAtBoundaryWithDirection): Ditto. 14 (WebKit::WebPage::requestDictationContext): Ditto. 15 (WebKit::computeAutocorrectionContext): Ditto. 16 1 17 2014-12-18 Antti Koivisto <antti@apple.com> 2 18 -
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
r177246 r177502 890 890 case GestureRecognizerState::Began: 891 891 range = wordRangeFromPosition(position); 892 m_currentWordRange = range ? R ange::create(*frame.document(), range->startPosition(), range->endPosition()) : nullptr;892 m_currentWordRange = range ? RefPtr<Range>(Range::create(*frame.document(), range->startPosition(), range->endPosition())) : nullptr; 893 893 break; 894 894 case GestureRecognizerState::Changed: … … 1534 1534 VisiblePosition startPosition = positionOfNextBoundaryOfGranularity(position, WordGranularity, DirectionBackward); 1535 1535 if (startPosition.isNotNull() && startPosition != position) 1536 frame.selection().setSelectedRange(Range::create(*frame.document(), startPosition, position). get(), position.affinity(), true);1536 frame.selection().setSelectedRange(Range::create(*frame.document(), startPosition, position).ptr(), position.affinity(), true); 1537 1537 } 1538 1538 … … 1552 1552 } 1553 1553 if (position.isNotNull() && startPosition != position) 1554 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position). get(), position.affinity(), true);1554 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), position.affinity(), true); 1555 1555 send(Messages::WebPageProxy::VoidCallback(callbackID)); 1556 1556 } … … 1569 1569 1570 1570 if (position.isNotNull()) 1571 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position). get(), position.affinity(), true);1571 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), position.affinity(), true); 1572 1572 send(Messages::WebPageProxy::VoidCallback(callbackID)); 1573 1573 } … … 1581 1581 position = positionOfNextBoundaryOfGranularity(position, static_cast<WebCore::TextGranularity>(granularity), static_cast<SelectionDirection>(direction)); 1582 1582 if (position.isNotNull()) 1583 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position). get(), UPSTREAM, true);1583 frame.selection().setSelectedRange(Range::create(*frame.document(), position, position).ptr(), UPSTREAM, true); 1584 1584 } 1585 1585 send(Messages::WebPageProxy::VoidCallback(callbackID)); … … 1692 1692 } 1693 1693 if (lastPosition.isNotNull() && lastPosition != startPosition) 1694 contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), lastPosition, startPosition). get());1694 contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), lastPosition, startPosition).ptr()); 1695 1695 } 1696 1696 … … 1706 1706 } 1707 1707 if (lastPosition.isNotNull() && lastPosition != endPosition) 1708 contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, lastPosition). get());1708 contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, lastPosition).ptr()); 1709 1709 } 1710 1710 … … 1906 1906 if (previousPosition.isNull()) 1907 1907 break; 1908 String currentWord = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), previousPosition, currentPosition). get());1908 String currentWord = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), previousPosition, currentPosition).ptr()); 1909 1909 totalContextLength += currentWord.length(); 1910 1910 if (totalContextLength >= maxContextLength) … … 1913 1913 } 1914 1914 if (currentPosition.isNotNull() && currentPosition != startPosition) { 1915 contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), currentPosition, startPosition). get());1915 contextBefore = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), currentPosition, startPosition).ptr()); 1916 1916 if (atBoundaryOfGranularity(currentPosition, ParagraphGranularity, DirectionBackward)) 1917 1917 contextBefore = ASCIILiteral("\n ") + contextBefore; … … 1924 1924 nextPosition = positionOfNextBoundaryOfGranularity(endPosition, WordGranularity, DirectionForward); 1925 1925 if (nextPosition.isNotNull()) 1926 contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, nextPosition). get());1926 contextAfter = plainTextReplacingNoBreakSpace(Range::create(*frame.document(), endPosition, nextPosition).ptr()); 1927 1927 } 1928 1928 }
Note: See TracChangeset
for help on using the changeset viewer.