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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 2292913002: Ensure clean layout before calling plainText() (flat tree version) (Closed)
Patch Set: 201609021415 Created 4 years, 3 months 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
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 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 return dragImageBuilder.createImage(opacity); 666 return dragImageBuilder.createImage(opacity);
667 } 667 }
668 668
669 String LocalFrame::selectedText() const 669 String LocalFrame::selectedText() const
670 { 670 {
671 return selection().selectedText(); 671 return selection().selectedText();
672 } 672 }
673 673
674 String LocalFrame::selectedTextForClipboard() const 674 String LocalFrame::selectedTextForClipboard() const
675 { 675 {
676 if (!document())
677 return emptyString();
678
679 // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
680 // needs to be audited. See http://crbug.com/590369 for more details.
681 document()->updateStyleAndLayoutIgnorePendingStylesheets();
682
676 return selection().selectedTextForClipboard(); 683 return selection().selectedTextForClipboard();
677 } 684 }
678 685
679 PositionWithAffinity LocalFrame::positionForPoint(const IntPoint& framePoint) 686 PositionWithAffinity LocalFrame::positionForPoint(const IntPoint& framePoint)
680 { 687 {
681 HitTestResult result = eventHandler().hitTestResultAtPoint(framePoint); 688 HitTestResult result = eventHandler().hitTestResultAtPoint(framePoint);
682 Node* node = result.innerNodeOrImageMapImage(); 689 Node* node = result.innerNodeOrImageMapImage();
683 if (!node) 690 if (!node)
684 return PositionWithAffinity(); 691 return PositionWithAffinity();
685 LayoutObject* layoutObject = node->layoutObject(); 692 LayoutObject* layoutObject = node->layoutObject();
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 m_frame->client()->frameBlameContext()->Enter(); 865 m_frame->client()->frameBlameContext()->Enter();
859 } 866 }
860 867
861 ScopedFrameBlamer::~ScopedFrameBlamer() 868 ScopedFrameBlamer::~ScopedFrameBlamer()
862 { 869 {
863 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 870 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
864 m_frame->client()->frameBlameContext()->Leave(); 871 m_frame->client()->frameBlameContext()->Leave();
865 } 872 }
866 873
867 } // namespace blink 874 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698