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

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

Issue 1891453002: Don't try to render composited selection in throttled frame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 // layout. 1615 // layout.
1616 if (!m_nestedLayoutCount) { 1616 if (!m_nestedLayoutCount) {
1617 updateWidgetGeometries(); 1617 updateWidgetGeometries();
1618 if (LayoutView* layoutView = this->layoutView()) 1618 if (LayoutView* layoutView = this->layoutView())
1619 layoutView->layer()->setNeedsCompositingInputsUpdate(); 1619 layoutView->layer()->setNeedsCompositingInputsUpdate();
1620 } 1620 }
1621 } 1621 }
1622 1622
1623 bool FrameView::computeCompositedSelection(LocalFrame& frame, CompositedSelectio n& selection) 1623 bool FrameView::computeCompositedSelection(LocalFrame& frame, CompositedSelectio n& selection)
1624 { 1624 {
1625 if (frame.view()->shouldThrottleRendering())
1626 return false;
1627
1625 const VisibleSelection& visibleSelection = frame.selection().selection(); 1628 const VisibleSelection& visibleSelection = frame.selection().selection();
1626 if (!visibleSelection.isCaretOrRange()) 1629 if (!visibleSelection.isCaretOrRange())
1627 return false; 1630 return false;
1628 1631
1629 // Non-editable caret selections lack any kind of UI affordance, and 1632 // Non-editable caret selections lack any kind of UI affordance, and
1630 // needn't be tracked by the client. 1633 // needn't be tracked by the client.
1631 if (visibleSelection.isCaret() && !visibleSelection.isContentEditable()) 1634 if (visibleSelection.isCaret() && !visibleSelection.isContentEditable())
1632 return false; 1635 return false;
1633 1636
1634 VisiblePosition visibleStart(visibleSelection.visibleStart()); 1637 VisiblePosition visibleStart(visibleSelection.visibleStart());
(...skipping 2464 matching lines...) Expand 10 before | Expand all | Expand 10 after
4099 return m_hiddenForThrottling && m_crossOriginForThrottling; 4102 return m_hiddenForThrottling && m_crossOriginForThrottling;
4100 } 4103 }
4101 4104
4102 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4105 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4103 { 4106 {
4104 ASSERT(layoutView()); 4107 ASSERT(layoutView());
4105 return *layoutView(); 4108 return *layoutView();
4106 } 4109 }
4107 4110
4108 } // namespace blink 4111 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698