Diff
Modified: trunk/Source/WebCore/ChangeLog (88277 => 88278)
--- trunk/Source/WebCore/ChangeLog 2011-06-07 22:45:14 UTC (rev 88277)
+++ trunk/Source/WebCore/ChangeLog 2011-06-07 22:51:20 UTC (rev 88278)
@@ -1,3 +1,19 @@
+2011-06-07 James Simonsen <[email protected]>
+
+ Unreviewed, build fix, missing files from r88274.
+
+ * bindings/v8/ChildThreadDOMData.cpp: Added.
+ (WebCore::ChildThreadDOMData::ChildThreadDOMData):
+ (WebCore::ChildThreadDOMData::getStore):
+ * bindings/v8/ChildThreadDOMData.h: Added.
+ * bindings/v8/MainThreadDOMData.cpp: Added.
+ (WebCore::MainThreadDOMData::MainThreadDOMData):
+ (WebCore::MainThreadDOMData::getCurrent):
+ (WebCore::MainThreadDOMData::getMainThreadStore):
+ (WebCore::MainThreadDOMData::getCurrentMainThreadStore):
+ * bindings/v8/MainThreadDOMData.h: Added.
+ (WebCore::MainThreadDOMData::getStore):
+
2011-06-07 Abhishek Arya <[email protected]>
Reviewed by Dan Bernstein.
Added: trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.cpp (0 => 88278)
--- trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.cpp 2011-06-07 22:51:20 UTC (rev 88278)
@@ -0,0 +1,48 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "ChildThreadDOMData.h"
+
+namespace WebCore {
+
+ChildThreadDOMData::ChildThreadDOMData()
+ : m_defaultStore(this)
+{
+}
+
+DOMDataStore& ChildThreadDOMData::getStore()
+{
+ ASSERT(!WTF::isMainThread());
+ // Currently, child threads have only one world.
+ return m_defaultStore;
+}
+
+} // namespace WebCore
Property changes on: trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.cpp
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.h (0 => 88278)
--- trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.h (rev 0)
+++ trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.h 2011-06-07 22:51:20 UTC (rev 88278)
@@ -0,0 +1,50 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ChildThreadDOMData_h
+#define ChildThreadDOMData_h
+
+#include "DOMData.h"
+#include "ScopedDOMDataStore.h"
+
+namespace WebCore {
+
+ class ChildThreadDOMData : public DOMData {
+ public:
+ ChildThreadDOMData();
+ DOMDataStore& getStore();
+
+ private:
+ ScopedDOMDataStore m_defaultStore;
+ };
+
+} // namespace WebCore
+
+#endif // ChildThreadDOMData_h
Property changes on: trunk/Source/WebCore/bindings/v8/ChildThreadDOMData.h
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebCore/bindings/v8/MainThreadDOMData.cpp (0 => 88278)
--- trunk/Source/WebCore/bindings/v8/MainThreadDOMData.cpp (rev 0)
+++ trunk/Source/WebCore/bindings/v8/MainThreadDOMData.cpp 2011-06-07 22:51:20 UTC (rev 88278)
@@ -0,0 +1,68 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MainThreadDOMData.h"
+
+#include "V8IsolatedContext.h"
+
+namespace WebCore {
+
+MainThreadDOMData::MainThreadDOMData()
+ : m_defaultStore(this)
+{
+}
+
+MainThreadDOMData* MainThreadDOMData::getCurrent()
+{
+ ASSERT(WTF::isMainThread());
+ DEFINE_STATIC_LOCAL(MainThreadDOMData, mainThreadDOMData, ());
+ return &mainThreadDOMData;
+}
+
+DOMDataStore& MainThreadDOMData::getMainThreadStore()
+{
+ // This is broken out as a separate non-virtual method from getStore()
+ // so that it can be inlined by getCurrentMainThreadStore, which is
+ // a hot spot in Dromaeo DOM tests.
+ ASSERT(WTF::isMainThread());
+ V8IsolatedContext* context = V8IsolatedContext::getEntered();
+ if (UNLIKELY(context != 0))
+ return *context->world()->domDataStore();
+ return m_defaultStore;
+}
+
+DOMDataStore& MainThreadDOMData::getCurrentMainThreadStore()
+{
+ return getCurrent()->getMainThreadStore();
+}
+
+
+} // namespace WebCore
Property changes on: trunk/Source/WebCore/bindings/v8/MainThreadDOMData.cpp
___________________________________________________________________
Added: svn:eol-style
Added: trunk/Source/WebCore/bindings/v8/MainThreadDOMData.h (0 => 88278)
--- trunk/Source/WebCore/bindings/v8/MainThreadDOMData.h (rev 0)
+++ trunk/Source/WebCore/bindings/v8/MainThreadDOMData.h 2011-06-07 22:51:20 UTC (rev 88278)
@@ -0,0 +1,57 @@
+/*
+ * 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
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MainThreadDOMData_h
+#define MainThreadDOMData_h
+
+#include "DOMData.h"
+#include "StaticDOMDataStore.h"
+
+namespace WebCore {
+
+ class MainThreadDOMData : public DOMData {
+ public:
+ static MainThreadDOMData* getCurrent(); // Caller must be on the main thread.
+ static DOMDataStore& getCurrentMainThreadStore();
+
+ virtual DOMDataStore& getStore() { return getMainThreadStore(); }
+
+
+ private:
+ MainThreadDOMData();
+ DOMDataStore& getMainThreadStore();
+
+ StaticDOMDataStore m_defaultStore;
+ // Note: The DOMDataStores for isolated world are owned by the world object.
+ };
+
+} // namespace WebCore
+
+#endif // MainThreadDOMData_h
Property changes on: trunk/Source/WebCore/bindings/v8/MainThreadDOMData.h
___________________________________________________________________
Added: svn:eol-style
