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

Side by Side Diff: page/FrameView.cpp

Issue 340032: Upstream changes for http://codereview.chromium.org/339064 (Closed) Base URL: http://svn.webkit.org/repository/webkit/trunk/WebCore/
Patch Set: Created 11 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
« no previous file with comments | « loader/FrameLoaderClient.h ('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 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 if (m_firstLayoutCallbackPending) { 1313 if (m_firstLayoutCallbackPending) {
1314 m_firstLayoutCallbackPending = false; 1314 m_firstLayoutCallbackPending = false;
1315 m_frame->loader()->didFirstLayout(); 1315 m_frame->loader()->didFirstLayout();
1316 } 1316 }
1317 1317
1318 if (m_isVisuallyNonEmpty && m_firstVisuallyNonEmptyLayoutCallbackPending) { 1318 if (m_isVisuallyNonEmpty && m_firstVisuallyNonEmptyLayoutCallbackPending) {
1319 m_firstVisuallyNonEmptyLayoutCallbackPending = false; 1319 m_firstVisuallyNonEmptyLayoutCallbackPending = false;
1320 m_frame->loader()->didFirstVisuallyNonEmptyLayout(); 1320 m_frame->loader()->didFirstVisuallyNonEmptyLayout();
1321 } 1321 }
1322 1322
1323 m_frame->loader()->client()->dispatchDidLayout();
1324
1323 RenderView* root = m_frame->contentRenderer(); 1325 RenderView* root = m_frame->contentRenderer();
1324 1326
1325 root->updateWidgetPositions(); 1327 root->updateWidgetPositions();
1326 1328
1327 for (unsigned i = 0; i < maxUpdateWidgetsIterations; i++) { 1329 for (unsigned i = 0; i < maxUpdateWidgetsIterations; i++) {
1328 if (updateWidgets()) 1330 if (updateWidgets())
1329 break; 1331 break;
1330 } 1332 }
1331 1333
1332 scrollToAnchor(); 1334 scrollToAnchor();
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
1923 return point; 1925 return point;
1924 } 1926 }
1925 1927
1926 return Widget::convertFromContainingView(parentPoint); 1928 return Widget::convertFromContainingView(parentPoint);
1927 } 1929 }
1928 1930
1929 return parentPoint; 1931 return parentPoint;
1930 } 1932 }
1931 1933
1932 } // namespace WebCore 1934 } // namespace WebCore
OLDNEW
« no previous file with comments | « loader/FrameLoaderClient.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698