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

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

Issue 2727843003: Replace RELEASE_ASSERT with CHECK in core/{dom,editing,html} (Closed)
Patch Set: Add a comment Created 3 years, 9 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 PluginView* pluginView() const; 68 PluginView* pluginView() const;
69 69
70 Member<HTMLEmbedElement> m_embedElement; 70 Member<HTMLEmbedElement> m_embedElement;
71 }; 71 };
72 72
73 void PluginDocumentParser::createDocumentStructure() { 73 void PluginDocumentParser::createDocumentStructure() {
74 // FIXME: Assert we have a loader to figure out why the original null checks 74 // FIXME: Assert we have a loader to figure out why the original null checks
75 // and assert were added for the security bug in 75 // and assert were added for the security bug in
76 // http://trac.webkit.org/changeset/87566 76 // http://trac.webkit.org/changeset/87566
77 DCHECK(document()); 77 DCHECK(document());
78 RELEASE_ASSERT(document()->loader()); 78 CHECK(document()->loader());
79 79
80 LocalFrame* frame = document()->frame(); 80 LocalFrame* frame = document()->frame();
81 if (!frame) 81 if (!frame)
82 return; 82 return;
83 83
84 // FIXME: Why does this check settings? 84 // FIXME: Why does this check settings?
85 if (!frame->settings() || 85 if (!frame->settings() ||
86 !frame->loader().allowPlugins(NotAboutToInstantiatePlugin)) 86 !frame->loader().allowPlugins(NotAboutToInstantiatePlugin))
87 return; 87 return;
88 88
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 m_pluginNode = nullptr; 200 m_pluginNode = nullptr;
201 HTMLDocument::shutdown(); 201 HTMLDocument::shutdown();
202 } 202 }
203 203
204 DEFINE_TRACE(PluginDocument) { 204 DEFINE_TRACE(PluginDocument) {
205 visitor->trace(m_pluginNode); 205 visitor->trace(m_pluginNode);
206 HTMLDocument::trace(visitor); 206 HTMLDocument::trace(visitor);
207 } 207 }
208 208
209 } // namespace blink 209 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/ImageDocument.cpp ('k') | third_party/WebKit/Source/core/html/forms/FormController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698