| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008, 2009, 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 #include <v8.h> | 51 #include <v8.h> |
| 52 | 52 |
| 53 namespace WebCore { | 53 namespace WebCore { |
| 54 | 54 |
| 55 void V8XMLHttpRequest::constructorCustom(const v8::FunctionCallbackInfo<v8::Valu
e>& info) | 55 void V8XMLHttpRequest::constructorCustom(const v8::FunctionCallbackInfo<v8::Valu
e>& info) |
| 56 { | 56 { |
| 57 ExecutionContext* context = currentExecutionContext(info.GetIsolate()); | 57 ExecutionContext* context = currentExecutionContext(info.GetIsolate()); |
| 58 | 58 |
| 59 RefPtr<SecurityOrigin> securityOrigin; | 59 RefPtr<SecurityOrigin> securityOrigin; |
| 60 if (context->isDocument()) { | 60 if (context->isDocument()) { |
| 61 DOMWrapperWorld* world = DOMWrapperWorld::current(info.GetIsolate()); | 61 if (DOMWrapperWorld* world = isolatedWorldForEnteredContext(info.GetIsol
ate())) |
| 62 if (world->isIsolatedWorld()) | |
| 63 securityOrigin = world->isolatedWorldSecurityOrigin(); | 62 securityOrigin = world->isolatedWorldSecurityOrigin(); |
| 64 } | 63 } |
| 65 | 64 |
| 66 RefPtr<XMLHttpRequest> xmlHttpRequest = XMLHttpRequest::create(context, secu
rityOrigin); | 65 RefPtr<XMLHttpRequest> xmlHttpRequest = XMLHttpRequest::create(context, secu
rityOrigin); |
| 67 | 66 |
| 68 v8::Handle<v8::Object> wrapper = info.Holder(); | 67 v8::Handle<v8::Object> wrapper = info.Holder(); |
| 69 V8DOMWrapper::associateObjectWithWrapper<V8XMLHttpRequest>(xmlHttpRequest.re
lease(), &wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dep
endent); | 68 V8DOMWrapper::associateObjectWithWrapper<V8XMLHttpRequest>(xmlHttpRequest.re
lease(), &wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dep
endent); |
| 70 info.GetReturnValue().Set(wrapper); | 69 info.GetReturnValue().Set(wrapper); |
| 71 } | 70 } |
| 72 | 71 |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } else { | 245 } else { |
| 247 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>
, argString, arg); | 246 V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithNullCheck>
, argString, arg); |
| 248 xmlHttpRequest->send(argString, exceptionState); | 247 xmlHttpRequest->send(argString, exceptionState); |
| 249 } | 248 } |
| 250 } | 249 } |
| 251 | 250 |
| 252 exceptionState.throwIfNeeded(); | 251 exceptionState.throwIfNeeded(); |
| 253 } | 252 } |
| 254 | 253 |
| 255 } // namespace WebCore | 254 } // namespace WebCore |
| OLD | NEW |