From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebKit2/WebProcess/WebPage/WebPage.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/WebProcess/WebPage/WebPage.cpp') diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index 413d0d7ab..9daace6a7 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -401,7 +401,7 @@ PassRefPtr WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* plu if (pluginElement->renderer()->isEmbeddedObject()) toRenderEmbeddedObject(pluginElement->renderer())->setPluginUnavailabilityReason(RenderEmbeddedObject::InsecurePluginVersion); - send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType)); + send(Messages::WebPageProxy::DidBlockInsecurePluginVersion(parameters.mimeType, parameters.url.string())); return 0; } @@ -418,9 +418,11 @@ PassRefPtr WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* plu #if ENABLE(PLUGIN_PROCESS) return PluginProxy::create(pluginPath); -#else +#elif ENABLE(NETSCAPE_PLUGIN_API) NetscapePlugin::setSetExceptionFunction(NPRuntimeObjectMap::setGlobalException); return NetscapePlugin::create(NetscapePluginModule::getOrCreate(pluginPath)); +#else + return 0; #endif } @@ -2198,8 +2200,10 @@ void WebPage::performDragControllerAction(uint64_t action, WebCore::IntPoint cli ASSERT(!m_pendingDropSandboxExtension); m_pendingDropSandboxExtension = SandboxExtension::create(sandboxExtensionHandle); - for (size_t i = 0; i < sandboxExtensionsHandleArray.size(); i++) - m_pendingDropExtensionsForFileUpload.append(SandboxExtension::create(sandboxExtensionsHandleArray[i])); + for (size_t i = 0; i < sandboxExtensionsHandleArray.size(); i++) { + if (RefPtr extension = SandboxExtension::create(sandboxExtensionsHandleArray[i])) + m_pendingDropExtensionsForFileUpload.append(extension); + } m_page->dragController()->performDrag(&dragData); @@ -2898,6 +2902,7 @@ void WebPage::drawRectToPDF(uint64_t frameID, const PrintInfo& printInfo, const RetainPtr pdfPageData(AdoptCF, CFDataCreateMutable(0, 0)); +#if USE(CG) if (coreFrame) { #if PLATFORM(MAC) ASSERT(coreFrame->document()->printing() || pdfDocumentForPrintingFrame(coreFrame)); @@ -2929,6 +2934,7 @@ void WebPage::drawRectToPDF(uint64_t frameID, const PrintInfo& printInfo, const CGPDFContextEndPage(context.get()); CGPDFContextClose(context.get()); } +#endif send(Messages::WebPageProxy::DataCallback(CoreIPC::DataReference(CFDataGetBytePtr(pdfPageData.get()), CFDataGetLength(pdfPageData.get())), callbackID)); } @@ -2940,6 +2946,7 @@ void WebPage::drawPagesToPDF(uint64_t frameID, const PrintInfo& printInfo, uint3 RetainPtr pdfPageData(AdoptCF, CFDataCreateMutable(0, 0)); +#if USE(CG) if (coreFrame) { #if PLATFORM(MAC) @@ -2979,6 +2986,7 @@ void WebPage::drawPagesToPDF(uint64_t frameID, const PrintInfo& printInfo, uint3 } CGPDFContextClose(context.get()); } +#endif send(Messages::WebPageProxy::DataCallback(CoreIPC::DataReference(CFDataGetBytePtr(pdfPageData.get()), CFDataGetLength(pdfPageData.get())), callbackID)); } -- cgit v1.2.1