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

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

Issue 1123463002: Merge 194743 "Revert of Schedule cursor update when DOM updates ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2357/
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/events/mouse-cursor-change-after-layout-expected.txt ('k') | no next file » | 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 2061 matching lines...) Expand 10 before | Expand all | Expand 10 after
2072 if (m_isVisuallyNonEmpty && !m_frame->document()->didLayoutWithPendingSt ylesheets() && m_firstVisuallyNonEmptyLayoutCallbackPending) { 2072 if (m_isVisuallyNonEmpty && !m_frame->document()->didLayoutWithPendingSt ylesheets() && m_firstVisuallyNonEmptyLayoutCallbackPending) {
2073 m_firstVisuallyNonEmptyLayoutCallbackPending = false; 2073 m_firstVisuallyNonEmptyLayoutCallbackPending = false;
2074 // FIXME: This callback is probably not needed, but is currently use d 2074 // FIXME: This callback is probably not needed, but is currently use d
2075 // by android for setting the background color. 2075 // by android for setting the background color.
2076 m_frame->loader().client()->dispatchDidFirstVisuallyNonEmptyLayout() ; 2076 m_frame->loader().client()->dispatchDidFirstVisuallyNonEmptyLayout() ;
2077 } 2077 }
2078 } 2078 }
2079 2079
2080 FontFaceSet::didLayout(*m_frame->document()); 2080 FontFaceSet::didLayout(*m_frame->document());
2081 2081
2082 frame().eventHandler().scheduleCursorUpdate();
2083
2084 updateWidgetPositions(); 2082 updateWidgetPositions();
2085 2083
2086 // Plugins could have torn down the page inside updateWidgetPositions(). 2084 // Plugins could have torn down the page inside updateWidgetPositions().
2087 if (!layoutView()) 2085 if (!layoutView())
2088 return; 2086 return;
2089 2087
2090 scheduleUpdateWidgetsIfNecessary(); 2088 scheduleUpdateWidgetsIfNecessary();
2091 2089
2092 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) 2090 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( ))
2093 scrollingCoordinator->notifyLayoutUpdated(); 2091 scrollingCoordinator->notifyLayoutUpdated();
(...skipping 1997 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 { 4089 {
4092 Settings* settings = frame().settings(); 4090 Settings* settings = frame().settings();
4093 if (!settings || !settings->rootLayerScrolls()) 4091 if (!settings || !settings->rootLayerScrolls())
4094 return this; 4092 return this;
4095 4093
4096 LayoutView* layoutView = this->layoutView(); 4094 LayoutView* layoutView = this->layoutView();
4097 return layoutView ? layoutView->scrollableArea() : nullptr; 4095 return layoutView ? layoutView->scrollableArea() : nullptr;
4098 } 4096 }
4099 4097
4100 } // namespace blink 4098 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/events/mouse-cursor-change-after-layout-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698