Fixing wrong extension ID in Activity Log entries.

Source/bindings/v8/V8WindowShell.cpp

 /*
  * Copyright (C) 2008, 2009, 2011 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 198 matching lines @@
             return false;
         }
     }
 
     if (!m_world->isMainWorld()) {
         V8WindowShell* mainWindow = m_frame->script().existingWindowShell(DOMWrapperWorld::mainWorld());
         if (mainWindow && !mainWindow->context().IsEmpty())
             setInjectedScriptContextDebugId(context, m_frame->script().contextDebugId(mainWindow->context()));
     }
 
-    m_scriptState->world().setActivityLogger(V8DOMActivityLogger::activityLogger(m_world->worldId()));
+    m_scriptState->setActivityLogger(V8DOMActivityLogger::activityLogger(m_world->worldId(),
+        m_frame->document() ? m_frame->document()->baseURI() : KURL()));

[haraken, 2014/05/08 02:38:32]

Is it possible that m_frame->document() is 0? If it's possible, what's an
expected behavior?

[pmarch, 2014/05/08 17:55:48]

I do not know if m_frame->document() can be 0 here. I could not force
m_frame->document() to be 0 when tested this patch. I placed this check just in
case as I saw that the code below does check for m_frame->document() == 0.
However, the code below calls updateDocument() which may set m_frame->document()
to 0, if this is the case my check is redundant.

On 2014/05/08 02:38:32, haraken wrote:

     if (!installDOMWindow()) {
         disposeContext(DoNotDetachGlobal);
         return false;
     }
 
     if (m_world->isMainWorld()) {
         updateDocument();
         if (m_frame->document()) {
             setSecurityToken(m_frame->document()->securityOrigin());
             ContentSecurityPolicy* csp = m_frame->document()->contentSecurityPolicy();
@@ skipping 254 matching lines @@
 
 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin)
 {
     ASSERT(m_world->isMainWorld());
     if (!isContextInitialized())
         return;
     setSecurityToken(origin);
 }
 
 } // WebCore