Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(685)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2536723007: Removed android scrolling fake mouse moves and device_supports_mouse (Closed)
Patch Set: Made checks mirror what previous logic Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Dirk Mueller <mueller@kde.org> 5 * 2000 Dirk Mueller <mueller@kde.org>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com)
8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
9 * Copyright (C) 2009 Google Inc. All rights reserved. 9 * Copyright (C) 2009 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 } 1581 }
1582 } 1582 }
1583 1583
1584 IntPoint FrameView::lastKnownMousePosition() const { 1584 IntPoint FrameView::lastKnownMousePosition() const {
1585 return m_frame->eventHandler().lastKnownMousePosition(); 1585 return m_frame->eventHandler().lastKnownMousePosition();
1586 } 1586 }
1587 1587
1588 bool FrameView::shouldSetCursor() const { 1588 bool FrameView::shouldSetCursor() const {
1589 Page* page = frame().page(); 1589 Page* page = frame().page();
1590 return page && page->visibilityState() != PageVisibilityStateHidden && 1590 return page && page->visibilityState() != PageVisibilityStateHidden &&
1591 page->focusController().isActive() && 1591 !m_frame->eventHandler().isMousePositionUnknown() &&
1592 page->settings().deviceSupportsMouse(); 1592 page->focusController().isActive();
1593 } 1593 }
1594 1594
1595 void FrameView::scrollContentsIfNeededRecursive() { 1595 void FrameView::scrollContentsIfNeededRecursive() {
1596 forAllNonThrottledFrameViews( 1596 forAllNonThrottledFrameViews(
1597 [](FrameView& frameView) { frameView.scrollContentsIfNeeded(); }); 1597 [](FrameView& frameView) { frameView.scrollContentsIfNeeded(); });
1598 } 1598 }
1599 1599
1600 void FrameView::invalidateBackgroundAttachmentFixedObjects() { 1600 void FrameView::invalidateBackgroundAttachmentFixedObjects() {
1601 for (const auto& layoutObject : m_backgroundAttachmentFixedObjects) 1601 for (const auto& layoutObject : m_backgroundAttachmentFixedObjects)
1602 layoutObject->setShouldDoFullPaintInvalidation(); 1602 layoutObject->setShouldDoFullPaintInvalidation();
(...skipping 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after
3544 } 3544 }
3545 3545
3546 AXObjectCache* FrameView::axObjectCache() const { 3546 AXObjectCache* FrameView::axObjectCache() const {
3547 if (frame().document()) 3547 if (frame().document())
3548 return frame().document()->existingAXObjectCache(); 3548 return frame().document()->existingAXObjectCache();
3549 return nullptr; 3549 return nullptr;
3550 } 3550 }
3551 3551
3552 void FrameView::setCursor(const Cursor& cursor) { 3552 void FrameView::setCursor(const Cursor& cursor) {
3553 Page* page = frame().page(); 3553 Page* page = frame().page();
3554 if (!page || !page->settings().deviceSupportsMouse()) 3554 if (!page || m_frame->eventHandler().isMousePositionUnknown())
3555 return; 3555 return;
3556 page->chromeClient().setCursor(cursor, m_frame); 3556 page->chromeClient().setCursor(cursor, m_frame);
3557 } 3557 }
3558 3558
3559 void FrameView::frameRectsChanged() { 3559 void FrameView::frameRectsChanged() {
3560 TRACE_EVENT0("blink", "FrameView::frameRectsChanged"); 3560 TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
3561 if (layoutSizeFixedToFrameSize()) 3561 if (layoutSizeFixedToFrameSize())
3562 setLayoutSizeInternal(frameRect().size()); 3562 setLayoutSizeInternal(frameRect().size());
3563 3563
3564 setNeedsUpdateViewportIntersection(); 3564 setNeedsUpdateViewportIntersection();
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4645 DCHECK(m_frame->isMainFrame()); 4645 DCHECK(m_frame->isMainFrame());
4646 return m_initialViewportSize.width(); 4646 return m_initialViewportSize.width();
4647 } 4647 }
4648 4648
4649 int FrameView::initialViewportHeight() const { 4649 int FrameView::initialViewportHeight() const {
4650 DCHECK(m_frame->isMainFrame()); 4650 DCHECK(m_frame->isMainFrame());
4651 return m_initialViewportSize.height(); 4651 return m_initialViewportSize.height();
4652 } 4652 }
4653 4653
4654 } // namespace blink 4654 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698