| OLD | NEW |
| 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 Loading... |
| 666 | 666 |
| 667 m_view->setNodeToDraw(&node); // Enable special sub-tree drawing mode. | 667 m_view->setNodeToDraw(&node); // Enable special sub-tree drawing mode. |
| 668 | 668 |
| 669 // Document::updateLayout may have blown away the original LayoutObject. | 669 // Document::updateLayout may have blown away the original LayoutObject. |
| 670 LayoutObject* layoutObject = node.layoutObject(); | 670 LayoutObject* layoutObject = node.layoutObject(); |
| 671 if (!layoutObject) | 671 if (!layoutObject) |
| 672 return nullptr; | 672 return nullptr; |
| 673 | 673 |
| 674 IntRect rect; | 674 IntRect rect; |
| 675 | 675 |
| 676 return paintIntoDragImage(*layoutObject, layoutObject->shouldRespectImageOri
entation(), | 676 return paintIntoDragImage(*layoutObject, LayoutObject::shouldRespectImageOri
entation(layoutObject), |
| 677 GlobalPaintFlattenCompositingLayers, layoutObject->paintingRootRect(rect
)); | 677 GlobalPaintFlattenCompositingLayers, layoutObject->paintingRootRect(rect
)); |
| 678 } | 678 } |
| 679 | 679 |
| 680 PassOwnPtr<DragImage> LocalFrame::dragImageForSelection(float opacity) | 680 PassOwnPtr<DragImage> LocalFrame::dragImageForSelection(float opacity) |
| 681 { | 681 { |
| 682 if (!selection().isRange()) | 682 if (!selection().isRange()) |
| 683 return nullptr; | 683 return nullptr; |
| 684 | 684 |
| 685 const ScopedFramePaintingState state(this, 0); | 685 const ScopedFramePaintingState state(this, 0); |
| 686 m_view->updateAllLifecyclePhases(); | 686 m_view->updateAllLifecyclePhases(); |
| (...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 { | 917 { |
| 918 m_frame->disableNavigation(); | 918 m_frame->disableNavigation(); |
| 919 } | 919 } |
| 920 | 920 |
| 921 FrameNavigationDisabler::~FrameNavigationDisabler() | 921 FrameNavigationDisabler::~FrameNavigationDisabler() |
| 922 { | 922 { |
| 923 m_frame->enableNavigation(); | 923 m_frame->enableNavigation(); |
| 924 } | 924 } |
| 925 | 925 |
| 926 } // namespace blink | 926 } // namespace blink |
| OLD | NEW |