OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
271 static long long next = 0; | 271 static long long next = 0; |
272 return ++next; | 272 return ++next; |
273 } | 273 } |
274 | 274 |
275 WebPluginContainerImpl* WebFrameImpl::pluginContainerFromFrame(Frame* frame) | 275 WebPluginContainerImpl* WebFrameImpl::pluginContainerFromFrame(Frame* frame) |
276 { | 276 { |
277 if (!frame) | 277 if (!frame) |
278 return 0; | 278 return 0; |
279 if (!frame->document() || !frame->document()->isPluginDocument()) | 279 if (!frame->document() || !frame->document()->isPluginDocument()) |
280 return 0; | 280 return 0; |
281 PluginDocument* pluginDocument = static_cast<PluginDocument*>(frame->documen t()); | 281 PluginDocument* pluginDocument = toPluginDocument(frame->document()); |
tkent
2013/09/10 21:54:51
nit: We can remove a local variable |pluginDocumen
| |
282 return toPluginContainerImpl(pluginDocument->pluginWidget()); | 282 return toPluginContainerImpl(pluginDocument->pluginWidget()); |
283 } | 283 } |
284 | 284 |
285 WebPluginContainerImpl* WebFrameImpl::pluginContainerFromNode(WebCore::Frame* fr ame, const WebNode& node) | 285 WebPluginContainerImpl* WebFrameImpl::pluginContainerFromNode(WebCore::Frame* fr ame, const WebNode& node) |
286 { | 286 { |
287 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame); | 287 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame); |
288 if (pluginContainer) | 288 if (pluginContainer) |
289 return pluginContainer; | 289 return pluginContainer; |
290 return toPluginContainerImpl(node.pluginContainer()); | 290 return toPluginContainerImpl(node.pluginContainer()); |
291 } | 291 } |
(...skipping 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2476 | 2476 |
2477 // There is a possibility that the frame being detached was the only | 2477 // There is a possibility that the frame being detached was the only |
2478 // pending one. We need to make sure final replies can be sent. | 2478 // pending one. We need to make sure final replies can be sent. |
2479 flushCurrentScopingEffort(m_findRequestIdentifier); | 2479 flushCurrentScopingEffort(m_findRequestIdentifier); |
2480 | 2480 |
2481 cancelPendingScopingEffort(); | 2481 cancelPendingScopingEffort(); |
2482 } | 2482 } |
2483 } | 2483 } |
2484 | 2484 |
2485 } // namespace WebKit | 2485 } // namespace WebKit |
OLD | NEW |