[webkit-changes] [WebKit/WebKit] a23acf: Try to avoid conflicts between ObjC's Protocol and...

Tim Horton noreply at github.com
Thu Feb 8 20:30:35 PST 2024


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: a23acff183dd2d16c27644f1e4d4ef10b9cf1a6f
      https://github.com/WebKit/WebKit/commit/a23acff183dd2d16c27644f1e4d4ef10b9cf1a6f
  Author: Tim Horton <timothy_horton at apple.com>
  Date:   2024-02-08 (Thu, 08 Feb 2024)

  Changed paths:
    M Source/WebCore/inspector/CommandLineAPIHost.cpp
    M Source/WebCore/inspector/InspectorAuditResourcesObject.cpp
    M Source/WebCore/inspector/InspectorCanvas.cpp
    M Source/WebCore/inspector/InspectorStyleSheet.cpp
    M Source/WebCore/inspector/agents/InspectorAnimationAgent.cpp
    M Source/WebCore/inspector/agents/InspectorApplicationCacheAgent.cpp
    M Source/WebCore/inspector/agents/InspectorCPUProfilerAgent.cpp
    M Source/WebCore/inspector/agents/InspectorCSSAgent.cpp
    M Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp
    M Source/WebCore/inspector/agents/InspectorDOMAgent.cpp
    M Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp
    M Source/WebCore/inspector/agents/InspectorDOMStorageAgent.cpp
    M Source/WebCore/inspector/agents/InspectorDatabaseAgent.cpp
    M Source/WebCore/inspector/agents/InspectorIndexedDBAgent.cpp
    M Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp
    M Source/WebCore/inspector/agents/InspectorMemoryAgent.cpp
    M Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp
    M Source/WebCore/inspector/agents/InspectorPageAgent.cpp
    M Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp
    M Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp
    M Source/WebCore/inspector/agents/WebHeapAgent.cpp
    M Source/WebCore/inspector/agents/page/PageAuditAgent.cpp
    M Source/WebCore/inspector/agents/page/PageCanvasAgent.cpp
    M Source/WebCore/inspector/agents/page/PageConsoleAgent.cpp
    M Source/WebCore/inspector/agents/page/PageDOMDebuggerAgent.cpp
    M Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp
    M Source/WebCore/inspector/agents/page/PageHeapAgent.cpp
    M Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp
    M Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp
    M Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerAuditAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerCanvasAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerDOMDebuggerAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerDebuggerAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp
    M Source/WebCore/inspector/agents/worker/WorkerRuntimeAgent.cpp
    M Source/WebCore/platform/graphics/cocoa/IOSurface.h

  Log Message:
  -----------
  Try to avoid conflicts between ObjC's Protocol and Inspector::Protocol namespace
https://bugs.webkit.org/show_bug.cgi?id=269040

Reviewed by Wenson Hsieh and Patrick Angle.

ObjC has a Protocol type; sometimes with various Unified Sources shuffling we
end up getting that included in an Inspector file, which also has Inspector::Protocol,
which it often uses without the Inspector:: namespace being mentioned explicitly,
via `using namespace Inspector`.

* Source/WebCore/inspector/CommandLineAPIHost.cpp:
* Source/WebCore/inspector/InspectorAuditResourcesObject.cpp:
* Source/WebCore/inspector/InspectorCanvas.cpp:
* Source/WebCore/inspector/InspectorStyleSheet.cpp:
* Source/WebCore/inspector/agents/InspectorAnimationAgent.cpp:
* Source/WebCore/inspector/agents/InspectorApplicationCacheAgent.cpp:
* Source/WebCore/inspector/agents/InspectorCPUProfilerAgent.cpp:
* Source/WebCore/inspector/agents/InspectorCSSAgent.cpp:
* Source/WebCore/inspector/agents/InspectorCanvasAgent.cpp:
* Source/WebCore/inspector/agents/InspectorDOMAgent.cpp:
* Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp:
* Source/WebCore/inspector/agents/InspectorDOMStorageAgent.cpp:
* Source/WebCore/inspector/agents/InspectorDatabaseAgent.cpp:
* Source/WebCore/inspector/agents/InspectorIndexedDBAgent.cpp:
* Source/WebCore/inspector/agents/InspectorLayerTreeAgent.cpp:
* Source/WebCore/inspector/agents/InspectorMemoryAgent.cpp:
* Source/WebCore/inspector/agents/InspectorNetworkAgent.cpp:
* Source/WebCore/inspector/agents/InspectorPageAgent.cpp:
* Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp:
* Source/WebCore/inspector/agents/InspectorWorkerAgent.cpp:
* Source/WebCore/inspector/agents/WebHeapAgent.cpp:
* Source/WebCore/inspector/agents/page/PageAuditAgent.cpp:
* Source/WebCore/inspector/agents/page/PageCanvasAgent.cpp:
* Source/WebCore/inspector/agents/page/PageConsoleAgent.cpp:
* Source/WebCore/inspector/agents/page/PageDOMDebuggerAgent.cpp:
* Source/WebCore/inspector/agents/page/PageDebuggerAgent.cpp:
* Source/WebCore/inspector/agents/page/PageHeapAgent.cpp:
* Source/WebCore/inspector/agents/page/PageNetworkAgent.cpp:
* Source/WebCore/inspector/agents/page/PageRuntimeAgent.cpp:
* Source/WebCore/inspector/agents/worker/ServiceWorkerAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerAuditAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerCanvasAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerDOMDebuggerAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerDebuggerAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerNetworkAgent.cpp:
* Source/WebCore/inspector/agents/worker/WorkerRuntimeAgent.cpp:
Avoid this conflict by specifying Inspector:: in all cases.

* Source/WebCore/platform/graphics/cocoa/IOSurface.h:
Also remove one common cause of objc/objc.h getting included places,
by removing it from IOSurface.h (the build still succeeds...).

Canonical link: https://commits.webkit.org/274340@main




More information about the webkit-changes mailing list