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

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

Issue 362073004: 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/html/HTMLIFrameElement.h ('k') | Source/core/html/HTMLIFrameElement.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) 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
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // LocalFrame border doesn't really match the HTML4 spec definition for iframes. It simply adds 63 // LocalFrame border doesn't really match the HTML4 spec definition for iframes. It simply adds
64 // a presentational hint that the border should be off if set to zero. 64 // a presentational hint that the border should be off if set to zero.
65 if (!value.toInt()) { 65 if (!value.toInt()) {
66 // Add a rule that nulls out our border width. 66 // Add a rule that nulls out our border width.
67 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidt h, 0, CSSPrimitiveValue::CSS_PX); 67 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderWidt h, 0, CSSPrimitiveValue::CSS_PX);
68 } 68 }
69 } else 69 } else
70 HTMLFrameElementBase::collectStyleForPresentationAttribute(name, value, style); 70 HTMLFrameElementBase::collectStyleForPresentationAttribute(name, value, style);
71 } 71 }
72 72
73 void HTMLIFrameElement::attributeWillChange(const QualifiedName& name, const Ato micString& oldValue, const AtomicString& newValue)
74 {
75 if (name == srcAttr && inDocument()) {
76 V8DOMActivityLogger* activityLogger = V8DOMActivityLogger::currentActivi tyLoggerIfIsolatedWorld();
77 if (activityLogger) {
78 Vector<String> argv;
79 argv.append("iframe");
80 argv.append(srcAttr.toString());
81 argv.append(oldValue);
82 argv.append(newValue);
83 activityLogger->logEvent("blinkSetAttribute", argv.size(), argv.data ());
84 }
85 }
86 HTMLFrameElementBase::attributeWillChange(name, oldValue, newValue);
87 }
88
89 void HTMLIFrameElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value) 73 void HTMLIFrameElement::parseAttribute(const QualifiedName& name, const AtomicSt ring& value)
90 { 74 {
91 if (name == nameAttr) { 75 if (name == nameAttr) {
92 if (inDocument() && document().isHTMLDocument() && !isInShadowTree()) { 76 if (inDocument() && document().isHTMLDocument() && !isInShadowTree()) {
93 HTMLDocument& document = toHTMLDocument(this->document()); 77 HTMLDocument& document = toHTMLDocument(this->document());
94 document.removeExtraNamedItem(m_name); 78 document.removeExtraNamedItem(m_name);
95 document.addExtraNamedItem(value); 79 document.addExtraNamedItem(value);
96 } 80 }
97 m_name = value; 81 m_name = value;
98 } else if (name == sandboxAttr) { 82 } else if (name == sandboxAttr) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree()) 122 if (insertionPoint->inDocument() && document().isHTMLDocument() && !insertio nPoint->isInShadowTree())
139 toHTMLDocument(document()).removeExtraNamedItem(m_name); 123 toHTMLDocument(document()).removeExtraNamedItem(m_name);
140 } 124 }
141 125
142 bool HTMLIFrameElement::isInteractiveContent() const 126 bool HTMLIFrameElement::isInteractiveContent() const
143 { 127 {
144 return true; 128 return true;
145 } 129 }
146 130
147 } 131 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLIFrameElement.h ('k') | Source/core/html/HTMLIFrameElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698