Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (225653 => 225654)
--- trunk/Source/_javascript_Core/ChangeLog 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-12-08 00:22:55 UTC (rev 225654)
@@ -1,3 +1,14 @@
+2017-12-07 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Fix style in remote inspector classes
+ https://bugs.webkit.org/show_bug.cgi?id=180545
+
+ Reviewed by Youenn Fablet.
+
+ * inspector/remote/RemoteControllableTarget.h:
+ * inspector/remote/RemoteInspectionTarget.h:
+ * runtime/JSGlobalObjectDebuggable.h:
+
2017-12-07 Per Arne Vollan <[email protected]>
Use fastAlignedFree to free aligned memory.
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h (225653 => 225654)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteControllableTarget.h 2017-12-08 00:22:55 UTC (rev 225654)
@@ -58,10 +58,11 @@
#if USE(CF)
// The dispatch block will be scheduled on a global run loop if null is returned.
- virtual CFRunLoopRef targetRunLoop() { return nullptr; }
+ virtual CFRunLoopRef targetRunLoop() const { return nullptr; }
#endif
+
private:
- unsigned m_identifier {0};
+ unsigned m_identifier { 0 };
};
} // namespace Inspector
Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h (225653 => 225654)
--- trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspectionTarget.h 2017-12-08 00:22:55 UTC (rev 225654)
@@ -42,7 +42,7 @@
void setRemoteDebuggingAllowed(bool);
#if USE(CF)
- CFRunLoopRef targetRunLoop() override { return m_runLoop.get(); }
+ CFRunLoopRef targetRunLoop() const final { return m_runLoop.get(); }
void setTargetRunLoop(CFRunLoopRef runLoop) { m_runLoop = runLoop; }
#endif
@@ -57,9 +57,10 @@
virtual void unpauseForInitializedInspector();
// RemoteControllableTarget overrides.
- bool remoteControlAllowed() const override;
+ bool remoteControlAllowed() const final;
+
private:
- bool m_allowed {false};
+ bool m_allowed { false };
#if USE(CF)
RetainPtr<CFRunLoopRef> m_runLoop;
#endif
Modified: trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h (225653 => 225654)
--- trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/_javascript_Core/runtime/JSGlobalObjectDebuggable.h 2017-12-08 00:22:55 UTC (rev 225654)
@@ -46,17 +46,17 @@
JSGlobalObjectDebuggable(JSGlobalObject&);
~JSGlobalObjectDebuggable() { }
- Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::_javascript_; }
+ Inspector::RemoteControllableTarget::Type type() const final { return Inspector::RemoteControllableTarget::Type::_javascript_; }
- String name() const override;
- bool hasLocalDebugger() const override { return false; }
+ String name() const final;
+ bool hasLocalDebugger() const final { return false; }
- void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
- void disconnect(Inspector::FrontendChannel*) override;
- void dispatchMessageFromRemote(const String& message) override;
+ void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+ void disconnect(Inspector::FrontendChannel*) final;
+ void dispatchMessageFromRemote(const String& message) final;
- bool automaticInspectionAllowed() const override { return true; }
- void pauseWaitingForAutomaticInspection() override;
+ bool automaticInspectionAllowed() const final { return true; }
+ void pauseWaitingForAutomaticInspection() final;
private:
JSGlobalObject& m_globalObject;
Modified: trunk/Source/WebCore/ChangeLog (225653 => 225654)
--- trunk/Source/WebCore/ChangeLog 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/WebCore/ChangeLog 2017-12-08 00:22:55 UTC (rev 225654)
@@ -1,3 +1,13 @@
+2017-12-07 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Fix style in remote inspector classes
+ https://bugs.webkit.org/show_bug.cgi?id=180545
+
+ Reviewed by Youenn Fablet.
+
+ * page/PageDebuggable.h:
+ * workers/service/context/ServiceWorkerDebuggable.h:
+
2017-12-07 Antti Koivisto <[email protected]>
Move security origin filtering for getMatchedCSSRules out of StyleResolver
Modified: trunk/Source/WebCore/page/PageDebuggable.h (225653 => 225654)
--- trunk/Source/WebCore/page/PageDebuggable.h 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/WebCore/page/PageDebuggable.h 2017-12-08 00:22:55 UTC (rev 225654)
@@ -41,18 +41,18 @@
PageDebuggable(Page&);
~PageDebuggable() = default;
- Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::Web; }
+ Inspector::RemoteControllableTarget::Type type() const final { return Inspector::RemoteControllableTarget::Type::Web; }
- String name() const override;
- String url() const override;
- bool hasLocalDebugger() const override;
+ String name() const final;
+ String url() const final;
+ bool hasLocalDebugger() const final;
- void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
- void disconnect(Inspector::FrontendChannel*) override;
- void dispatchMessageFromRemote(const String& message) override;
- void setIndicating(bool) override;
+ void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+ void disconnect(Inspector::FrontendChannel*) final;
+ void dispatchMessageFromRemote(const String& message) final;
+ void setIndicating(bool) final;
- String nameOverride() const { return m_nameOverride; }
+ const String& nameOverride() const { return m_nameOverride; }
void setNameOverride(const String&);
private:
Modified: trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h (225653 => 225654)
--- trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h 2017-12-08 00:19:17 UTC (rev 225653)
+++ trunk/Source/WebCore/workers/service/context/ServiceWorkerDebuggable.h 2017-12-08 00:22:55 UTC (rev 225654)
@@ -43,15 +43,15 @@
ServiceWorkerDebuggable(ServiceWorkerThreadProxy&, const ServiceWorkerContextData&);
~ServiceWorkerDebuggable() = default;
- Inspector::RemoteControllableTarget::Type type() const override { return Inspector::RemoteControllableTarget::Type::ServiceWorker; }
+ Inspector::RemoteControllableTarget::Type type() const final { return Inspector::RemoteControllableTarget::Type::ServiceWorker; }
- String name() const override { return ASCIILiteral("ServiceWorker"); }
- String url() const override { return m_scopeURL; }
- bool hasLocalDebugger() const override { return false; }
+ String name() const final { return ASCIILiteral("ServiceWorker"); }
+ String url() const final { return m_scopeURL; }
+ bool hasLocalDebugger() const final { return false; }
- void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) override;
- void disconnect(Inspector::FrontendChannel*) override;
- void dispatchMessageFromRemote(const String& message) override;
+ void connect(Inspector::FrontendChannel*, bool isAutomaticConnection = false, bool immediatelyPause = false) final;
+ void disconnect(Inspector::FrontendChannel*) final;
+ void dispatchMessageFromRemote(const String& message) final;
private:
ServiceWorkerThreadProxy& m_serviceWorkerThreadProxy;
