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

Side by Side Diff: Source/core/html/HTMLIFrameElement.cpp

Issue 355363002: Revert of Adds AL logging for Blink core events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: manually fix conflict in Document.idl 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/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLInputElement.cpp » ('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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2009 Ericsson AB. All rights reserved. 7 * Copyright (C) 2009 Ericsson AB. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
11 * License as published by the Free Software Foundation; either 11 * License as published by the Free Software Foundation; either
12 * version 2 of the License, or (at your option) any later version. 12 * version 2 of the License, or (at your option) any later version.
13 * 13 *
14 * This library is distributed in the hope that it will be useful, 14 * This library is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17 * Library General Public License for more details. 17 * Library General Public License for more details.
18 * 18 *
19 * You should have received a copy of the GNU Library General Public License 19 * You should have received a copy of the GNU Library General Public License
20 * along with this library; see the file COPYING.LIB. If not, write to 20 * along with this library; see the file COPYING.LIB. If not, write to
21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
22 * Boston, MA 02110-1301, USA. 22 * Boston, MA 02110-1301, USA.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "core/html/HTMLIFrameElement.h" 26 #include "core/html/HTMLIFrameElement.h"
27 27
28 #include "bindings/v8/V8DOMActivityLogger.h"
29 #include "core/CSSPropertyNames.h" 28 #include "core/CSSPropertyNames.h"
30 #include "core/HTMLNames.h" 29 #include "core/HTMLNames.h"
31 #include "core/html/HTMLDocument.h" 30 #include "core/html/HTMLDocument.h"
32 #include "core/rendering/RenderIFrame.h" 31 #include "core/rendering/RenderIFrame.h"
33 32
34 namespace WebCore { 33 namespace WebCore {
35 34
36 using namespace HTMLNames; 35 using namespace HTMLNames;
37 36
38 inline HTMLIFrameElement::HTMLIFrameElement(Document& document) 37 inline HTMLIFrameElement::HTMLIFrameElement(Document& document)
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 return isURLAllowed() && HTMLElement::rendererIsNeeded(style); 93 return isURLAllowed() && HTMLElement::rendererIsNeeded(style);
95 } 94 }
96 95
97 RenderObject* HTMLIFrameElement::createRenderer(RenderStyle*) 96 RenderObject* HTMLIFrameElement::createRenderer(RenderStyle*)
98 { 97 {
99 return new RenderIFrame(this); 98 return new RenderIFrame(this);
100 } 99 }
101 100
102 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint) 101 Node::InsertionNotificationRequest HTMLIFrameElement::insertedInto(ContainerNode * insertionPoint)
103 { 102 {
104 if (insertionPoint->inDocument()) {
105 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld();
106 if (activityLogger) {
107 Vector<String> argv;
108 argv.append("iframe");
109 argv.append(fastGetAttribute(srcAttr));
110 activityLogger->logEvent("blinkAddElement", argv.size(), argv.data() );
111 }
112 }
113 InsertionNotificationRequest result = HTMLFrameElementBase::insertedInto(ins ertionPoint); 103 InsertionNotificationRequest result = HTMLFrameElementBase::insertedInto(ins ertionPoint);
114 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree()) 104 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree())
115 toHTMLDocument(document()).addExtraNamedItem(m_name); 105 toHTMLDocument(document()).addExtraNamedItem(m_name);
116 return result; 106 return result;
117 } 107 }
118 108
119 void HTMLIFrameElement::removedFrom(ContainerNode* insertionPoint) 109 void HTMLIFrameElement::removedFrom(ContainerNode* insertionPoint)
120 { 110 {
121 HTMLFrameElementBase::removedFrom(insertionPoint); 111 HTMLFrameElementBase::removedFrom(insertionPoint);
122 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree()) 112 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree())
123 toHTMLDocument(document()).removeExtraNamedItem(m_name); 113 toHTMLDocument(document()).removeExtraNamedItem(m_name);
124 } 114 }
125 115
126 bool HTMLIFrameElement::isInteractiveContent() const 116 bool HTMLIFrameElement::isInteractiveContent() const
127 { 117 {
128 return true; 118 return true;
129 } 119 }
130 120
131 } 121 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLFormElement.cpp ('k') | Source/core/html/HTMLInputElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698