Changeset 118889 in webkit

Timestamp:

May 29, 2012, 9:05:53 PM (14 years ago)

Author:

hayato@chromium.org

Message:

Add assertions to make sure that event's target and relatedTarget are accessible.
​https://bugs.webkit.org/show_bug.cgi?id=87641

Reviewed by Dimitri Glazkov.

No new tests. No new functionality except for assertions.

• dom/EventContext.cpp:

(WebCore::EventContext::EventContext):

• dom/EventContext.h:

(WebCore):
(EventContext):
(WebCore::EventContext::setRelatedTarget):
(WebCore::EventContext::accessible):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/EventContext.cpp (modified) (1 diff)
• dom/EventContext.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-29  Hayato Ito  <hayato@chromium.org>
+
+        Add assertions to make sure that event's target and relatedTarget are accessible.
+        https://bugs.webkit.org/show_bug.cgi?id=87641
+
+        Reviewed by Dimitri Glazkov.
+
+        No new tests. No new functionality except for assertions.
+
+        * dom/EventContext.cpp:
+        (WebCore::EventContext::EventContext):
+        * dom/EventContext.h:
+        (WebCore):
+        (EventContext):
+        (WebCore::EventContext::setRelatedTarget):
+        (WebCore::EventContext::accessible):
+
 2012-05-29  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/dom/EventContext.cpp

@@ -42 +42 @@
     , m_relatedTarget(0)
 {
+    ASSERT(m_node);
+    ASSERT(!m_target || m_target->toNode() || accessible(m_target->toNode()));
 }
 

trunk/Source/WebCore/dom/EventContext.h

@@ -28 +28 @@
 #define EventContext_h
 
+#include "EventTarget.h"
+#include "Node.h"
+#include "TreeScope.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
-class EventTarget;
 class Event;
-class Node;
 
 class EventContext {
@@ -49 +50 @@
 
 private:
+#ifndef NDEBUG
+    bool accessible(Node*);
+#endif
     RefPtr<Node> m_node;
     RefPtr<EventTarget> m_currentTarget;
@@ -77 +81 @@
 inline void EventContext::setRelatedTarget(PassRefPtr<EventTarget> relatedTarget)
 {
+    ASSERT(!relatedTarget || !relatedTarget->toNode() || accessible(relatedTarget->toNode()));
     m_relatedTarget = relatedTarget;
 }
+
+#ifndef NDEBUG
+inline bool EventContext::accessible(Node* target)
+{
+    ASSERT(target);
+    TreeScope* targetScope = target->treeScope();
+    for (TreeScope* scope = m_node->treeScope(); scope; scope = scope->parentTreeScope()) {
+        if (scope == targetScope)
+            return true;
+    }
+    return false;
+}
+#endif
 
 }