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

Side by Side Diff: third_party/WebKit/Source/core/html/PluginDocument.cpp

Issue 1942623002: Rename Document::ownerElement to localOwner and fix main frame checks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed const changes and some gratuitous checks Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 return 0; 162 return 0;
163 } 163 }
164 164
165 PluginDocument::PluginDocument(const DocumentInit& initializer) 165 PluginDocument::PluginDocument(const DocumentInit& initializer)
166 : HTMLDocument(initializer, PluginDocumentClass) 166 : HTMLDocument(initializer, PluginDocumentClass)
167 { 167 {
168 setCompatibilityMode(QuirksMode); 168 setCompatibilityMode(QuirksMode);
169 lockCompatibilityMode(); 169 lockCompatibilityMode();
170 UseCounter::count(*this, UseCounter::PluginDocument); 170 UseCounter::count(*this, UseCounter::PluginDocument);
171 if (ownerElement()) 171 if (!isInMainFrame())
172 UseCounter::count(*this, UseCounter::PluginDocumentInFrame); 172 UseCounter::count(*this, UseCounter::PluginDocumentInFrame);
173 } 173 }
174 174
175 DocumentParser* PluginDocument::createParser() 175 DocumentParser* PluginDocument::createParser()
176 { 176 {
177 return PluginDocumentParser::create(this); 177 return PluginDocumentParser::create(this);
178 } 178 }
179 179
180 Widget* PluginDocument::pluginWidget() 180 Widget* PluginDocument::pluginWidget()
181 { 181 {
(...skipping 16 matching lines...) Expand all
198 HTMLDocument::detach(context); 198 HTMLDocument::detach(context);
199 } 199 }
200 200
201 DEFINE_TRACE(PluginDocument) 201 DEFINE_TRACE(PluginDocument)
202 { 202 {
203 visitor->trace(m_pluginNode); 203 visitor->trace(m_pluginNode);
204 HTMLDocument::trace(visitor); 204 HTMLDocument::trace(visitor);
205 } 205 }
206 206
207 } // namespace blink 207 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/MediaDocument.cpp ('k') | third_party/WebKit/Source/core/html/TextDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698