From 5e880f6bfac2c8ee4c42f1ea8f4b192330ab498c Mon Sep 17 00:00:00 2001 From: daboe01 Date: Fri, 3 Jul 2015 17:26:20 +0200 Subject: [PATCH] Revert "_textContainer refac preparation" This reverts commit 80cf88dcc149ff8bce70652539921888d0d4a53a. --- AppKit/CPTextView/CPLayoutManager.j | 4 ++-- AppKit/CPTextView/CPTextView.j | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AppKit/CPTextView/CPLayoutManager.j b/AppKit/CPTextView/CPLayoutManager.j index 540dcde24..cb4f7f0ca 100644 --- a/AppKit/CPTextView/CPLayoutManager.j +++ b/AppKit/CPTextView/CPLayoutManager.j @@ -652,7 +652,7 @@ _oncontextmenuhandler = function () { return false; }; return nil; } -- (id)_firstLineFragmentForLineFromLocation:(unsigned)location inTextContainer:(CPTextContainer)aContainer +- (id)_firstLineFragmentForLineFromLocation:(unsigned)location { var l = _lineFragments.length; @@ -673,7 +673,7 @@ _oncontextmenuhandler = function () { return false; }; return nil; } -- (id)_lastLineFragmentForLineFromLocation:(unsigned)location inTextContainer:(CPTextContainer)aContainer +- (id)_lastLineFragmentForLineFromLocation:(unsigned)location { var l = _lineFragments.length; diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j index 9cb275de4..887b9b7aa 100644 --- a/AppKit/CPTextView/CPTextView.j +++ b/AppKit/CPTextView/CPTextView.j @@ -1208,7 +1208,7 @@ var kDelegateRespondsTo_textShouldBeginEditing var nglyphs = [_layoutManager numberOfCharacters], loc = nglyphs == _selectionRange.location ? MAX(0, _selectionRange.location - 1) : _selectionRange.location; - fragment = [_layoutManager _firstLineFragmentForLineFromLocation:loc inTextContainer:_textContainer]; + fragment = [_layoutManager _firstLineFragmentForLineFromLocation:loc]; if (fragment) [self _establishSelection:CPMakeRange(fragment._range.location, 0) byExtending:flag]; @@ -1229,7 +1229,7 @@ var kDelegateRespondsTo_textShouldBeginEditing if (![self isSelectable]) return; - var fragment = [_layoutManager _lastLineFragmentForLineFromLocation:_selectionRange.location inTextContainer:_textContainer]; + var fragment = [_layoutManager _lastLineFragmentForLineFromLocation:_selectionRange.location]; if (!fragment) return;