Back out 155b9d4cb8cb (bug 1068474) for Marionette failures

This commit is contained in:
Phil Ringnalda 2014-12-21 18:54:23 -08:00
Родитель f30813f19f
Коммит 71d8445cfe
2 изменённых файлов: 0 добавлений и 32 удалений

Просмотреть файл

@ -239,16 +239,6 @@ SelectionCarets::HandleEvent(WidgetEvent* aEvent)
if (mDragMode == START_FRAME || mDragMode == END_FRAME) { if (mDragMode == START_FRAME || mDragMode == END_FRAME) {
if (mActiveTouchId == nowTouchId) { if (mActiveTouchId == nowTouchId) {
ptInRoot.y += mCaretCenterToDownPointOffsetY; ptInRoot.y += mCaretCenterToDownPointOffsetY;
if (mDragMode == START_FRAME) {
if (ptInRoot.y > mDragDownYBoundary) {
ptInRoot.y = mDragDownYBoundary;
}
} else if (mDragMode == END_FRAME) {
if (ptInRoot.y < mDragUpYBoundary) {
ptInRoot.y = mDragUpYBoundary;
}
}
return DragSelection(ptInRoot); return DragSelection(ptInRoot);
} }
@ -525,14 +515,6 @@ SelectionCarets::UpdateSelectionCarets()
SetEndFramePos(lastRectInCanvasFrame.BottomRight()); SetEndFramePos(lastRectInCanvasFrame.BottomRight());
SetVisibility(true); SetVisibility(true);
nsRect firstRectInRootFrame = firstRectInStartFrame;
nsRect lastRectInRootFrame = lastRectInEndFrame;
nsLayoutUtils::TransformRect(startFrame, rootFrame, firstRectInRootFrame);
nsLayoutUtils::TransformRect(endFrame, rootFrame, lastRectInRootFrame);
mDragUpYBoundary = firstRectInRootFrame.BottomLeft().y;
mDragDownYBoundary = lastRectInRootFrame.TopRight().y;
nsRect rectStart = GetStartFrameRect(); nsRect rectStart = GetStartFrameRect();
nsRect rectEnd = GetEndFrameRect(); nsRect rectEnd = GetEndFrameRect();
bool isTilt = rectStart.Intersects(rectEnd); bool isTilt = rectStart.Intersects(rectEnd);

Просмотреть файл

@ -241,20 +241,6 @@ private:
int32_t mActiveTouchId; int32_t mActiveTouchId;
nscoord mCaretCenterToDownPointOffsetY; nscoord mCaretCenterToDownPointOffsetY;
// The horizontal boundary is defined by the first selected frame which
// determines the star-tcaret position. When users drag the end-caert up,
// the touch input(pos.y) will be changed to not cross this boundary.
// Otherwise, the selection range changes to one character only
// which causes the bad user experience.
nscoord mDragUpYBoundary;
// The horizontal boundary is defined by the last selected frame which
// determines the end-caret position. When users drag the start-caert down,
// the touch input(pos.y) will be changed to not cross this boundary.
// Otherwise, the selection range changes to one character only
// which causes the bad user experience.
nscoord mDragDownYBoundary;
DragMode mDragMode; DragMode mDragMode;
// True if AsyncPanZoom is enabled // True if AsyncPanZoom is enabled