WebCore/ChangeLog

2010-04-10  Joseph Pecoraro  <joepeck@webkit.org>

        Reviewed by NOBODY (OOPS!).

        Missing CONTEXT_MENUS Guards

        https://bugs.webkit.org/show_bug.cgi?id=37398

        Added missing ENABLE(CONTEXT_MENUS) guards.

        * bindings/js/JSInspectorFrontendHostCustom.cpp:

        (WebCore::JSInspectorFrontendHost::showContextMenu):

        * inspector/InspectorFrontendHost.cpp:

        (WebCore::InspectorFrontendHost::InspectorFrontendHost):

        (WebCore::InspectorFrontendHost::disconnectClient):

        * inspector/InspectorFrontendHost.h:

2010-04-10  Stephan Aßmus  <superstippi@gmx.de>

        Reviewed by Eric Seidel.

WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp

@@JSValue JSInspectorFrontendHost::showContextMenu(ExecState* execState, const Arg

{

    if (args.size() < 2)

        return jsUndefined();

84

84#if ENABLE(CONTEXT_MENUS)

    Event* event = toEvent(args.at(0));

    JSArray* array = asArray(args.at(1));

@@JSValue JSInspectorFrontendHost::showContextMenu(ExecState* execState, const Arg

    }

    impl()->showContextMenu(event, items);

#else

    UNUSED_PARAM(execState);

#endif

    return jsUndefined();

}

WebCore/inspector/InspectorFrontendHost.cpp

@@using namespace std;

namespace WebCore {

57#if ENABLE(CONTEXT_MENUS)

class FrontendMenuProvider : public ContextMenuProvider {

public:

    static PassRefPtr<FrontendMenuProvider> create(InspectorFrontendHost* frontendHost, ScriptObject webInspector, const Vector<ContextMenuItem*>& items)

@@private:

    ScriptObject m_webInspector;

    Vector<ContextMenuItem*> m_items;

};

119#endif

InspectorFrontendHost::InspectorFrontendHost(InspectorFrontendClient* client, Page* frontendPage)

    : m_client(client)

    , m_frontendPage(frontendPage)

124#if ENABLE(CONTEXT_MENUS)

122125 , m_menuProvider(0)

126#endif

{

}

@@InspectorFrontendHost::~InspectorFrontendHost()

void InspectorFrontendHost::disconnectClient()

{

    m_client = 0;

138#if ENABLE(CONTEXT_MENUS)

134139 if (m_menuProvider)

135140 m_menuProvider->disconnect();

141#endif

    m_frontendPage = 0;

}

@@void InspectorFrontendHost::copyText(const String& text)

    Pasteboard::generalPasteboard()->writePlainText(text);

}

210#if ENABLE(CONTEXT_MENUS)

void InspectorFrontendHost::showContextMenu(Event* event, const Vector<ContextMenuItem*>& items)

{

    ASSERT(m_frontendPage);

@@void InspectorFrontendHost::showContextMenu(Event* event, const Vector<ContextMe

    menuController->showContextMenu(event, menuProvider);

    m_menuProvider = menuProvider.get();

}

225#endif

} // namespace WebCore

WebCore/inspector/InspectorFrontendHost.h

@@public:

    void showContextMenu(Event*, const Vector<ContextMenuItem*>& items);

private:

80#if ENABLE(CONTEXT_MENUS)

8081 friend class FrontendMenuProvider;

82#endif

    InspectorFrontendHost(InspectorFrontendClient* client, Page* frontendPage);

    InspectorFrontendClient* m_client;

    Page* m_frontendPage;

87#if ENABLE(CONTEXT_MENUS)

8588 FrontendMenuProvider* m_menuProvider;

89#endif

};

} // namespace WebCore