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

Side by Side Diff: Source/core/frame/LocalDOMWindow.cpp

Issue 362133003: Revert of Refactoring activity logger Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « Source/core/dom/Document.idl ('k') | Source/core/frame/Location.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 15 matching lines...) Expand all
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/frame/LocalDOMWindow.h" 28 #include "core/frame/LocalDOMWindow.h"
29 29
30 #include "bindings/core/v8/ExceptionMessages.h" 30 #include "bindings/core/v8/ExceptionMessages.h"
31 #include "bindings/core/v8/ExceptionState.h" 31 #include "bindings/core/v8/ExceptionState.h"
32 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 32 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
33 #include "bindings/core/v8/ScriptCallStackFactory.h" 33 #include "bindings/core/v8/ScriptCallStackFactory.h"
34 #include "bindings/core/v8/ScriptController.h" 34 #include "bindings/core/v8/ScriptController.h"
35 #include "bindings/core/v8/SerializedScriptValue.h" 35 #include "bindings/core/v8/SerializedScriptValue.h"
36 #include "bindings/core/v8/V8DOMActivityLogger.h"
37 #include "core/css/CSSComputedStyleDeclaration.h" 36 #include "core/css/CSSComputedStyleDeclaration.h"
38 #include "core/css/CSSRuleList.h" 37 #include "core/css/CSSRuleList.h"
39 #include "core/css/DOMWindowCSS.h" 38 #include "core/css/DOMWindowCSS.h"
40 #include "core/css/MediaQueryList.h" 39 #include "core/css/MediaQueryList.h"
41 #include "core/css/MediaQueryMatcher.h" 40 #include "core/css/MediaQueryMatcher.h"
42 #include "core/css/StyleMedia.h" 41 #include "core/css/StyleMedia.h"
43 #include "core/css/resolver/StyleResolver.h" 42 #include "core/css/resolver/StyleResolver.h"
44 #include "core/dom/ContextFeatures.h" 43 #include "core/dom/ContextFeatures.h"
45 #include "core/dom/DOMImplementation.h" 44 #include "core/dom/DOMImplementation.h"
46 #include "core/dom/Document.h" 45 #include "core/dom/Document.h"
(...skipping 1640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1687 if (!firstFrame) 1686 if (!firstFrame)
1688 return; 1687 return;
1689 1688
1690 KURL completedURL = firstFrame->document()->completeURL(urlString); 1689 KURL completedURL = firstFrame->document()->completeURL(urlString);
1691 if (completedURL.isNull()) 1690 if (completedURL.isNull())
1692 return; 1691 return;
1693 1692
1694 if (isInsecureScriptAccess(*callingWindow, completedURL)) 1693 if (isInsecureScriptAccess(*callingWindow, completedURL))
1695 return; 1694 return;
1696 1695
1697 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivityLo ggerIfIsolatedWorld();
1698 if (activityLogger) {
1699 Vector<String> argv;
1700 argv.append("LocalDOMWindow");
1701 argv.append("url");
1702 argv.append(firstFrame->document()->url());
1703 argv.append(completedURL);
1704 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data());
1705 }
1706
1707 // We want a new history item if we are processing a user gesture. 1696 // We want a new history item if we are processing a user gesture.
1708 m_frame->navigationScheduler().scheduleLocationChange(activeDocument, 1697 m_frame->navigationScheduler().scheduleLocationChange(activeDocument,
1709 // FIXME: What if activeDocument()->frame() is 0? 1698 // FIXME: What if activeDocument()->frame() is 0?
1710 completedURL, Referrer(activeDocument->outgoingReferrer(), activeDocumen t->referrerPolicy()), 1699 completedURL, Referrer(activeDocument->outgoingReferrer(), activeDocumen t->referrerPolicy()),
1711 locking != LockHistoryBasedOnGestureState); 1700 locking != LockHistoryBasedOnGestureState);
1712 } 1701 }
1713 1702
1714 void LocalDOMWindow::printErrorMessage(const String& message) 1703 void LocalDOMWindow::printErrorMessage(const String& message)
1715 { 1704 {
1716 if (message.isEmpty()) 1705 if (message.isEmpty())
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1941 visitor->trace(m_localStorage); 1930 visitor->trace(m_localStorage);
1942 visitor->trace(m_applicationCache); 1931 visitor->trace(m_applicationCache);
1943 visitor->trace(m_performance); 1932 visitor->trace(m_performance);
1944 visitor->trace(m_css); 1933 visitor->trace(m_css);
1945 visitor->trace(m_eventQueue); 1934 visitor->trace(m_eventQueue);
1946 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); 1935 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor);
1947 EventTargetWithInlineData::trace(visitor); 1936 EventTargetWithInlineData::trace(visitor);
1948 } 1937 }
1949 1938
1950 } // namespace WebCore 1939 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/Document.idl ('k') | Source/core/frame/Location.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698