Changeset 47130 in webkit

Timestamp:

Aug 12, 2009 11:43:47 AM (15 years ago)

Author:

Nate Chapin

Message:

2009-08-12 Nate Chapin <Nate Chapin>

Reviewed by Adam Barth.

Add a Custom Setter for DOMWindowEvent in the V8 bindings.
​https://bugs.webkit.org/show_bug.cgi?id=27719

Tests: fast/events/set-event-in-another-frame.html

fast/events/set-event-to-null.html

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/set-event-in-another-frame-expected.txt (added)
• LayoutTests/fast/events/set-event-in-another-frame.html (added)
• LayoutTests/fast/events/set-event-to-null-expected.txt (added)
• LayoutTests/fast/events/set-event-to-null.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorV8.pm (modified) (1 diff)
• WebCore/bindings/v8/custom/V8CustomBinding.h (modified) (1 diff)
• WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp (modified) (1 diff)
• WebCore/page/DOMWindow.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-08-12  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add a layout test to ensure that window.event can be properly accessed
+        after it has been nulled by a script on a page.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27719
+
+        * fast/events/set-event-in-another-frame-expected.txt: Added.
+        * fast/events/set-event-in-another-frame.html: Added.
+        * fast/events/set-event-to-null-expected.txt: Added.
+        * fast/events/set-event-to-null.html: Added.
+
 2009-08-12  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-12  Nate Chapin  <japhet@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Add a Custom Setter for DOMWindowEvent in the V8 bindings.
+        https://bugs.webkit.org/show_bug.cgi?id=27719
+
+        Tests: fast/events/set-event-in-another-frame.html
+               fast/events/set-event-to-null.html
+
+        * bindings/scripts/CodeGeneratorV8.pm: Clean up custom getter/setter code, 
+            as it currently doesn't support a custom getter 
+            and a v8-specific custom setter simultaneously.
+        * bindings/v8/custom/V8CustomBinding.h:
+        * bindings/v8/custom/V8DOMWindowCustom.cpp:
+        (WebCore::ACCESSOR_SETTER):
+        * page/DOMWindow.idl:
+
 2009-08-12  Peter Kasting  <pkasting@google.com>
 

trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm

@@ -976 +976 @@
                 }
             }
-
-        # Custom Getter and Setter
-        } elsif ($attrExt->{"Custom"} || $attrExt->{"V8Custom"}) {
-            $getter = "V8Custom::v8${customAccessor}AccessorGetter";
-            if ($interfaceName eq "WorkerContext" and $attrName eq "self") {
-                $setter = "0";
-                $propAttr = "v8::ReadOnly";
-            } else {
+        } else {
+            # Default Getter and Setter
+            $getter = "${interfaceName}Internal::${attrName}AttrGetter";
+            $setter = "${interfaceName}Internal::${attrName}AttrSetter";
+
+            # Custom Setter
+            if ($attrExt->{"CustomSetter"} || $attrExt->{"V8CustomSetter"} || $attrExt->{"Custom"} || $attrExt->{"V8Custom"}) {
                 $hasCustomSetter = 1;
                 $setter = "V8Custom::v8${customAccessor}AccessorSetter";
             }
 
-        # Custom Setter
-        } elsif ($attrExt->{"CustomSetter"} || $attrExt->{"V8CustomSetter"}) {
-            $hasCustomSetter = 1;
-            $getter = "${interfaceName}Internal::${attrName}AttrGetter";
-            $setter = "V8Custom::v8${customAccessor}AccessorSetter";
-
-        # Custom Getter
-        } elsif ($attrExt->{"CustomGetter"}) {
-            $getter = "V8Custom::v8${customAccessor}AccessorGetter";
-            $setter = "${interfaceName}Internal::${attrName}AttrSetter";
+            # Custom Getter
+            if ($attrExt->{"CustomGetter"} || $attrExt->{"Custom"} || $attrExt->{"V8Custom"}) {
+                $getter = "V8Custom::v8${customAccessor}AccessorGetter";
+            }
+        }
 
         # Replaceable
-        } elsif ($attrExt->{"Replaceable"}) {
-            # Replaceable accessor is put on instance template with ReadOnly attribute.
-            $getter = "${interfaceName}Internal::${attrName}AttrGetter";
-            $setter = "0";
-
-            # Mark to avoid duplicate v8::ReadOnly flags in output.
-            $hasCustomSetter = 1;
-
-            # Handle the special case of window.top being marked upstream as Replaceable.
-            # FIXME: Investigate why [Replaceable] is not marked as ReadOnly
-            # upstream and reach parity.
-            if (!($interfaceName eq "DOMWindow" and $attrName eq "top")) {
-                $propAttr .= "|v8::ReadOnly";
-            }
-
-        # Normal
-        } else {
-            $getter = "${interfaceName}Internal::${attrName}AttrGetter";
-            $setter = "${interfaceName}Internal::${attrName}AttrSetter";
-        }
-
         if ($attrExt->{"Replaceable"} && !$hasCustomSetter) {
             $setter = "0";

trunk/WebCore/bindings/v8/custom/V8CustomBinding.h

@@ -219 +219 @@
         DECLARE_PROPERTY_ACCESSOR(CanvasRenderingContext2DStrokeStyle);
         DECLARE_PROPERTY_ACCESSOR(CanvasRenderingContext2DFillStyle);
-        DECLARE_PROPERTY_ACCESSOR_GETTER(DOMWindowEvent);
+        DECLARE_PROPERTY_ACCESSOR(DOMWindowEvent);
         DECLARE_PROPERTY_ACCESSOR_GETTER(DOMWindowCrypto);
         DECLARE_PROPERTY_ACCESSOR_SETTER(DOMWindowLocation);

trunk/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp

@@ -154 +154 @@
 }
 
+ACCESSOR_SETTER(DOMWindowEvent)
+{
+    v8::Handle<v8::Object> holder = V8DOMWrapper::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, info.This());
+    if (holder.IsEmpty())
+        return;
+
+    Frame* frame = V8DOMWrapper::convertToNativeObject<DOMWindow>(V8ClassIndex::DOMWINDOW, holder)->frame();
+    if (!frame || !V8Proxy::canAccessFrame(frame, true))
+        return;
+
+    v8::Local<v8::Context> context = V8Proxy::context(frame);
+    v8::Local<v8::String> eventSymbol = v8::String::NewSymbol("event");
+    context->Global()->SetHiddenValue(eventSymbol, value);
+}
+
 ACCESSOR_GETTER(DOMWindowCrypto)
 {

trunk/WebCore/page/DOMWindow.idl

@@ -56 +56 @@
         attribute [DoNotCheckDomainSecurity, JSCCustom, V8CustomSetter, V8DisallowShadowing] Location location;
 
-        attribute [Replaceable, CustomGetter] Event event;
+        attribute [Replaceable, CustomGetter, V8CustomSetter] Event event;
 
         readonly attribute [Custom] Crypto crypto;