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

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: Rebase 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') | 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 1764 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 if (!m_frame->document()->shouldScheduleLayout()) 1775 if (!m_frame->document()->shouldScheduleLayout())
1776 return; 1776 return;
1777 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "data", InspectorInvalidateLayoutEvent::data(m_frame.get())); 1777 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "data", InspectorInvalidateLayoutEvent::data(m_frame.get()));
1778 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing. 1778 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
1779 InspectorInstrumentation::didInvalidateLayout(m_frame.get()); 1779 InspectorInstrumentation::didInvalidateLayout(m_frame.get());
1780 1780
1781 if (m_hasPendingLayout) 1781 if (m_hasPendingLayout)
1782 return; 1782 return;
1783 m_hasPendingLayout = true; 1783 m_hasPendingLayout = true;
1784 1784
1785 page()->animator().scheduleVisualUpdate(); 1785 page()->animator().scheduleVisualUpdate(m_frame.get());
1786 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); 1786 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
1787 } 1787 }
1788 1788
1789 static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* de scendant) 1789 static bool isObjectAncestorContainerOf(RenderObject* ancestor, RenderObject* de scendant)
1790 { 1790 {
1791 for (RenderObject* r = descendant; r; r = r->container()) { 1791 for (RenderObject* r = descendant; r; r = r->container()) {
1792 if (r == ancestor) 1792 if (r == ancestor)
1793 return true; 1793 return true;
1794 } 1794 }
1795 return false; 1795 return false;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 m_layoutSubtreeRoot->markContainingBlocksForLayout(false); 1827 m_layoutSubtreeRoot->markContainingBlocksForLayout(false);
1828 m_layoutSubtreeRoot = 0; 1828 m_layoutSubtreeRoot = 0;
1829 relayoutRoot->markContainingBlocksForLayout(false); 1829 relayoutRoot->markContainingBlocksForLayout(false);
1830 } 1830 }
1831 } 1831 }
1832 } else if (m_layoutSchedulingEnabled) { 1832 } else if (m_layoutSchedulingEnabled) {
1833 m_layoutSubtreeRoot = relayoutRoot; 1833 m_layoutSubtreeRoot = relayoutRoot;
1834 ASSERT(!m_layoutSubtreeRoot->container() || !m_layoutSubtreeRoot->contai ner()->needsLayout()); 1834 ASSERT(!m_layoutSubtreeRoot->container() || !m_layoutSubtreeRoot->contai ner()->needsLayout());
1835 m_hasPendingLayout = true; 1835 m_hasPendingLayout = true;
1836 1836
1837 page()->animator().scheduleVisualUpdate(); 1837 page()->animator().scheduleVisualUpdate(m_frame.get());
1838 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean); 1838 lifecycle().ensureStateAtMost(DocumentLifecycle::StyleClean);
1839 } 1839 }
1840 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "data", InspectorInvalidateLayoutEvent::data(m_frame.get())); 1840 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Invali dateLayout", "data", InspectorInvalidateLayoutEvent::data(m_frame.get()));
1841 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing. 1841 // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeli ne migrates to tracing.
1842 InspectorInstrumentation::didInvalidateLayout(m_frame.get()); 1842 InspectorInstrumentation::didInvalidateLayout(m_frame.get());
1843 } 1843 }
1844 1844
1845 bool FrameView::layoutPending() const 1845 bool FrameView::layoutPending() const
1846 { 1846 {
1847 // FIXME: This should check Document::lifecycle instead. 1847 // FIXME: This should check Document::lifecycle instead.
(...skipping 2114 matching lines...) Expand 10 before | Expand all | Expand 10 after
3962 return; 3962 return;
3963 3963
3964 ScrollableArea::setScrollOrigin(origin); 3964 ScrollableArea::setScrollOrigin(origin);
3965 3965
3966 // Update if the scroll origin changes, since our position will be different if the content size did not change. 3966 // Update if the scroll origin changes, since our position will be different if the content size did not change.
3967 if (updatePositionAtAll && updatePositionSynchronously) 3967 if (updatePositionAtAll && updatePositionSynchronously)
3968 updateScrollbars(scrollOffsetDouble()); 3968 updateScrollbars(scrollOffsetDouble());
3969 } 3969 }
3970 3970
3971 } // namespace blink 3971 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/loader/EmptyClients.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698