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

Unified Diff: Source/core/svg/SVGDocumentExtensions.cpp

Issue 986603002: Move "zoomAndPan enabled" logic from SVGDocumentExtensions to SVGSVGElement (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/svg/SVGSVGElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGDocumentExtensions.cpp
diff --git a/Source/core/svg/SVGDocumentExtensions.cpp b/Source/core/svg/SVGDocumentExtensions.cpp
index ad3358b5aac12a20eaf772b9eb68fa8f49f9b987..c5680005e9d36fbbfe8b7816e942c00f8f368258 100644
--- a/Source/core/svg/SVGDocumentExtensions.cpp
+++ b/Source/core/svg/SVGDocumentExtensions.cpp
@@ -26,8 +26,6 @@
#include "core/inspector/ConsoleMessage.h"
#include "core/layout/svg/SVGResourcesCache.h"
#include "core/svg/SVGSVGElement.h"
-#include "core/svg/SVGViewSpec.h"
-#include "core/svg/SVGZoomAndPan.h"
#include "core/svg/animation/SMILTimeContainer.h"
#include "wtf/TemporaryChange.h"
#include "wtf/text/AtomicString.h"
@@ -325,15 +323,8 @@ void SVGDocumentExtensions::invalidateSVGRootsWithRelativeLengthDescendents(Subt
bool SVGDocumentExtensions::zoomAndPanEnabled() const
{
- if (SVGSVGElement* svg = rootElement(*m_document)) {
- if (svg->useCurrentView()) {
- if (svg->currentView())
- return svg->currentView()->zoomAndPan() == SVGZoomAndPanMagnify;
- } else {
- return svg->zoomAndPan() == SVGZoomAndPanMagnify;
- }
- }
-
+ if (SVGSVGElement* svg = rootElement(*m_document))
+ return svg->zoomAndPanEnabled();
return false;
}
« no previous file with comments | « no previous file | Source/core/svg/SVGSVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698