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

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

Issue 474683003: Not for review - Rebase of crrev.com/62833003 Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . Created 6 years, 1 month 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 | « Source/core/events/EventTargetFactory.in ('k') | Source/core/loader/EmptyClients.h » ('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 2463 matching lines...) Expand 10 before | Expand all | Expand 10 after
2474 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Ti meline migrates to tracing. 2474 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Ti meline migrates to tracing.
2475 InspectorInstrumentation::willUpdateLayerTree(m_frame.get()); 2475 InspectorInstrumentation::willUpdateLayerTree(m_frame.get());
2476 2476
2477 view->compositor()->updateIfNeededRecursive(); 2477 view->compositor()->updateIfNeededRecursive();
2478 2478
2479 if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot()) 2479 if (view->compositor()->inCompositingMode() && m_frame->isLocalRoot())
2480 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang eIfNeeded(); 2480 m_frame->page()->scrollingCoordinator()->updateAfterCompositingChang eIfNeeded();
2481 2481
2482 updateCompositedSelectionBoundsIfNeeded(); 2482 updateCompositedSelectionBoundsIfNeeded();
2483 2483
2484 Element::updateBoundAnimatedPropertiesIfNeeded();
2485
2484 InspectorInstrumentation::didUpdateLayerTree(m_frame.get()); 2486 InspectorInstrumentation::didUpdateLayerTree(m_frame.get());
2485 } 2487 }
2486 2488
2487 scrollContentsIfNeededRecursive(); 2489 scrollContentsIfNeededRecursive();
2488 2490
2489 if (view) 2491 if (view)
2490 invalidateTreeIfNeededRecursive(); 2492 invalidateTreeIfNeededRecursive();
2491 2493
2492 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean); 2494 ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
2493 } 2495 }
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
4004 return; 4006 return;
4005 4007
4006 ScrollableArea::setScrollOrigin(origin); 4008 ScrollableArea::setScrollOrigin(origin);
4007 4009
4008 // Update if the scroll origin changes, since our position will be different if the content size did not change. 4010 // Update if the scroll origin changes, since our position will be different if the content size did not change.
4009 if (updatePositionAtAll && updatePositionSynchronously) 4011 if (updatePositionAtAll && updatePositionSynchronously)
4010 updateScrollbars(scrollOffsetDouble()); 4012 updateScrollbars(scrollOffsetDouble());
4011 } 4013 }
4012 4014
4013 } // namespace blink 4015 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/events/EventTargetFactory.in ('k') | Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698