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

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

Issue 749333002: Plumbing for frame-specific WebWidgets (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: dcheng review comments Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/loader/EmptyClients.h » ('j') | Source/core/page/ChromeClient.h » ('J')
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 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 return; 1776 return;
1777 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "frame", m_frame.get()); 1777 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "frame", m_frame.get());
1778 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", "stack", InspectorCallStackEvent::currentCallStack()); 1778 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", "stack", InspectorCallStackEvent::currentCallStack());
1779 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing. 1779 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
1780 InspectorInstrumentation::didInvalidateLayout(m_frame.get()); 1780 InspectorInstrumentation::didInvalidateLayout(m_frame.get());
1781 1781
1782 if (m_hasPendingLayout) 1782 if (m_hasPendingLayout)
1783 return; 1783 return;
1784 m_hasPendingLayout = true; 1784 m_hasPendingLayout = true;
1785 1785
1786 page()->animator().scheduleVisualUpdate(); 1786 page()->animator().scheduleVisualUpdate(m_frame.get());
1787 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); 1787 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
1788 } 1788 }
1789 1789
1790 static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* de scendant) 1790 static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* de scendant)
1791 { 1791 {
1792 for (RenderObject* r = descendant; r; r = r->container()) { 1792 for (RenderObject* r = descendant; r; r = r->container()) {
1793 if (r == ancestor) 1793 if (r == ancestor)
1794 return true; 1794 return true;
1795 } 1795 }
1796 return false; 1796 return false;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1828 m_layoutSubtreeRoot->markContainingBlocksForLayout(false); 1828 m_layoutSubtreeRoot->markContainingBlocksForLayout(false);
1829 m_layoutSubtreeRoot = 0; 1829 m_layoutSubtreeRoot = 0;
1830 relayoutRoot->markContainingBlocksForLayout(false); 1830 relayoutRoot->markContainingBlocksForLayout(false);
1831 } 1831 }
1832 } 1832 }
1833 } else if (m_layoutSchedulingEnabled) { 1833 } else if (m_layoutSchedulingEnabled) {
1834 m_layoutSubtreeRoot = relayoutRoot; 1834 m_layoutSubtreeRoot = relayoutRoot;
1835 ASSERT(!m_layoutSubtreeRoot->container() || !m_layoutSubtreeRoot->contai ner()->needsLayout()); 1835 ASSERT(!m_layoutSubtreeRoot->container() || !m_layoutSubtreeRoot->contai ner()->needsLayout());
1836 m_hasPendingLayout = true; 1836 m_hasPendingLayout = true;
1837 1837
1838 page()->animator().scheduleVisualUpdate(); 1838 page()->animator().scheduleVisualUpdate(m_frame.get());
1839 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); 1839 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
1840 } 1840 }
1841 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "frame", m_frame.get()); 1841 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "frame", m_frame.get());
1842 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", "stack", InspectorCallStackEvent::currentCallStack()); 1842 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", "stack", InspectorCallStackEvent::currentCallStack());
1843 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing. 1843 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
1844 InspectorInstrumentation::didInvalidateLayout(m_frame.get()); 1844 InspectorInstrumentation::didInvalidateLayout(m_frame.get());
1845 } 1845 }
1846 1846
1847 bool FrameView::layoutPending() const 1847 bool FrameView::layoutPending() const
1848 { 1848 {
(...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
3963 return; 3963 return;
3964 3964
3965 ScrollableArea::setScrollOrigin(origin); 3965 ScrollableArea::setScrollOrigin(origin);
3966 3966
3967 // Update if the scroll origin changes, since our position will be different if the content size did not change. 3967 // Update if the scroll origin changes, since our position will be different if the content size did not change.
3968 if (updatePositionAtAll && updatePositionSynchronously) 3968 if (updatePositionAtAll && updatePositionSynchronously)
3969 updateScrollbars(scrollOffsetDouble()); 3969 updateScrollbars(scrollOffsetDouble());
3970 } 3970 }
3971 3971
3972 } // namespace blink 3972 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/EmptyClients.h » ('j') | Source/core/page/ChromeClient.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698