Title: [132669] trunk/Source/WebCore
- Revision
- 132669
- Author
- [email protected]
- Date
- 2012-10-26 09:25:52 -0700 (Fri, 26 Oct 2012)
Log Message
[BlackBerry] Extending existing ThreadUnsafe singletons in webkit to
Generic ThreadUnsafe Singleton
https://bugs.webkit.org/show_bug.cgi?id=100529
Patch by Parth Patel <[email protected]> on 2012-10-26
Reviewed by Yong Li.
No new tests added as there was no behavioural change.
* platform/network/blackberry/NetworkManager.cpp:
(WebCore):
* platform/network/blackberry/NetworkManager.h:
(NetworkManager):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132668 => 132669)
--- trunk/Source/WebCore/ChangeLog 2012-10-26 16:12:36 UTC (rev 132668)
+++ trunk/Source/WebCore/ChangeLog 2012-10-26 16:25:52 UTC (rev 132669)
@@ -1,3 +1,18 @@
+2012-10-26 Parth Patel <[email protected]>
+
+ [BlackBerry] Extending existing ThreadUnsafe singletons in webkit to
+ Generic ThreadUnsafe Singleton
+ https://bugs.webkit.org/show_bug.cgi?id=100529
+
+ Reviewed by Yong Li.
+
+ No new tests added as there was no behavioural change.
+
+ * platform/network/blackberry/NetworkManager.cpp:
+ (WebCore):
+ * platform/network/blackberry/NetworkManager.h:
+ (NetworkManager):
+
2012-10-26 Mike West <[email protected]>
Web Inspector: Fix log-type icon alignment.
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp (132668 => 132669)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2012-10-26 16:12:36 UTC (rev 132668)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp 2012-10-26 16:25:52 UTC (rev 132669)
@@ -42,15 +42,7 @@
namespace WebCore {
-NetworkManager* NetworkManager::instance()
-{
- static NetworkManager* sInstance;
- if (!sInstance) {
- sInstance = new NetworkManager;
- ASSERT(sInstance);
- }
- return sInstance;
-}
+SINGLETON_INITIALIZER_THREADUNSAFE(NetworkManager)
bool NetworkManager::startJob(int playerId, PassRefPtr<ResourceHandle> job, const Frame& frame, bool defersLoading)
{
Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.h (132668 => 132669)
--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.h 2012-10-26 16:12:36 UTC (rev 132668)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.h 2012-10-26 16:25:52 UTC (rev 132669)
@@ -22,6 +22,7 @@
#include "KURL.h"
#include "ResourceHandle.h"
+#include <BlackBerryPlatformSingleton.h>
#include <wtf/Vector.h>
namespace BlackBerry {
@@ -36,9 +37,9 @@
class Frame;
class NetworkJob;
-class NetworkManager {
+class NetworkManager : public BlackBerry::Platform::ThreadUnsafeSingleton<NetworkManager> {
+ SINGLETON_DEFINITION_THREADUNSAFE(NetworkManager)
public:
- static NetworkManager* instance();
void setInitialURL(const KURL& url) { m_initialURL = url; }
KURL initialURL() { return m_initialURL; }
bool startJob(int playerId, PassRefPtr<ResourceHandle> job, const Frame&, bool defersLoading);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
