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

Side by Side Diff: Source/WebCore/page/Frame.cpp

Issue 11418272: Merge 135740 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 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
« no previous file with comments | « LayoutTests/fast/frames/page-visibility-crash-expected.txt ('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 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 void Frame::clearTimers() 660 void Frame::clearTimers()
661 { 661 {
662 clearTimers(m_view.get(), document()); 662 clearTimers(m_view.get(), document());
663 } 663 }
664 664
665 #if ENABLE(PAGE_VISIBILITY_API) 665 #if ENABLE(PAGE_VISIBILITY_API)
666 void Frame::dispatchVisibilityStateChangeEvent() 666 void Frame::dispatchVisibilityStateChangeEvent()
667 { 667 {
668 if (m_doc) 668 if (m_doc)
669 m_doc->dispatchVisibilityStateChangeEvent(); 669 m_doc->dispatchVisibilityStateChangeEvent();
670
671 Vector<RefPtr<Frame> > childFrames;
670 for (Frame* child = tree()->firstChild(); child; child = child->tree()->next Sibling()) 672 for (Frame* child = tree()->firstChild(); child; child = child->tree()->next Sibling())
671 child->dispatchVisibilityStateChangeEvent(); 673 childFrames.append(child);
674
675 for (size_t i = 0; i < childFrames.size(); ++i)
676 childFrames[i]->dispatchVisibilityStateChangeEvent();
672 } 677 }
673 #endif 678 #endif
674 679
675 void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 680 void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
676 { 681 {
677 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 682 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
678 info.addMember(m_doc.get()); 683 info.addMember(m_doc.get());
679 info.addMember(m_loader); 684 info.addMember(m_loader);
680 } 685 }
681 686
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1111 1116
1112 m_view->paintContents(buffer->context(), paintingRect); 1117 m_view->paintContents(buffer->context(), paintingRect);
1113 1118
1114 RefPtr<Image> image = buffer->copyImage(); 1119 RefPtr<Image> image = buffer->copyImage();
1115 return createDragImageFromImage(image.get()); 1120 return createDragImageFromImage(image.get());
1116 } 1121 }
1117 1122
1118 #endif 1123 #endif
1119 1124
1120 } // namespace WebCore 1125 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/frames/page-visibility-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698