Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(71)

Side by Side Diff: Source/bindings/v8/DOMDataStore.cpp

Issue 26792002: Reland: Reland: Implement new Blink IDL attribute [SetReference] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 return &mainWorldDOMDataStore; 58 return &mainWorldDOMDataStore;
59 } 59 }
60 60
61 DOMDataStore* DOMDataStore::current(v8::Isolate* isolate) 61 DOMDataStore* DOMDataStore::current(v8::Isolate* isolate)
62 { 62 {
63 V8PerIsolateData* data = isolate ? V8PerIsolateData::from(isolate) : V8PerIs olateData::current(); 63 V8PerIsolateData* data = isolate ? V8PerIsolateData::from(isolate) : V8PerIs olateData::current();
64 if (UNLIKELY(!!data->workerDOMDataStore())) 64 if (UNLIKELY(!!data->workerDOMDataStore()))
65 return data->workerDOMDataStore(); 65 return data->workerDOMDataStore();
66 66
67 if (DOMWrapperWorld::isolatedWorldsExist()) { 67 if (DOMWrapperWorld::isolatedWorldsExist()) {
68 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Cont ext::GetEntered()); 68 v8::Local<v8::Context> context = v8::Context::GetEntered();
69 if (UNLIKELY(!!isolatedWorld)) 69 if (!context.IsEmpty()) {
haraken 2013/10/25 05:21:23 This change makes sense. "If there is no entered c
70 return isolatedWorld->isolatedWorldDOMDataStore(); 70 DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(cont ext);
71 if (UNLIKELY(!!isolatedWorld))
72 return isolatedWorld->isolatedWorldDOMDataStore();
73 }
71 } 74 }
72 75
73 return mainWorldStore(); 76 return mainWorldStore();
74 } 77 }
75 78
76 } // namespace WebCore 79 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698