Title: [156133] trunk/Source/WebCore
- Revision
- 156133
- Author
- [email protected]
- Date
- 2013-09-19 18:10:03 -0700 (Thu, 19 Sep 2013)
Log Message
Remove #if !ENABLE(WORKERS) code in ThreadGlobalData
https://bugs.webkit.org/show_bug.cgi?id=121649
Reviewed by Sam Weinig.
This lets us remove a FIXME. Also, move threadGlobalData out of line; there's no need for it to be inline.
* WebCore.exp.in:
* platform/ThreadGlobalData.cpp:
(WebCore::threadGlobalData):
* platform/ThreadGlobalData.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (156132 => 156133)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 01:00:19 UTC (rev 156132)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 01:10:03 UTC (rev 156133)
@@ -1,5 +1,19 @@
2013-09-19 Anders Carlsson <[email protected]>
+ Remove #if !ENABLE(WORKERS) code in ThreadGlobalData
+ https://bugs.webkit.org/show_bug.cgi?id=121649
+
+ Reviewed by Sam Weinig.
+
+ This lets us remove a FIXME. Also, move threadGlobalData out of line; there's no need for it to be inline.
+
+ * WebCore.exp.in:
+ * platform/ThreadGlobalData.cpp:
+ (WebCore::threadGlobalData):
+ * platform/ThreadGlobalData.h:
+
+2013-09-19 Anders Carlsson <[email protected]>
+
Modernize Length setters/getters
https://bugs.webkit.org/show_bug.cgi?id=121647
Modified: trunk/Source/WebCore/WebCore.exp.in (156132 => 156133)
--- trunk/Source/WebCore/WebCore.exp.in 2013-09-20 01:00:19 UTC (rev 156132)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-09-20 01:10:03 UTC (rev 156133)
@@ -571,6 +571,7 @@
__ZN7WebCore16nextLinePositionERKNS_15VisiblePositionEiNS_12EditableTypeE
__ZN7WebCore16scriptNameToCodeERKN3WTF6StringE
__ZN7WebCore16startOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
+__ZN7WebCore16threadGlobalDataEv
__ZN7WebCore17CredentialStorage24getFromPersistentStorageERKNS_15ProtectionSpaceE
__ZN7WebCore17CredentialStorage3getERKNS_15ProtectionSpaceE
__ZN7WebCore17DOMImplementation13isXMLMIMETypeERKN3WTF6StringE
Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (156132 => 156133)
--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2013-09-20 01:00:19 UTC (rev 156132)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2013-09-20 01:10:03 UTC (rev 156133)
@@ -104,4 +104,11 @@
m_threadTimers.clear();
}
+ThreadGlobalData& threadGlobalData()
+{
+ if (!ThreadGlobalData::staticData)
+ ThreadGlobalData::staticData = new ThreadSpecific<ThreadGlobalData>;
+ return **ThreadGlobalData::staticData;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/ThreadGlobalData.h (156132 => 156133)
--- trunk/Source/WebCore/platform/ThreadGlobalData.h 2013-09-20 01:00:19 UTC (rev 156132)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.h 2013-09-20 01:10:03 UTC (rev 156133)
@@ -101,25 +101,7 @@
friend ThreadGlobalData& threadGlobalData();
};
-inline ThreadGlobalData& threadGlobalData()
-{
- // FIXME: Workers are not necessarily the only feature that make per-thread global data necessary.
- // We need to check for e.g. database objects manipulating strings on secondary threads.
-
-#if ENABLE(WORKERS)
- // ThreadGlobalData is used on main thread before it could possibly be used on secondary ones, so there is no need for synchronization here.
- if (!ThreadGlobalData::staticData)
- ThreadGlobalData::staticData = new ThreadSpecific<ThreadGlobalData>;
- return **ThreadGlobalData::staticData;
-#else
- if (!ThreadGlobalData::staticData) {
- ThreadGlobalData::staticData = static_cast<ThreadGlobalData*>(fastMalloc(sizeof(ThreadGlobalData)));
- // ThreadGlobalData constructor indirectly uses staticData, so we need to set up the memory before invoking it.
- new (NotNull, ThreadGlobalData::staticData) ThreadGlobalData;
- }
- return *ThreadGlobalData::staticData;
-#endif
-}
+ThreadGlobalData& threadGlobalData();
} // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
