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

Side by Side Diff: third_party/WebKit/Source/web/WebHelperPluginImpl.cpp

Issue 1362973004: Rename FROM_HERE to BLINK_FROM_HERE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 2 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 delete this; 98 delete this;
99 } 99 }
100 100
101 void WebHelperPluginImpl::destroy() 101 void WebHelperPluginImpl::destroy()
102 { 102 {
103 // Defer deletion so we don't do too much work when called via stopActiveDOM Objects(). 103 // Defer deletion so we don't do too much work when called via stopActiveDOM Objects().
104 // FIXME: It's not clear why we still need this. The original code held a Pa ge and a 104 // FIXME: It's not clear why we still need this. The original code held a Pa ge and a
105 // WebFrame, and destroying it would cause JavaScript triggered by frame det ach to run, 105 // WebFrame, and destroying it would cause JavaScript triggered by frame det ach to run,
106 // which isn't allowed inside stopActiveDOMObjects(). Removing this causes o ne Chrome test 106 // which isn't allowed inside stopActiveDOMObjects(). Removing this causes o ne Chrome test
107 // to fail with a timeout. 107 // to fail with a timeout.
108 m_destructionTimer.startOneShot(0, FROM_HERE); 108 m_destructionTimer.startOneShot(0, BLINK_FROM_HERE);
109 } 109 }
110 110
111 WebPlugin* WebHelperPluginImpl::getPlugin() 111 WebPlugin* WebHelperPluginImpl::getPlugin()
112 { 112 {
113 ASSERT(m_pluginContainer); 113 ASSERT(m_pluginContainer);
114 ASSERT(m_pluginContainer->plugin()); 114 ASSERT(m_pluginContainer->plugin());
115 return m_pluginContainer->plugin(); 115 return m_pluginContainer->plugin();
116 } 116 }
117 117
118 } // namespace blink 118 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | third_party/WebKit/Source/web/WebKit.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698