Merge 75028 - Merge 74779

WebCore/page/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 1186 matching lines @@
             // We need to parse the xpointer reference here
         } else if (name.startsWith("svgView(")) {
             RefPtr<SVGSVGElement> svg = static_cast<SVGDocument*>(m_frame->document())->rootElement();
             if (!svg->currentView()->parseViewSpec(name))
                 return false;
             svg->setUseCurrentView(true);
         } else {
             if (anchorNode && anchorNode->hasTagName(SVGNames::viewTag)) {
                 RefPtr<SVGViewElement> viewElement = anchorNode->hasTagName(SVGNames::viewTag) ? static_cast<SVGViewElement*>(anchorNode) : 0;
                 if (viewElement.get()) {
-                    RefPtr<SVGSVGElement> svg = static_cast<SVGSVGElement*>(SVGLocatable::nearestViewportElement(viewElement.get()));
-                    svg->inheritViewAttributes(viewElement.get());
+                    SVGElement* element = SVGLocatable::nearestViewportElement(viewElement.get());
+                    if (element->hasTagName(SVGNames::svgTag)) {
+                        RefPtr<SVGSVGElement> svg = static_cast<SVGSVGElement*>(element);
+                        svg->inheritViewAttributes(viewElement.get());
+                    }
                 }
             }
         }
         // FIXME: need to decide which <svg> to focus on, and zoom to that one
         // FIXME: need to actually "highlight" the viewTarget(s)
     }
 #endif
 
     m_frame->document()->setCSSTarget(anchorNode); // Setting to null will clear the current target.
   
@@ skipping 1197 matching lines @@
     s_maxDeferredRepaintDelayDuringLoading = p;
 }
 
 // On each repaint the delay increases by this amount
 void FrameView::setRepaintThrottlingDeferredRepaintDelayIncrementDuringLoading(double p)
 {
     s_deferredRepaintDelayIncrementDuringLoading = p;
 }
 
 } // namespace WebCore