Have DOMDataStore::current() return a reference

Source/bindings/v8/DOMDataStore.cpp

 /*
  * Copyright (C) 2009 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 33 matching lines @@
     V8PerIsolateData::current()->registerDOMDataStore(this);
 }
 
 DOMDataStore::~DOMDataStore()
 {
     ASSERT(m_type != MainWorld); // We never actually destruct the main world's DOMDataStore.
     V8PerIsolateData::current()->unregisterDOMDataStore(this);
     m_wrapperMap.clear();
 }
 
-DOMDataStore* DOMDataStore::mainWorldStore()
+DOMDataStore& DOMDataStore::mainWorldStore()
 {
     DEFINE_STATIC_LOCAL(DOMDataStore, mainWorldDOMDataStore, (MainWorld));
     ASSERT(isMainThread());
-    return &mainWorldDOMDataStore;
+    return mainWorldDOMDataStore;
 }
 
-DOMDataStore* DOMDataStore::current(v8::Isolate* isolate)
+DOMDataStore& DOMDataStore::current(v8::Isolate* isolate)
 {
     V8PerIsolateData* data = isolate ? V8PerIsolateData::from(isolate) : V8PerIsolateData::current();
     if (UNLIKELY(!!data->workerDOMDataStore()))
-        return data->workerDOMDataStore();
+        return *data->workerDOMDataStore();
 
     if (DOMWrapperWorld::isolatedWorldsExist()) {
         DOMWrapperWorld* isolatedWorld = DOMWrapperWorld::isolatedWorld(v8::Context::GetEntered());
         if (UNLIKELY(!!isolatedWorld))
             return isolatedWorld->isolatedWorldDOMDataStore();
     }
 
     return mainWorldStore();
 }
 
 } // namespace WebCore