| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 RefPtr<SecurityOrigin> securityOrigin; | 59 RefPtr<SecurityOrigin> securityOrigin; |
| 60 if (context->isDocument()) { | 60 if (context->isDocument()) { |
| 61 DOMWrapperWorld& world = DOMWrapperWorld::current(info.GetIsolate()); | 61 DOMWrapperWorld& world = DOMWrapperWorld::current(info.GetIsolate()); |
| 62 if (world.isIsolatedWorld()) | 62 if (world.isIsolatedWorld()) |
| 63 securityOrigin = world.isolatedWorldSecurityOrigin(); | 63 securityOrigin = world.isolatedWorldSecurityOrigin(); |
| 64 } | 64 } |
| 65 | 65 |
| 66 RefPtrWillBeRawPtr<XMLHttpRequest> xmlHttpRequest = XMLHttpRequest::create(c
ontext, securityOrigin); | 66 RefPtrWillBeRawPtr<XMLHttpRequest> xmlHttpRequest = XMLHttpRequest::create(c
ontext, securityOrigin); |
| 67 | 67 |
| 68 v8::Handle<v8::Object> wrapper = info.Holder(); | 68 v8::Handle<v8::Object> wrapper = info.Holder(); |
| 69 xmlHttpRequest->associateWithWrapper(xmlHttpRequest->wrapperTypeInfo(), wrap
per, info.GetIsolate()); | 69 xmlHttpRequest->associateWithWrapper(info.GetIsolate(), xmlHttpRequest->wrap
perTypeInfo(), wrapper); |
| 70 info.GetReturnValue().Set(wrapper); | 70 info.GetReturnValue().Set(wrapper); |
| 71 } | 71 } |
| 72 | 72 |
| 73 void V8XMLHttpRequest::responseTextAttributeGetterCustom(const v8::PropertyCallb
ackInfo<v8::Value>& info) | 73 void V8XMLHttpRequest::responseTextAttributeGetterCustom(const v8::PropertyCallb
ackInfo<v8::Value>& info) |
| 74 { | 74 { |
| 75 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); | 75 XMLHttpRequest* xmlHttpRequest = V8XMLHttpRequest::toImpl(info.Holder()); |
| 76 ExceptionState exceptionState(ExceptionState::GetterContext, "responseText",
"XMLHttpRequest", info.Holder(), info.GetIsolate()); | 76 ExceptionState exceptionState(ExceptionState::GetterContext, "responseText",
"XMLHttpRequest", info.Holder(), info.GetIsolate()); |
| 77 ScriptString text = xmlHttpRequest->responseText(exceptionState); | 77 ScriptString text = xmlHttpRequest->responseText(exceptionState); |
| 78 if (exceptionState.throwIfNeeded()) | 78 if (exceptionState.throwIfNeeded()) |
| 79 return; | 79 return; |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 } else { | 247 } else { |
| 248 TOSTRING_VOID(V8StringResource<TreatNullAsNullString>, argString, ar
g); | 248 TOSTRING_VOID(V8StringResource<TreatNullAsNullString>, argString, ar
g); |
| 249 xmlHttpRequest->send(argString, exceptionState); | 249 xmlHttpRequest->send(argString, exceptionState); |
| 250 } | 250 } |
| 251 } | 251 } |
| 252 | 252 |
| 253 exceptionState.throwIfNeeded(); | 253 exceptionState.throwIfNeeded(); |
| 254 } | 254 } |
| 255 | 255 |
| 256 } // namespace blink | 256 } // namespace blink |
| OLD | NEW |