1 files changed, 46 insertions, 42 deletions

diff --git a/Source/WebCore/inspector/InspectorFrontendClientLocal.h b/Source/WebCore/inspector/InspectorFrontendClientLocal.h
index b654f7087..ce6a54a68 100644
--- a/Source/WebCore/inspector/InspectorFrontendClientLocal.h
+++ b/Source/WebCore/inspector/InspectorFrontendClientLocal.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -28,8 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef InspectorFrontendClientLocal_h
-#define InspectorFrontendClientLocal_h
+#pragma once
 
 #include "InspectorFrontendClient.h"
 #include <wtf/Forward.h>
@@ -47,7 +47,7 @@ class Page;
 class InspectorFrontendClientLocal : public InspectorFrontendClient {
     WTF_MAKE_NONCOPYABLE(InspectorFrontendClientLocal); WTF_MAKE_FAST_ALLOCATED;
 public:
-    class Settings {
+    class WEBCORE_EXPORT Settings {
     public:
         Settings() { }
         virtual ~Settings() { }
@@ -55,75 +55,79 @@ public:
         virtual void setProperty(const String& name, const String& value);
     };
 
-    InspectorFrontendClientLocal(InspectorController*, Page*, PassOwnPtr<Settings>);
-    virtual ~InspectorFrontendClientLocal();
-    
-    virtual void windowObjectCleared();
-    virtual void frontendLoaded();
+    WEBCORE_EXPORT InspectorFrontendClientLocal(InspectorController* inspectedPageController, Page* frontendPage, std::unique_ptr<Settings>);
+    WEBCORE_EXPORT virtual ~InspectorFrontendClientLocal();
 
-    virtual void moveWindowBy(float x, float y);
+    WEBCORE_EXPORT void windowObjectCleared() final;
+    WEBCORE_EXPORT void frontendLoaded() override;
 
-    virtual void requestSetDockSide(DockSide);
-    virtual void changeAttachedWindowHeight(unsigned);
-    virtual void changeAttachedWindowWidth(unsigned);
-    virtual void openInNewTab(const String& url);
-    virtual bool canSave() { return false; }
-    virtual void save(const String&, const String&, bool, bool) { }
-    virtual void append(const String&, const String&) { }
+    void startWindowDrag() override { }
+    WEBCORE_EXPORT void moveWindowBy(float x, float y) final;
+
+    WEBCORE_EXPORT UserInterfaceLayoutDirection userInterfaceLayoutDirection() const final;
+
+    WEBCORE_EXPORT void requestSetDockSide(DockSide) final;
+    WEBCORE_EXPORT void changeAttachedWindowHeight(unsigned) final;
+    WEBCORE_EXPORT void changeAttachedWindowWidth(unsigned) final;
+    WEBCORE_EXPORT void openInNewTab(const String& url) final;
+    bool canSave()  override { return false; }
+    void save(const String&, const String&, bool, bool) override { }
+    void append(const String&, const String&) override { }
 
     virtual void attachWindow(DockSide) = 0;
     virtual void detachWindow() = 0;
 
-    virtual void sendMessageToBackend(const String& message);
+    WEBCORE_EXPORT void sendMessageToBackend(const String& message) final;
 
-    virtual bool isUnderTest();
+    WEBCORE_EXPORT bool isUnderTest() final;
+    WEBCORE_EXPORT unsigned inspectionLevel() const final;
 
-    bool canAttachWindow();
-    void setDockingUnavailable(bool);
+    WEBCORE_EXPORT bool canAttachWindow();
+    WEBCORE_EXPORT void setDockingUnavailable(bool);
 
-    static unsigned constrainedAttachedWindowHeight(unsigned preferredHeight, unsigned totalWindowHeight);
-    static unsigned constrainedAttachedWindowWidth(unsigned preferredWidth, unsigned totalWindowWidth);
+    WEBCORE_EXPORT static unsigned constrainedAttachedWindowHeight(unsigned preferredHeight, unsigned totalWindowHeight);
+    WEBCORE_EXPORT static unsigned constrainedAttachedWindowWidth(unsigned preferredWidth, unsigned totalWindowWidth);
 
     // Direct Frontend API
-    bool isDebuggingEnabled();
-    void setDebuggingEnabled(bool);
+    WEBCORE_EXPORT bool isDebuggingEnabled();
+    WEBCORE_EXPORT void setDebuggingEnabled(bool);
 
-    bool isTimelineProfilingEnabled();
-    void setTimelineProfilingEnabled(bool);
+    WEBCORE_EXPORT bool isTimelineProfilingEnabled();
+    WEBCORE_EXPORT void setTimelineProfilingEnabled(bool);
 
-    bool isProfilingJavaScript();
-    void startProfilingJavaScript();
-    void stopProfilingJavaScript();
+    WEBCORE_EXPORT bool isProfilingJavaScript();
+    WEBCORE_EXPORT void startProfilingJavaScript();
+    WEBCORE_EXPORT void stopProfilingJavaScript();
 
-    void showConsole();
+    WEBCORE_EXPORT void showConsole();
 
-    void showMainResourceForFrame(Frame*);
-    
-    void showResources();
+    WEBCORE_EXPORT void showMainResourceForFrame(Frame*);
 
-    void setAttachedWindow(DockSide);
+    WEBCORE_EXPORT void showResources();
 
+    WEBCORE_EXPORT void setAttachedWindow(DockSide);
+
+    WEBCORE_EXPORT Page* inspectedPage() const;
+    Page* frontendPage() const { return m_frontendPage; }
 protected:
     virtual void setAttachedWindowHeight(unsigned) = 0;
     virtual void setAttachedWindowWidth(unsigned) = 0;
-    void restoreAttachedWindowHeight();
+    WEBCORE_EXPORT void restoreAttachedWindowHeight();
 
 private:
     bool evaluateAsBoolean(const String& expression);
     void evaluateOnLoad(const String& expression);
 
     friend class FrontendMenuProvider;
-    InspectorController* m_inspectorController;
-    Page* m_frontendPage;
+    InspectorController* m_inspectedPageController { nullptr };
+    Page* m_frontendPage { nullptr };
     // TODO(yurys): this ref shouldn't be needed.
     RefPtr<InspectorFrontendHost> m_frontendHost;
-    OwnPtr<InspectorFrontendClientLocal::Settings> m_settings;
-    bool m_frontendLoaded;
+    std::unique_ptr<InspectorFrontendClientLocal::Settings> m_settings;
+    bool m_frontendLoaded { false };
     DockSide m_dockSide;
     Vector<String> m_evaluateOnLoad;
-    OwnPtr<InspectorBackendDispatchTask> m_dispatchTask;
+    Ref<InspectorBackendDispatchTask> m_dispatchTask;
 };
 
 } // namespace WebCore
-
-#endif