Changeset 218395 in webkit


Ignore:
Timestamp:
Jun 16, 2017 9:47:21 AM (7 years ago)
Author:
Matt Lewis
Message:

Unreviewed, rolling out r218376.

The patch cause multiple Layout Test Crashes.

Reverted changeset:

"Web Inspector: Instrument 2D/WebGL canvas contexts in the
backend"
​https://bugs.webkit.org/show_bug.cgi?id=172623
​http://trac.webkit.org/changeset/218376

Location:
trunk
Files:
7 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r218394 r218395  
     12017-06-16  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r218376.
     4
     5        The patch cause multiple Layout Test Crashes.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Instrument 2D/WebGL canvas contexts in the
     10        backend"
     11        https://bugs.webkit.org/show_bug.cgi?id=172623
     12        http://trac.webkit.org/changeset/218376
     13
    1142017-06-16  Fujii Hironori  <Hironori.Fujii@sony.com>
    215

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r218376 r218395  
    13511351    ${JAVASCRIPTCORE_DIR}/inspector/protocol/ApplicationCache.json
    13521352    ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
    1353     ${JAVASCRIPTCORE_DIR}/inspector/protocol/Canvas.json
    13541353    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
    13551354    ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json

  • trunk/Source/JavaScriptCore/ChangeLog

    r218392 r218395  
     12017-06-16  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r218376.
     4
     5        The patch cause multiple Layout Test Crashes.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Instrument 2D/WebGL canvas contexts in the
     10        backend"
     11        https://bugs.webkit.org/show_bug.cgi?id=172623
     12        http://trac.webkit.org/changeset/218376
     13
    1142017-06-16  Konstantin Tokarev  <annulen@yandex.ru>
    215

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r218376 r218395  
    215215    $(JavaScriptCore)/inspector/protocol/ApplicationCache.json \
    216216    $(JavaScriptCore)/inspector/protocol/CSS.json \
    217     $(JavaScriptCore)/inspector/protocol/Canvas.json \
    218217    $(JavaScriptCore)/inspector/protocol/Console.json \
    219218    $(JavaScriptCore)/inspector/protocol/DOM.json \

  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py

    r218376 r218395  
    3939    return str[:1].upper() + str[1:]
    4040
    41 _ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set(['2D', 'API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS'])
     41_ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS = set(['API', 'CSS', 'DOM', 'HTML', 'JIT', 'XHR', 'XML', 'IOS', 'MacOS'])
    4242_ALWAYS_SPECIALCASED_ENUM_VALUE_LOOKUP_TABLE = dict([(s.upper(), s) for s in _ALWAYS_SPECIALCASED_ENUM_VALUE_SUBSTRINGS])
    43 
    44 _ENUM_IDENTIFIER_RENAME_MAP = {
    45     'webgl': 'WebGL',  # Canvas.ContextType.webgl
    46 }
    4743
    4844# These objects are built manually by creating and setting InspectorValues.
    … …  
    256252
    257253        # Split on hyphen, introduce camelcase, and force uppercasing of acronyms.
    258         subwords = map(ucfirst, _ENUM_IDENTIFIER_RENAME_MAP.get(enum_value, enum_value).split('-'))
     254        subwords = map(ucfirst, enum_value.split('-'))
    259255        return re.sub(re.compile(regex, re.IGNORECASE), replaceCallback, "".join(subwords))
    260256

  • trunk/Source/WebCore/CMakeLists.txt

    r218376 r218395  
    18901890    inspector/InspectorApplicationCacheAgent.cpp
    18911891    inspector/InspectorCSSAgent.cpp
    1892     inspector/InspectorCanvasAgent.cpp
    18931892    inspector/InspectorClient.cpp
    18941893    inspector/InspectorController.cpp

  • trunk/Source/WebCore/ChangeLog

    r218393 r218395  
     12017-06-16  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r218376.
     4
     5        The patch cause multiple Layout Test Crashes.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Instrument 2D/WebGL canvas contexts in the
     10        backend"
     11        https://bugs.webkit.org/show_bug.cgi?id=172623
     12        http://trac.webkit.org/changeset/218376
     13
    1142017-06-16  Daniel Bates  <dabates@apple.com>
    215

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r218376 r218395  
    28792879                6C4C96DF1AD4483500365672 /* JSReadableStreamBYOBRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C4C96DB1AD4483500365672 /* JSReadableStreamBYOBRequest.h */; };
    28802880                6C4C96DF1AD4483500365A50 /* JSReadableStreamDefaultController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultController.h */; };
    2881                 6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */; };
    2882                 6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */; };
    28832881                6C638895A96CCEE50C8C946C /* CachedResourceRequestInitiators.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C638893A96CCEE50C8C946C /* CachedResourceRequestInitiators.h */; settings = {ATTRIBUTES = (Private, ); }; };
    28842882                6C638896A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6C638894A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp */; };
    … …  
    1072110719                6C4C96DB1AD4483500365672 /* JSReadableStreamBYOBRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamBYOBRequest.h; sourceTree = "<group>"; };
    1072210720                6C4C96DB1AD4483500365A50 /* JSReadableStreamDefaultController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStreamDefaultController.h; sourceTree = "<group>"; };
    10723                 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCanvasAgent.h; sourceTree = "<group>"; };
    10724                 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCanvasAgent.cpp; sourceTree = "<group>"; };
    1072510721                6C638893A96CCEE50C8C946C /* CachedResourceRequestInitiators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceRequestInitiators.h; sourceTree = "<group>"; };
    1072610722                6C638894A96CCEE50C8C946C /* CachedResourceRequestInitiators.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedResourceRequestInitiators.cpp; sourceTree = "<group>"; };
    … …  
    1722517221                                B885E8D211E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp */,
    1722617222                                B885E8D311E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h */,
    17227                                 6A4B6D6619D225D8006F11D3 /* InspectorCanvasAgent.cpp */,
    17228                                 6A4B6D6419D22519006F11D3 /* InspectorCanvasAgent.h */,
    1722917223                                7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */,
    1723017224                                1C81B9580E97330800266E07 /* InspectorClient.h */,
    … …  
    2775227746                                82AB1744124B99EC00C5069D /* InspectorCSSAgent.h in Headers */,
    2775327747                                4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */,
    27754                                 6A4B6D6519D22519006F11D3 /* InspectorCanvasAgent.h in Headers */,
    2775527748                                7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */,
    2775627749                                41F062140F5F192600A07EAC /* InspectorDatabaseResource.h in Headers */,
    … …  
    3173131724                                93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */,
    3173231725                                B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
    31733                                 6A32D7CE1A16D8C000412F0B /* InspectorCanvasAgent.cpp in Sources */,
    3173431726                                7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
    3173531727                                1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,

  • trunk/Source/WebCore/dom/Document.cpp

    r218376 r218395  
    54095409{
    54105410    RefPtr<HTMLCanvasElement>& element = m_cssCanvasElements.add(name, nullptr).iterator->value;
    5411     if (!element) {
     5411    if (!element)
    54125412        element = HTMLCanvasElement::create(*this);
    5413         InspectorInstrumentation::didCreateCSSCanvas(*element, name);
    5414     }
    54155413    return element.get();
    54165414}

  • trunk/Source/WebCore/html/HTMLCanvasElement.cpp

    r218376 r218395  
    4444#include "HTMLParserIdioms.h"
    4545#include "ImageData.h"
    46 #include "InspectorInstrumentation.h"
    4746#include "MIMETypeRegistry.h"
    4847#include "RenderHTMLCanvas.h"
    … …  
    249248        downcast<CanvasRenderingContext2D>(*m_context).setTracksDisplayListReplay(m_tracksDisplayListReplay);
    250249
    251         InspectorInstrumentation::didCreateCanvasRenderingContext(*this);
    252 
    253250#if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
    254251        // Need to make sure a RenderLayer and compositing layer get created for the Canvas
    … …  
    306303            // Need to make sure a RenderLayer and compositing layer get created for the Canvas
    307304            invalidateStyleAndLayerComposition();
    308 
    309             InspectorInstrumentation::didCreateCanvasRenderingContext(*this);
    310305        }
    311306    }

  • trunk/Source/WebCore/inspector/InspectorAllInOne.cpp

    r218376 r218395  
    3232#include "InspectorApplicationCacheAgent.cpp"
    3333#include "InspectorCSSAgent.cpp"
    34 #include "InspectorCanvasAgent.cpp"
    3534#include "InspectorClient.cpp"
    3635#include "InspectorController.cpp"

  • trunk/Source/WebCore/inspector/InspectorController.cpp

    r218376 r218395  
    3939#include "InspectorApplicationCacheAgent.h"
    4040#include "InspectorCSSAgent.h"
    41 #include "InspectorCanvasAgent.h"
    4241#include "InspectorClient.h"
    4342#include "InspectorDOMAgent.h"
    … …  
    185184    m_agents.append(std::make_unique<InspectorWorkerAgent>(pageContext));
    186185
    187     auto canvasAgentPtr = std::make_unique<InspectorCanvasAgent>(pageContext, pageAgent);
    188     m_instrumentingAgents->setInspectorCanvasAgent(canvasAgentPtr.get());
    189     m_agents.append(WTFMove(canvasAgentPtr));
    190 
    191186    ASSERT(m_injectedScriptManager->commandLineAPIHost());
    192187    if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost()) {

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

    r218376 r218395  
    4141#include "InspectorApplicationCacheAgent.h"
    4242#include "InspectorCSSAgent.h"
    43 #include "InspectorCanvasAgent.h"
    4443#include "InspectorDOMAgent.h"
    4544#include "InspectorDOMDebuggerAgent.h"
    … …  
    6362#include "ScriptController.h"
    6463#include "WebConsoleAgent.h"
    65 #include "WebGLRenderingContextBase.h"
    6664#include "WebSocketFrame.h"
    6765#include <inspector/ConsoleMessage.h>
    … …  
    751749    }
    752750
    753     if (InspectorCanvasAgent* canvasAgent = instrumentingAgents.inspectorCanvasAgent())
    754         canvasAgent->frameNavigated(loader);
    755 
    756751    if (InspectorDOMAgent* domAgent = instrumentingAgents.inspectorDOMAgent())
    757752        domAgent->didCommitLoad(frame.document());
    … …  
    993988}
    994989#endif
    995 
    996 void InspectorInstrumentation::didCreateCSSCanvasImpl(InstrumentingAgents* instrumentingAgents, HTMLCanvasElement& canvasElement, const String& name)
    997 {
    998     if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
    999         canvasAgent->didCreateCSSCanvas(canvasElement, name);
    1000 }
    1001 
    1002 void InspectorInstrumentation::didCreateCanvasRenderingContextImpl(InstrumentingAgents* instrumentingAgents, HTMLCanvasElement& canvasElement)
    1003 {
    1004     if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
    1005         canvasAgent->didCreateCanvasRenderingContext(canvasElement);
    1006 }
    1007990
    1008991#if ENABLE(WEB_REPLAY)

  • trunk/Source/WebCore/inspector/InspectorInstrumentation.h

    r218376 r218395  
    3737#include "FormData.h"
    3838#include "Frame.h"
    39 #include "HTMLCanvasElement.h"
    4039#include "HitTestResult.h"
    4140#include "InspectorController.h"
    … …  
    8382class ShadowRoot;
    8483class URL;
    85 class WebGLRenderingContextBase;
    8684class WebKitNamedFlow;
    8785class WorkerInspectorProxy;
    … …  
    245243    static void didHandleMemoryPressure(Page&, Critical);
    246244#endif
    247 
    248     static void didCreateCSSCanvas(HTMLCanvasElement&, const String&);
    249     static void didCreateCanvasRenderingContext(HTMLCanvasElement&);
    250245
    251246    static void networkStateChanged(Page&);
    … …  
    421416    static void updateApplicationCacheStatusImpl(InstrumentingAgents&, Frame&);
    422417
    423     static void didCreateCSSCanvasImpl(InstrumentingAgents*, HTMLCanvasElement&, const String&);
    424     static void didCreateCanvasRenderingContextImpl(InstrumentingAgents*, HTMLCanvasElement&);
    425 
    426418    static void layerTreeDidChangeImpl(InstrumentingAgents&);
    427419    static void renderLayerDestroyedImpl(InstrumentingAgents&, const RenderLayer&);
    … …  
    11821174#endif
    11831175
    1184 inline void InspectorInstrumentation::didCreateCSSCanvas(HTMLCanvasElement& canvasElement, const String& name)
    1185 {
    1186     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(&canvasElement.document()))
    1187         didCreateCSSCanvasImpl(instrumentingAgents, canvasElement, name);
    1188 }
    1189    
    1190 inline void InspectorInstrumentation::didCreateCanvasRenderingContext(HTMLCanvasElement& canvasElement)
    1191 {
    1192     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(&canvasElement.document()))
    1193         didCreateCanvasRenderingContextImpl(instrumentingAgents, canvasElement);
    1194 }
    1195 
    11961176inline void InspectorInstrumentation::networkStateChanged(Page& page)
    11971177{

  • trunk/Source/WebCore/inspector/InstrumentingAgents.cpp

    r218376 r218395  
    6868    m_pageHeapAgent = nullptr;
    6969    m_inspectorDOMDebuggerAgent = nullptr;
    70     m_inspectorCanvasAgent = nullptr;
    7170}
    7271

  • trunk/Source/WebCore/inspector/InstrumentingAgents.h

    r218376 r218395  
    4545
    4646class InspectorApplicationCacheAgent;
    47 class InspectorCanvasAgent;
    4847class InspectorCSSAgent;
    4948class InspectorDOMAgent;
    … …  
    8483    InspectorPageAgent* inspectorPageAgent() const { return m_inspectorPageAgent; }
    8584    void setInspectorPageAgent(InspectorPageAgent* agent) { m_inspectorPageAgent = agent; }
    86 
    87     InspectorCanvasAgent* inspectorCanvasAgent() const { return m_inspectorCanvasAgent; }
    88     void setInspectorCanvasAgent(InspectorCanvasAgent* agent) { m_inspectorCanvasAgent = agent; }
    8985
    9086    InspectorCSSAgent* inspectorCSSAgent() const { return m_inspectorCSSAgent; }
    … …  
    175171    PageHeapAgent* m_pageHeapAgent { nullptr };
    176172    InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent { nullptr };
    177     InspectorCanvasAgent* m_inspectorCanvasAgent { nullptr };
    178173};
    179174

  • trunk/Source/WebInspectorUI/ChangeLog

    r218376 r218395  
     12017-06-16  Matt Lewis  <jlewis3@apple.com>
     2
     3        Unreviewed, rolling out r218376.
     4
     5        The patch cause multiple Layout Test Crashes.
     6
     7        Reverted changeset:
     8
     9        "Web Inspector: Instrument 2D/WebGL canvas contexts in the
     10        backend"
     11        https://bugs.webkit.org/show_bug.cgi?id=172623
     12        http://trac.webkit.org/changeset/218376
     13
    1142017-06-15  Matt Baker  <mattbaker@apple.com>
    215

  • trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

    r218376 r218395  
    9696    if (InspectorBackend.registerReplayDispatcher)
    9797        InspectorBackend.registerReplayDispatcher(new WebInspector.ReplayObserver);
    98     if (InspectorBackend.registerCanvasDispatcher)
    99         InspectorBackend.registerCanvasDispatcher(new WebInspector.CanvasObserver);
    10098
    10199    // Main backend target.
    … …  
    139137    this.replayManager = new WebInspector.ReplayManager;
    140138    this.domDebuggerManager = new WebInspector.DOMDebuggerManager;
    141     this.canvasManager = new WebInspector.CanvasManager;
    142139
    143140    // Enable the Console Agent after creating the singleton managers.

  • trunk/Source/WebInspectorUI/UserInterface/Main.html

    r218376 r218395  
    275275    <script src="Protocol/ApplicationCacheObserver.js"></script>
    276276    <script src="Protocol/CSSObserver.js"></script>
    277     <script src="Protocol/CanvasObserver.js"></script>
    278277    <script src="Protocol/ConsoleObserver.js"></script>
    279278    <script src="Protocol/DOMObserver.js"></script>
    … …  
    319318    <script src="Models/CSSStyleSheet.js"></script>
    320319    <script src="Models/CallFrame.js"></script>
    321     <script src="Models/Canvas.js"></script>
    322320    <script src="Models/Collection.js"></script>
    323321    <script src="Models/CollectionEntry.js"></script>
    … …  
    737735    <script src="Controllers/BreakpointPopoverController.js"></script>
    738736    <script src="Controllers/CSSStyleManager.js"></script>
    739     <script src="Controllers/CanvasManager.js"></script>
    740737    <script src="Controllers/CodeMirrorColorEditingController.js"></script>
    741738    <script src="Controllers/CodeMirrorCompletionController.js"></script>

  • trunk/Source/WebInspectorUI/UserInterface/Test.html

    r218376 r218395  
    7272    <script src="Protocol/InspectorObserver.js"></script>
    7373    <script src="Protocol/CSSObserver.js"></script>
    74     <script src="Protocol/CanvasObserver.js"></script>
    7574    <script src="Protocol/ConsoleObserver.js"></script>
    7675    <script src="Protocol/DOMObserver.js"></script>
    … …  
    107106    <script src="Models/CallingContextTree.js"></script>
    108107    <script src="Models/CallingContextTreeNode.js"></script>
    109     <script src="Models/Canvas.js"></script>
    110108    <script src="Models/Collection.js"></script>
    111109    <script src="Models/CollectionEntry.js"></script>
    … …  
    188186    <script src="Controllers/BreakpointLogMessageLexer.js"></script>
    189187    <script src="Controllers/CSSStyleManager.js"></script>
    190     <script src="Controllers/CanvasManager.js"></script>
    191188    <script src="Controllers/DOMDebuggerManager.js"></script>
    192189    <script src="Controllers/DOMTreeManager.js"></script>

  • trunk/Source/WebInspectorUI/UserInterface/Test/Test.js

    r218376 r218395  
    5050    if (InspectorBackend.registerReplayDispatcher)
    5151        InspectorBackend.registerReplayDispatcher(new WebInspector.ReplayObserver);
    52     InspectorBackend.registerCanvasDispatcher(new WebInspector.CanvasObserver);
    5352
    5453    WebInspector.mainTarget = new WebInspector.MainTarget;
    … …  
    7170    this.replayManager = new WebInspector.ReplayManager;
    7271    this.domDebuggerManager = new WebInspector.DOMDebuggerManager;
    73     this.canvasManager = new WebInspector.CanvasManager;
    7472
    7573    document.addEventListener("DOMContentLoaded", this.contentLoaded);
Note: See TracChangeset for help on using the changeset viewer.