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

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

Issue 11348330: Merge 135740 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 void Frame::clearTimers() 662 void Frame::clearTimers()
663 { 663 {
664 clearTimers(m_view.get(), document()); 664 clearTimers(m_view.get(), document());
665 } 665 }
666 666
667 #if ENABLE(PAGE_VISIBILITY_API) 667 #if ENABLE(PAGE_VISIBILITY_API)
668 void Frame::dispatchVisibilityStateChangeEvent() 668 void Frame::dispatchVisibilityStateChangeEvent()
669 { 669 {
670 if (m_doc) 670 if (m_doc)
671 m_doc->dispatchVisibilityStateChangeEvent(); 671 m_doc->dispatchVisibilityStateChangeEvent();
672
673 Vector<RefPtr<Frame> > childFrames;
672 for (Frame* child = tree()->firstChild(); child; child = child->tree()->next Sibling()) 674 for (Frame* child = tree()->firstChild(); child; child = child->tree()->next Sibling())
673 child->dispatchVisibilityStateChangeEvent(); 675 childFrames.append(child);
676
677 for (size_t i = 0; i < childFrames.size(); ++i)
678 childFrames[i]->dispatchVisibilityStateChangeEvent();
674 } 679 }
675 #endif 680 #endif
676 681
677 void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 682 void Frame::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
678 { 683 {
679 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 684 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
680 info.addMember(m_doc.get()); 685 info.addMember(m_doc.get());
681 info.addMember(m_loader); 686 info.addMember(m_loader);
682 } 687 }
683 688
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
1114 1119
1115 m_view->paintContents(buffer->context(), paintingRect); 1120 m_view->paintContents(buffer->context(), paintingRect);
1116 1121
1117 RefPtr<Image> image = buffer->copyImage(); 1122 RefPtr<Image> image = buffer->copyImage();
1118 return createDragImageFromImage(image.get()); 1123 return createDragImageFromImage(image.get());
1119 } 1124 }
1120 1125
1121 #endif 1126 #endif
1122 1127
1123 } // namespace WebCore 1128 } // 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