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

Unified Diff: Source/bindings/v8/V8DOMActivityLogger.cpp

Issue 257803006: Fixing wrong extension ID in Activity Log entries. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: moved ActivityLogger to V8PerContextData Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: Source/bindings/v8/V8DOMActivityLogger.cpp
diff --git a/Source/bindings/v8/V8DOMActivityLogger.cpp b/Source/bindings/v8/V8DOMActivityLogger.cpp
index b2c7e2eaf85225e93c1b9774c59c4da09abfc666..b41244a9b37c543842d93a5486218bdcd5610ab3 100644
--- a/Source/bindings/v8/V8DOMActivityLogger.cpp
+++ b/Source/bindings/v8/V8DOMActivityLogger.cpp
@@ -6,29 +6,65 @@
#include "bindings/v8/V8DOMActivityLogger.h"
#include "bindings/v8/V8Binding.h"
+#include "platform/weborigin/KURL.h"
#include "wtf/HashMap.h"
+#include "wtf/MainThread.h"
+#include "wtf/text/StringHash.h"
namespace WebCore {
-typedef HashMap<int, OwnPtr<V8DOMActivityLogger>, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int> > DOMActivityLoggerMap;
+typedef HashMap<String, OwnPtr<V8DOMActivityLogger> > DOMActivityLoggerMapForMainWorld;
+typedef HashMap<int, OwnPtr<V8DOMActivityLogger>, WTF::IntHash<int>, WTF::UnsignedWithZeroKeyHashTraits<int> > DOMActivityLoggerMapForIsolatedWorld;
-static DOMActivityLoggerMap& domActivityLoggers()
+static DOMActivityLoggerMapForMainWorld& domActivityLoggersForMainWorld()
{
ASSERT(isMainThread());
- DEFINE_STATIC_LOCAL(DOMActivityLoggerMap, map, ());
+ DEFINE_STATIC_LOCAL(DOMActivityLoggerMapForMainWorld, map, ());
return map;
}
-void V8DOMActivityLogger::setActivityLogger(int worldId, PassOwnPtr<V8DOMActivityLogger> logger)
+static DOMActivityLoggerMapForIsolatedWorld& domActivityLoggersForIsolatedWorld()
{
- domActivityLoggers().set(worldId, logger);
+ ASSERT(isMainThread());
+ DEFINE_STATIC_LOCAL(DOMActivityLoggerMapForIsolatedWorld, map, ());
+ return map;
+}
+
+void V8DOMActivityLogger::setActivityLogger(int worldId, const String& extensionId, PassOwnPtr<V8DOMActivityLogger> logger)
+{
+ if (worldId) {
+ domActivityLoggersForIsolatedWorld().set(worldId, logger);
+ } else {
+ domActivityLoggersForMainWorld().set(extensionId, logger);
+ }
}
-V8DOMActivityLogger* V8DOMActivityLogger::activityLogger(int worldId)
+V8DOMActivityLogger* V8DOMActivityLogger::activityLogger(int worldId, const String& extensionId)
{
- DOMActivityLoggerMap& loggers = domActivityLoggers();
- DOMActivityLoggerMap::iterator it = loggers.find(worldId);
+ if (worldId) {
+ DOMActivityLoggerMapForIsolatedWorld& loggers = domActivityLoggersForIsolatedWorld();
+ DOMActivityLoggerMapForIsolatedWorld::iterator it = loggers.find(worldId);
+ return it == loggers.end() ? 0 : it->value.get();
+ }
+
+ DOMActivityLoggerMapForMainWorld& loggers = domActivityLoggersForMainWorld();
+ DOMActivityLoggerMapForMainWorld::iterator it = loggers.find(extensionId);
return it == loggers.end() ? 0 : it->value.get();
}
+V8DOMActivityLogger* V8DOMActivityLogger::activityLogger(int worldId, const KURL& url)
+{
+ // extension ID is ignored for worldId != 0.
+ if (worldId)
+ return activityLogger(worldId, String());
+
+ // To find an activity logger that corresponds to the main world of an
+ // extension, we need to obtain the extension ID. Extension ID is a hostname
+ // of a background page's URL.
+ if (!url.protocolIs("chrome-extension"))
+ return 0;
+
+ return activityLogger(worldId, url.host());
+}
+
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698