From b297e0fa5c217c9467033b7c8b46891a52870120 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 16 Oct 2012 14:56:46 +0200 Subject: Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)" This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78. Caused OOM issues on some CI machines :( --- Source/WebCore/plugins/PluginView.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Source/WebCore/plugins/PluginView.cpp') diff --git a/Source/WebCore/plugins/PluginView.cpp b/Source/WebCore/plugins/PluginView.cpp index bd3f8834d..9672e91f6 100644 --- a/Source/WebCore/plugins/PluginView.cpp +++ b/Source/WebCore/plugins/PluginView.cpp @@ -485,7 +485,7 @@ void PluginView::performRequest(PluginRequest* request) void PluginView::requestTimerFired(Timer* timer) { - ASSERT_UNUSED(timer, timer == &m_requestTimer); + ASSERT(timer == &m_requestTimer); ASSERT(m_requests.size() > 0); ASSERT(!m_isJavaScriptPaused); @@ -587,14 +587,14 @@ NPError PluginView::postURL(const char* url, const char* target, uint32_t len, c return handlePost(url, target, len, buf, file, 0, false, file); } -NPError PluginView::newStream(NPMIMEType, const char* /* target */, NPStream**) +NPError PluginView::newStream(NPMIMEType type, const char* target, NPStream** stream) { notImplemented(); // Unsupported return NPERR_GENERIC_ERROR; } -int32_t PluginView::write(NPStream*, int32_t /* len */, void* /* buffer */) +int32_t PluginView::write(NPStream* stream, int32_t len, void* buffer) { notImplemented(); // Unsupported @@ -681,7 +681,7 @@ NPError PluginView::setValue(NPPVariable variable, void* value) void PluginView::invalidateTimerFired(Timer* timer) { - ASSERT_UNUSED(timer, timer == &m_invalidateTimer); + ASSERT(timer == &m_invalidateTimer); for (unsigned i = 0; i < m_invalidRects.size(); i++) invalidateRect(m_invalidRects[i]); @@ -1472,7 +1472,7 @@ NPError PluginView::setValueForURL(NPNURLVariable variable, const char* url, con return result; } -NPError PluginView::getAuthenticationInfo(const char* protocol, const char* host, int32_t port, const char* /* scheme */, const char* /* realm */, char** /* username */, uint32_t* /* ulen */, char** /* password */, uint32_t* /* plen */) +NPError PluginView::getAuthenticationInfo(const char* protocol, const char* host, int32_t port, const char* scheme, const char* realm, char** username, uint32_t* ulen, char** password, uint32_t* plen) { LOG(Plugins, "PluginView::getAuthenticationInfo: protocol=%s, host=%s, port=%d", protocol, host, port); notImplemented(); -- cgit v1.2.1