Prune HitTestResult and stop special-casing links.

sky/engine/core/rendering/HitTestResult.cpp

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 19 matching lines @@
 #include "sky/engine/core/fetch/ImageResource.h"
 #include "sky/engine/core/frame/LocalFrame.h"
 #include "sky/engine/core/html/HTMLAnchorElement.h"
 #include "sky/engine/core/html/HTMLImageElement.h"
 #include "sky/engine/core/html/parser/HTMLParserIdioms.h"
 #include "sky/engine/core/rendering/RenderImage.h"
 
 namespace blink {
 
 HitTestResult::HitTestResult()
-    : m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const LayoutPoint& point)
     : m_hitTestLocation(point)
     , m_pointInInnerNodeFrame(point)
-    , m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const LayoutPoint& centerPoint, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
     : m_hitTestLocation(centerPoint, topPadding, rightPadding, bottomPadding, leftPadding)
     , m_pointInInnerNodeFrame(centerPoint)
-    , m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const HitTestLocation& other)
     : m_hitTestLocation(other)
     , m_pointInInnerNodeFrame(m_hitTestLocation.point())
-    , m_isOverWidget(false)
 {
 }
 
 HitTestResult::HitTestResult(const HitTestResult& other)
     : m_hitTestLocation(other.m_hitTestLocation)
     , m_innerNode(other.innerNode())
     , m_innerPossiblyPseudoNode(other.m_innerPossiblyPseudoNode)
     , m_innerNonSharedNode(other.innerNonSharedNode())
     , m_pointInInnerNodeFrame(other.m_pointInInnerNodeFrame)
     , m_localPoint(other.localPoint())
-    , m_innerURLElement(other.URLElement())
-    , m_isOverWidget(other.isOverWidget())
 {
     // Only copy the NodeSet in case of rect hit test.
     m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
 }
 
 HitTestResult::~HitTestResult()
 {
 }
 
 HitTestResult& HitTestResult::operator=(const HitTestResult& other)
 {
     m_hitTestLocation = other.m_hitTestLocation;
     m_innerNode = other.innerNode();
     m_innerPossiblyPseudoNode = other.innerPossiblyPseudoNode();
     m_innerNonSharedNode = other.innerNonSharedNode();
     m_pointInInnerNodeFrame = other.m_pointInInnerNodeFrame;
     m_localPoint = other.localPoint();
-    m_innerURLElement = other.URLElement();
-    m_isOverWidget = other.isOverWidget();
 
     // Only copy the NodeSet in case of rect hit test.
     m_rectBasedTestResult = adoptPtr(other.m_rectBasedTestResult ? new NodeSet(*other.m_rectBasedTestResult) : 0);
 
     return *this;
 }
 
 PositionWithAffinity HitTestResult::position() const
 {
     if (!m_innerPossiblyPseudoNode)
@@ skipping 15 matching lines @@
 {
     m_innerPossiblyPseudoNode = n;
     m_innerNode = n;
 }
 
 void HitTestResult::setInnerNonSharedNode(Node* n)
 {
     m_innerNonSharedNode = n;
 }
 
-void HitTestResult::setURLElement(Element* n)
-{
-    m_innerURLElement = n;
-}
-
 LocalFrame* HitTestResult::innerNodeFrame() const
 {
     if (m_innerNonSharedNode)
         return m_innerNonSharedNode->document().frame();
     if (m_innerNode)
         return m_innerNode->document().frame();
     return 0;
 }
 
 bool HitTestResult::isSelected() const
@@ skipping 21 matching lines @@
     return 0;
 }
 
 IntRect HitTestResult::imageRect() const
 {
     if (!image())
         return IntRect();
     return m_innerNonSharedNode->renderBox()->absoluteContentQuad().enclosingBoundingBox();
 }
 
-KURL HitTestResult::absoluteImageURL() const
-{
-    return absoluteImageURLInternal(false);
-}
-
-KURL HitTestResult::absoluteImageURLIncludingCanvasDataURL() const
-{
-    return absoluteImageURLInternal(true);
-}
-
-KURL HitTestResult::absoluteImageURLInternal(bool allowCanvas) const
-{
-    if (!m_innerNonSharedNode)
-        return KURL();
-
-    RenderObject* renderer = m_innerNonSharedNode->renderer();
-    if (!(renderer && (renderer->isImage() || renderer->isCanvas())))
-        return KURL();
-
-    AtomicString urlString;
-    if ((allowCanvas && isHTMLCanvasElement(*m_innerNonSharedNode))
-        || isHTMLImageElement(*m_innerNonSharedNode)
-       ) {
-        urlString = toElement(*m_innerNonSharedNode).imageSourceURL();
-    } else
-        return KURL();
-
-    return m_innerNonSharedNode->document().completeURL(stripLeadingAndTrailingHTMLSpaces(urlString));
-}
-
-KURL HitTestResult::absoluteLinkURL() const
-{
-    if (!m_innerURLElement)
-        return KURL();
-    return m_innerURLElement->hrefURL();
-}
-
-bool HitTestResult::isLiveLink() const
-{
-    return m_innerURLElement && m_innerURLElement->isLiveLink();
-}
-
 bool HitTestResult::isMisspelled() const
 {
     if (!targetNode() || !targetNode()->renderer())
         return false;
     VisiblePosition pos(targetNode()->renderer()->positionForPoint(localPoint()));
     if (pos.isNull())
         return false;
     return m_innerNonSharedNode->document().markers().markersInRange(
         makeRange(pos, pos).get(), DocumentMarker::MisspellingMarkers()).size() > 0;
 }
 
-bool HitTestResult::isOverLink() const
-{
-    return m_innerURLElement && m_innerURLElement->isLink();
-}
-
-String HitTestResult::textContent() const
-{
-    if (!m_innerURLElement)
-        return String();
-    return m_innerURLElement->textContent();
-}
-
 // FIXME: This function needs a better name and may belong in a different class. It's not
 // really isContentEditable(); it's more like needsEditingContextMenu(). In many ways, this
 // function would make more sense in the ContextMenu class, except that WebElementDictionary
 // hooks into it. Anyway, we should architect this better.
 bool HitTestResult::isContentEditable() const
 {
     if (!m_innerNonSharedNode)
         return false;
     return m_innerNonSharedNode->hasEditableStyle();
 }
@@ skipping 35 matching lines @@
 void HitTestResult::append(const HitTestResult& other)
 {
     ASSERT(isRectBasedTest() && other.isRectBasedTest());
 
     if (!m_innerNode && other.innerNode()) {
         m_innerNode = other.innerNode();
         m_innerPossiblyPseudoNode = other.innerPossiblyPseudoNode();
         m_innerNonSharedNode = other.innerNonSharedNode();
         m_localPoint = other.localPoint();
         m_pointInInnerNodeFrame = other.m_pointInInnerNodeFrame;
-        m_innerURLElement = other.URLElement();
-        m_isOverWidget = other.isOverWidget();
     }
 
     if (other.m_rectBasedTestResult) {
         NodeSet& set = mutableRectBasedTestResult();
         for (NodeSet::const_iterator it = other.m_rectBasedTestResult->begin(), last = other.m_rectBasedTestResult->end(); it != last; ++it)
             set.add(it->get());
     }
 }
 
 const HitTestResult::NodeSet& HitTestResult::rectBasedTestResult() const
@@ skipping 28 matching lines @@
 {
     for (Node* node = m_innerNode.get(); node; node = NodeRenderingTraversal::parent(node)) {
         if (node->isElementNode())
             return toElement(node);
     }
 
     return 0;
 }
 
 } // namespace blink