AI 145796: Land the WebKit merge @r42026.

Automated import of CL 145796

1 files changed, 23 insertions, 11 deletions

diff --git a/WebCore/rendering/HitTestRequest.h b/WebCore/rendering/HitTestRequest.h
index 11dca4b..46dd7b8 100644
--- a/WebCore/rendering/HitTestRequest.h
+++ b/WebCore/rendering/HitTestRequest.h
@@ -2,6 +2,7 @@
  * This file is part of the HTML rendering engine for KDE.
  *
  * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -19,24 +20,35 @@
  * Boston, MA 02110-1301, USA.
  *
 */
+
 #ifndef HitTestRequest_h
 #define HitTestRequest_h
 
 namespace WebCore {
 
-struct HitTestRequest {
-    HitTestRequest(bool r, bool a, bool m = false, bool u = false)
-        : readonly(r)
-        , active(a)
-        , mouseMove(m)
-        , mouseUp(u)
-    { 
+class HitTestRequest {
+public:
+    enum RequestType {
+        ReadOnly = 0x1,
+        Active = 0x2,
+        MouseMove = 0x4,
+        MouseUp = 0x8,
+        IgnoreClipping = 0x10
+    };
+
+    HitTestRequest(int requestType)
+        : m_requestType(requestType)
+    {
     }
 
-    bool readonly;
-    bool active;
-    bool mouseMove;
-    bool mouseUp;
+    bool readOnly() const { return m_requestType & ReadOnly; }
+    bool active() const { return m_requestType & Active; }
+    bool mouseMove() const { return m_requestType & MouseMove; }
+    bool mouseUp() const { return m_requestType & MouseUp; }
+    bool ignoreClipping() const { return m_requestType & IgnoreClipping; }
+
+private:
+    int m_requestType;
 };
 
 } // namespace WebCore