WebKit Merge 42805:42932, Chromium side....

webkit/port/bindings/v8/v8_proxy.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 2935 matching lines @@
       result->SetInternalField(V8Custom::kHTMLDocumentMarkerIndex, marker);
       result->SetInternalField(V8Custom::kHTMLDocumentShadowIndex, marker);
     }
   }
 
   return result;
 }
 
 
 // A JS object of type EventTarget can only be the following possible types:
-// 1) EventTargetNode; 2) XMLHttpRequest; 3) MessagePort; 4) SVGElementInstance;
-// 5) XMLHttpRequestUpload 6) Worker
+// 1) EventTargetNode; 2) DOMWindow 3) XMLHttpRequest; 4) MessagePort;
+// 5) XMLHttpRequestUpload
 // check EventTarget.h for new type conversion methods
 v8::Handle<v8::Value> V8Proxy::EventTargetToV8Object(EventTarget* target)
 {
   if (!target)
       return v8::Null();
 
 #if ENABLE(SVG)
   SVGElementInstance* instance = target->toSVGElementInstance();
   if (instance)
       return ToV8Object(V8ClassIndex::SVGELEMENTINSTANCE, instance);
 #endif
 
 #if ENABLE(WORKERS)
   Worker* worker = target->toWorker();
   if (worker)
       return ToV8Object(V8ClassIndex::WORKER, worker);
 #endif  // WORKERS
 
   Node* node = target->toNode();
   if (node)
       return NodeToV8Object(node);
 
+  if (DOMWindow* domWindow = target->toDOMWindow())
+      return ToV8Object(V8ClassIndex::DOMWINDOW, domWindow);
+
   // XMLHttpRequest is created within its JS counterpart.
   XMLHttpRequest* xhr = target->toXMLHttpRequest();
   if (xhr) {
     v8::Handle<v8::Object> wrapper = getActiveDOMObjectMap().get(xhr);
     ASSERT(!wrapper.IsEmpty());
     return wrapper;
   }
 
   // MessagePort is created within its JS counterpart
   MessagePort* port = target->toMessagePort();
@@ skipping 293 matching lines @@
 }
 
 void V8Proxy::RegisterExtension(v8::Extension* extension,
                                 const String& schemeRestriction) {
     v8::RegisterExtension(extension);
     V8ExtensionInfo info = {schemeRestriction, extension};
     m_extensions.push_back(info);
 }
 
 }  // namespace WebCore