OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 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 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
426 { | 426 { |
427 if (!DOMWrapperWorld::isolatedWorldsExist()) | 427 if (!DOMWrapperWorld::isolatedWorldsExist()) |
428 return MainWorld; | 428 return MainWorld; |
429 ASSERT(!v8::Context::GetEntered().IsEmpty()); | 429 ASSERT(!v8::Context::GetEntered().IsEmpty()); |
430 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context: :GetEntered()); | 430 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context: :GetEntered()); |
431 if (isolatedWorld) | 431 if (isolatedWorld) |
432 return IsolatedWorld; | 432 return IsolatedWorld; |
433 return MainWorld; | 433 return MainWorld; |
434 } | 434 } |
435 | 435 |
436 DOMWrapperWorld* worldForIsolate(v8::Isolate* isolate) | |
marja
2013/06/13 13:56:29
The name is slightly confusing, since this only re
adamk
2013/06/13 18:55:07
Renamed to isolatedWorldForIsolate(). Also changed
| |
437 { | |
438 V8PerIsolateData* data = V8PerIsolateData::from(isolate); | |
439 if (data->workerDOMDataStore()) | |
440 return 0; | |
441 if (!DOMWrapperWorld::isolatedWorldsExist()) | |
442 return 0; | |
443 ASSERT(!v8::Context::GetEntered().IsEmpty()); | |
444 if (DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Cont ext::GetEntered())) | |
marja
2013/06/13 13:56:29
Shorter (instead of these 3 lines):
return DOMWra
adamk
2013/06/13 18:55:07
Fixed, this was an artifact of a previous version
| |
445 return isolatedWorld; | |
446 return 0; | |
447 } | |
448 | |
436 } // namespace WebCore | 449 } // namespace WebCore |
OLD | NEW |