| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Collabora Ltd. All rights reserved. | 3 * Copyright (C) 2008 Collabora Ltd. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 String jsString = scriptStringIfJavaScriptURL(requestURL); | 232 String jsString = scriptStringIfJavaScriptURL(requestURL); |
| 233 | 233 |
| 234 if (jsString.isNull()) { | 234 if (jsString.isNull()) { |
| 235 // if this is not a targeted request, create a stream for it. otherwise, | 235 // if this is not a targeted request, create a stream for it. otherwise, |
| 236 // just pass it off to the loader | 236 // just pass it off to the loader |
| 237 if (targetFrameName.isEmpty()) { | 237 if (targetFrameName.isEmpty()) { |
| 238 RefPtr<PluginStream> stream = PluginStream::create(this, m_parentFra
me, request->frameLoadRequest().resourceRequest(), request->sendNotification(),
request->notifyData(), plugin()->pluginFuncs(), instance(), m_plugin->quirks()); | 238 RefPtr<PluginStream> stream = PluginStream::create(this, m_parentFra
me, request->frameLoadRequest().resourceRequest(), request->sendNotification(),
request->notifyData(), plugin()->pluginFuncs(), instance(), m_plugin->quirks()); |
| 239 m_streams.add(stream); | 239 m_streams.add(stream); |
| 240 stream->start(); | 240 stream->start(); |
| 241 } else { | 241 } else { |
| 242 m_parentFrame->loader()->load(request->frameLoadRequest().resourceRe
quest(), targetFrameName); | 242 m_parentFrame->loader()->load(request->frameLoadRequest().resourceRe
quest(), targetFrameName, false); |
| 243 | 243 |
| 244 // FIXME: <rdar://problem/4807469> This should be sent when the docu
ment has finished loading | 244 // FIXME: <rdar://problem/4807469> This should be sent when the docu
ment has finished loading |
| 245 if (request->sendNotification()) { | 245 if (request->sendNotification()) { |
| 246 PluginView::setCurrentPluginView(this); | 246 PluginView::setCurrentPluginView(this); |
| 247 JSC::JSLock::DropAllLocks dropAllLocks(false); | 247 JSC::JSLock::DropAllLocks dropAllLocks(false); |
| 248 setCallingPlugin(true); | 248 setCallingPlugin(true); |
| 249 m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string
().utf8().data(), NPRES_DONE, request->notifyData()); | 249 m_plugin->pluginFuncs()->urlnotify(m_instance, requestURL.string
().utf8().data(), NPRES_DONE, request->notifyData()); |
| 250 setCallingPlugin(false); | 250 setCallingPlugin(false); |
| 251 PluginView::setCurrentPluginView(0); | 251 PluginView::setCurrentPluginView(0); |
| 252 } | 252 } |
| (...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 if (!rect.intersects(imageRect)) | 932 if (!rect.intersects(imageRect)) |
| 933 return; | 933 return; |
| 934 | 934 |
| 935 context->save(); | 935 context->save(); |
| 936 context->clip(windowClipRect()); | 936 context->clip(windowClipRect()); |
| 937 context->drawImage(nullPluginImage.get(), imageRect.location()); | 937 context->drawImage(nullPluginImage.get(), imageRect.location()); |
| 938 context->restore(); | 938 context->restore(); |
| 939 } | 939 } |
| 940 | 940 |
| 941 } // namespace WebCore | 941 } // namespace WebCore |
| OLD | NEW |