diff options
Diffstat (limited to 'Source/WebKit2/WebProcess')
3 files changed, 3 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp index d8c874621..dc597c63c 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp @@ -81,7 +81,7 @@ JSNPObject::~JSNPObject() void JSNPObject::destroy(JSCell* cell) { - jsCast<JSNPObject*>(cell)->JSNPObject::~JSNPObject(); + static_cast<JSNPObject*>(cell)->JSNPObject::~JSNPObject(); } void JSNPObject::invalidate() @@ -96,7 +96,6 @@ void JSNPObject::invalidate() NPObject* JSNPObject::leakNPObject() { ASSERT(m_npObject); - ASSERT_GC_OBJECT_INHERITS(this, &s_info); NPObject* object = m_npObject; m_npObject = 0; diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp index 1a22d3837..8f037aeab 100644 --- a/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp +++ b/Source/WebKit2/WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp @@ -295,7 +295,7 @@ void NPRuntimeObjectMap::addToInvalidationQueue(NPObject* npObject) void NPRuntimeObjectMap::finalize(JSC::Handle<JSC::Unknown> handle, void* context) { - JSNPObject* object = jsCast<JSNPObject*>(asObject(handle.get())); + JSNPObject* object = static_cast<JSNPObject*>(handle.get().asCell()); weakRemove(m_jsNPObjects, static_cast<NPObject*>(context), object); addToInvalidationQueue(object->leakNPObject()); } diff --git a/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm b/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm index c4ee69330..61db553fc 100644 --- a/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm +++ b/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm @@ -473,8 +473,7 @@ bool BuiltInPDFView::isTransparent() bool BuiltInPDFView::wantsWheelEvents() { - // We return false here even though we do want wheel events, because we add ourselves to the scrollable area set in updateScrollbars(). - return false; + return true; } void BuiltInPDFView::geometryDidChange(const IntSize& pluginSize, const IntRect& clipRect, const AffineTransform& pluginToRootViewTransform) |