| 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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 return sources; | 247 return sources; |
| 248 } | 248 } |
| 249 | 249 |
| 250 WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromFrame( | 250 WebPluginContainerImpl* WebLocalFrameImpl::pluginContainerFromFrame( |
| 251 LocalFrame* frame) { | 251 LocalFrame* frame) { |
| 252 if (!frame) | 252 if (!frame) |
| 253 return 0; | 253 return 0; |
| 254 if (!frame->document() || !frame->document()->isPluginDocument()) | 254 if (!frame->document() || !frame->document()->isPluginDocument()) |
| 255 return 0; | 255 return 0; |
| 256 PluginDocument* pluginDocument = toPluginDocument(frame->document()); | 256 PluginDocument* pluginDocument = toPluginDocument(frame->document()); |
| 257 return toWebPluginContainerImpl(pluginDocument->pluginWidget()); | 257 return toWebPluginContainerImpl(pluginDocument->pluginView()); |
| 258 } | 258 } |
| 259 | 259 |
| 260 WebPluginContainerImpl* WebLocalFrameImpl::currentPluginContainer( | 260 WebPluginContainerImpl* WebLocalFrameImpl::currentPluginContainer( |
| 261 LocalFrame* frame, | 261 LocalFrame* frame, |
| 262 Node* node) { | 262 Node* node) { |
| 263 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame); | 263 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame); |
| 264 if (pluginContainer) | 264 if (pluginContainer) |
| 265 return pluginContainer; | 265 return pluginContainer; |
| 266 | 266 |
| 267 if (!node) { | 267 if (!node) { |
| (...skipping 2240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2508 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2508 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2509 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2509 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2510 } else { | 2510 } else { |
| 2511 clipHtml = | 2511 clipHtml = |
| 2512 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2512 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2513 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2513 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2514 } | 2514 } |
| 2515 } | 2515 } |
| 2516 | 2516 |
| 2517 } // namespace blink | 2517 } // namespace blink |
| OLD | NEW |