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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "core/inspector/InspectorInstrumentation.h" | 51 #include "core/inspector/InspectorInstrumentation.h" |
52 #include "core/loader/FrameLoaderClient.h" | 52 #include "core/loader/FrameLoaderClient.h" |
53 #include "core/page/Chrome.h" | 53 #include "core/page/Chrome.h" |
54 #include "core/page/EventHandler.h" | 54 #include "core/page/EventHandler.h" |
55 #include "core/page/FocusController.h" | 55 #include "core/page/FocusController.h" |
56 #include "core/page/scrolling/ScrollingCoordinator.h" | 56 #include "core/page/scrolling/ScrollingCoordinator.h" |
57 #include "core/rendering/HitTestResult.h" | 57 #include "core/rendering/HitTestResult.h" |
58 #include "core/rendering/RenderLayer.h" | 58 #include "core/rendering/RenderLayer.h" |
59 #include "core/rendering/RenderView.h" | 59 #include "core/rendering/RenderView.h" |
60 #include "core/rendering/compositing/RenderLayerCompositor.h" | 60 #include "core/rendering/compositing/RenderLayerCompositor.h" |
61 #include "core/svg/SVGDocument.h" | 61 #include "core/svg/SVGDocumentExtensions.h" |
62 #include "platform/DragImage.h" | 62 #include "platform/DragImage.h" |
63 #include "platform/graphics/GraphicsContext.h" | 63 #include "platform/graphics/GraphicsContext.h" |
64 #include "platform/graphics/ImageBuffer.h" | 64 #include "platform/graphics/ImageBuffer.h" |
65 #include "wtf/PassOwnPtr.h" | 65 #include "wtf/PassOwnPtr.h" |
66 #include "wtf/StdLibExtras.h" | 66 #include "wtf/StdLibExtras.h" |
67 | 67 |
68 using namespace std; | 68 using namespace std; |
69 | 69 |
70 namespace WebCore { | 70 namespace WebCore { |
71 | 71 |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
437 if (!page) | 437 if (!page) |
438 return; | 438 return; |
439 | 439 |
440 Document* document = this->document(); | 440 Document* document = this->document(); |
441 if (!document) | 441 if (!document) |
442 return; | 442 return; |
443 | 443 |
444 // Respect SVGs zoomAndPan="disabled" property in standalone SVG documents. | 444 // Respect SVGs zoomAndPan="disabled" property in standalone SVG documents. |
445 // FIXME: How to handle compound documents + zoomAndPan="disabled"? Needs SV
G WG clarification. | 445 // FIXME: How to handle compound documents + zoomAndPan="disabled"? Needs SV
G WG clarification. |
446 if (document->isSVGDocument()) { | 446 if (document->isSVGDocument()) { |
447 if (!toSVGDocument(document)->zoomAndPanEnabled()) | 447 if (!document->accessSVGExtensions().zoomAndPanEnabled()) |
448 return; | 448 return; |
449 } | 449 } |
450 | 450 |
451 if (m_pageZoomFactor != pageZoomFactor) { | 451 if (m_pageZoomFactor != pageZoomFactor) { |
452 if (FrameView* view = this->view()) { | 452 if (FrameView* view = this->view()) { |
453 // Update the scroll position when doing a full page zoom, so the co
ntent stays in relatively the same position. | 453 // Update the scroll position when doing a full page zoom, so the co
ntent stays in relatively the same position. |
454 LayoutPoint scrollPosition = view->scrollPosition(); | 454 LayoutPoint scrollPosition = view->scrollPosition(); |
455 float percentDifference = (pageZoomFactor / m_pageZoomFactor); | 455 float percentDifference = (pageZoomFactor / m_pageZoomFactor); |
456 view->setScrollPosition(IntPoint(scrollPosition.x() * percentDiffere
nce, scrollPosition.y() * percentDifference)); | 456 view->setScrollPosition(IntPoint(scrollPosition.x() * percentDiffere
nce, scrollPosition.y() * percentDifference)); |
457 } | 457 } |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
619 LocalFrame* LocalFrame::localFrameRoot() | 619 LocalFrame* LocalFrame::localFrameRoot() |
620 { | 620 { |
621 LocalFrame* curFrame = this; | 621 LocalFrame* curFrame = this; |
622 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i
sLocalFrame()) | 622 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i
sLocalFrame()) |
623 curFrame = curFrame->tree().parent(); | 623 curFrame = curFrame->tree().parent(); |
624 | 624 |
625 return curFrame; | 625 return curFrame; |
626 } | 626 } |
627 | 627 |
628 } // namespace WebCore | 628 } // namespace WebCore |
OLD | NEW |