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

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

Issue 704673005: Temporarily disable assert in FrameView::updateWidgets(). (Closed) 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 | « no previous file | 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 1917 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 1928
1929 // scrollRectToVisible can call into setScrollPosition(), which resets m_mai ntainScrollPositionAnchor. 1929 // scrollRectToVisible can call into setScrollPosition(), which resets m_mai ntainScrollPositionAnchor.
1930 m_maintainScrollPositionAnchor = anchorNode; 1930 m_maintainScrollPositionAnchor = anchorNode;
1931 } 1931 }
1932 1932
1933 bool FrameView::updateWidgets() 1933 bool FrameView::updateWidgets()
1934 { 1934 {
1935 // This is always called from updateWidgetsTimerFired. 1935 // This is always called from updateWidgetsTimerFired.
1936 // m_updateWidgetsTimer should only be scheduled if we have widgets to updat e. 1936 // m_updateWidgetsTimer should only be scheduled if we have widgets to updat e.
1937 // Thus I believe we can stop checking isEmpty here, and just ASSERT isEmpty : 1937 // Thus I believe we can stop checking isEmpty here, and just ASSERT isEmpty :
1938 ASSERT(!m_partUpdateSet.isEmpty()); 1938 // FIXME: This assert has been temporarily removed due to https://crbug.com/ 430344
1939 if (m_nestedLayoutCount > 1 || m_partUpdateSet.isEmpty()) 1939 if (m_nestedLayoutCount > 1 || m_partUpdateSet.isEmpty())
1940 return true; 1940 return true;
1941 1941
1942 // Need to swap because script will run inside the below loop and invalidate the iterator. 1942 // Need to swap because script will run inside the below loop and invalidate the iterator.
1943 EmbeddedObjectSet objects; 1943 EmbeddedObjectSet objects;
1944 objects.swap(m_partUpdateSet); 1944 objects.swap(m_partUpdateSet);
1945 1945
1946 for (const auto& embeddedObject : objects) { 1946 for (const auto& embeddedObject : objects) {
1947 RenderEmbeddedObject& object = *embeddedObject; 1947 RenderEmbeddedObject& object = *embeddedObject;
1948 HTMLPlugInElement* element = toHTMLPlugInElement(object.node()); 1948 HTMLPlugInElement* element = toHTMLPlugInElement(object.node());
(...skipping 1985 matching lines...) Expand 10 before | Expand all | Expand 10 after
3934 return; 3934 return;
3935 3935
3936 ScrollableArea::setScrollOrigin(origin); 3936 ScrollableArea::setScrollOrigin(origin);
3937 3937
3938 // Update if the scroll origin changes, since our position will be different if the content size did not change. 3938 // Update if the scroll origin changes, since our position will be different if the content size did not change.
3939 if (updatePositionAtAll && updatePositionSynchronously) 3939 if (updatePositionAtAll && updatePositionSynchronously)
3940 updateScrollbars(scrollOffsetDouble()); 3940 updateScrollbars(scrollOffsetDouble());
3941 } 3941 }
3942 3942
3943 } // namespace blink 3943 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698