Commit a6a363b1 authored by jhoneycutt@apple.com's avatar jhoneycutt@apple.com

2008-03-20 Jon Honeycutt <jhoneycutt@apple.com>

        Reviewed by Anders.

        <rdar://problem/5809600> REGRESSION:
        http/tests/plugins/cross-frame-object-access.html hangs Windows Layout
        Tests

        r30897 changed the way we conditionalize this feature.

        * plugins/PluginView.cpp:
        (WebCore::PluginView::getValue): Test ENABLE(NETSCAPE_PLUGIN_API)
        instead of USE(NPOBJECT).
        (WebCore::PluginView::bindingInstance): Same.




git-svn-id: http://svn.webkit.org/repository/webkit/trunk@31193 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4ace251b
2008-03-20 Jon Honeycutt <jhoneycutt@apple.com>
Reviewed by Anders.
<rdar://problem/5809600> REGRESSION:
http/tests/plugins/cross-frame-object-access.html hangs Windows Layout
Tests
r30897 changed the way we conditionalize this feature.
* plugins/PluginView.cpp:
(WebCore::PluginView::getValue): Test ENABLE(NETSCAPE_PLUGIN_API)
instead of USE(NPOBJECT).
(WebCore::PluginView::bindingInstance): Same.
2008-03-20 Adam Roben <aroben@apple.com>
Highlight nodes when you hover over them in the Console
......@@ -413,7 +413,7 @@ void PluginView::status(const char* message)
NPError PluginView::getValue(NPNVariable variable, void* value)
{
switch (variable) {
#if USE(NPOBJECT)
#if ENABLE(NETSCAPE_PLUGIN_API)
case NPNVWindowNPObject: {
NPObject* windowScriptObject = m_parentFrame->windowScriptNPObject();
......@@ -501,7 +501,7 @@ bool PluginView::arePopupsAllowed() const
PassRefPtr<KJS::Bindings::Instance> PluginView::bindingInstance()
{
#if USE(NPOBJECT)
#if ENABLE(NETSCAPE_PLUGIN_API)
NPObject* object = 0;
if (!m_plugin || !m_plugin->pluginFuncs()->getvalue)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment