webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 10 insertions, 31 deletions

diff --git a/Source/WebCore/rendering/HitTestLocation.h b/Source/WebCore/rendering/HitTestLocation.h
index e12191ff7..14b1b1fed 100644
--- a/Source/WebCore/rendering/HitTestLocation.h
+++ b/Source/WebCore/rendering/HitTestLocation.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006 Apple Inc.
  * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
@@ -19,59 +19,42 @@
  *
 */
 
-#ifndef HitTestLocation_h
-#define HitTestLocation_h
+#pragma once
 
 #include "FloatQuad.h"
 #include "FloatRect.h"
 #include "HitTestRequest.h"
 #include "LayoutRect.h"
 #include "RoundedRect.h"
-#include "TextDirection.h"
+#include "TextFlags.h"
 #include <wtf/Forward.h>
-#include <wtf/ListHashSet.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-class Element;
-class Frame;
-#if ENABLE(VIDEO)
-class HTMLMediaElement;
-#endif
-class Image;
-class URL;
-class Node;
-class RenderRegion;
-class Scrollbar;
-
 class HitTestLocation {
 public:
-
-    HitTestLocation();
+    WEBCORE_EXPORT HitTestLocation();
     HitTestLocation(const LayoutPoint&);
-    HitTestLocation(const FloatPoint&);
+    WEBCORE_EXPORT HitTestLocation(const FloatPoint&);
     HitTestLocation(const FloatPoint&, const FloatQuad&);
     // Pass non-zero padding values to perform a rect-based hit test.
     HitTestLocation(const LayoutPoint& centerPoint, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
     // Make a copy the HitTestLocation in a new region by applying given offset to internal point and area.
-    HitTestLocation(const HitTestLocation&, const LayoutSize& offset, RenderRegion* = 0);
-    HitTestLocation(const HitTestLocation&);
-    ~HitTestLocation();
+    HitTestLocation(const HitTestLocation&, const LayoutSize& offset);
+    WEBCORE_EXPORT HitTestLocation(const HitTestLocation&);
+    WEBCORE_EXPORT ~HitTestLocation();
     HitTestLocation& operator=(const HitTestLocation&);
 
     const LayoutPoint& point() const { return m_point; }
     IntPoint roundedPoint() const { return roundedIntPoint(m_point); }
 
-    RenderRegion* region() const { return m_region; }
-
     // Rect-based hit test related methods.
     bool isRectBasedTest() const { return m_isRectBased; }
     bool isRectilinear() const { return m_isRectilinear; }
     IntRect boundingBox() const { return m_boundingBox; }
-
-    static IntRect rectForPoint(const LayoutPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
+    
+    WEBCORE_EXPORT static IntRect rectForPoint(const LayoutPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
     int topPadding() const { return roundedPoint().y() - m_boundingBox.y(); }
     int rightPadding() const { return m_boundingBox.maxX() - roundedPoint().x() - 1; }
     int bottomPadding() const { return m_boundingBox.maxY() - roundedPoint().y() - 1; }
@@ -96,12 +79,8 @@ private:
     FloatPoint m_transformedPoint;
     FloatQuad m_transformedRect;
 
-    RenderRegion* m_region; // The region we're inside.
-
     bool m_isRectBased;
     bool m_isRectilinear;
 };
 
 } // namespace WebCore
-
-#endif // HitTestLocation_h