Changeset 250386 in webkit


Ignore:
Timestamp:
Sep 26, 2019 10:49:47 AM (5 years ago)
Author:
Truitt Savell
Message:

Unreviewed, rolling out r250381.

broke multiple webgpu/ tests on Mojave WK2

Reverted changeset:

"Flaky Test: inspector/canvas/updateShader.html"
​https://bugs.webkit.org/show_bug.cgi?id=202186
​https://trac.webkit.org/changeset/250381

Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r250385 r250386  
     12019-09-26  Truitt Savell  <tsavell@apple.com>
     2
     3        Unreviewed, rolling out r250381.
     4
     5        broke multiple webgpu/ tests on Mojave WK2
     6
     7        Reverted changeset:
     8
     9        "Flaky Test: inspector/canvas/updateShader.html"
     10        https://bugs.webkit.org/show_bug.cgi?id=202186
     11        https://trac.webkit.org/changeset/250381
     12
    1132019-09-26  Alexey Shvayka  <shvaikalesh@gmail.com>
    214

  • trunk/Source/WebCore/Modules/webgpu/WebGPUPipeline.cpp

    r250381 r250386  
    5858WebGPUPipeline::WebGPUPipeline(WebGPUDevice& device, GPUErrorScopes& errorScopes)
    5959    : GPUObjectBase(makeRef(errorScopes))
    60     , ContextDestructionObserver(device.scriptExecutionContext())
     60    , m_scriptExecutionContext(device.scriptExecutionContext())
    6161{
    62     ASSERT(scriptExecutionContext());
     62    ASSERT(m_scriptExecutionContext);
    6363
    6464    {
    … …  
    7979}
    8080
    81 void WebGPUPipeline::contextDestroyed()
    82 {
    83     InspectorInstrumentation::willDestroyWebGPUPipeline(*this);
    84 
    85     ContextDestructionObserver::contextDestroyed();
    86 }
    87 
    8881} // namespace WebCore
    8982

  • trunk/Source/WebCore/Modules/webgpu/WebGPUPipeline.h

    r250381 r250386  
    2828#if ENABLE(WEBGPU)
    2929
    30 #include "ContextDestructionObserver.h"
    3130#include "GPUObjectBase.h"
    3231#include "WebGPUShaderModule.h"
    … …  
    3938class WebGPUDevice;
    4039
    41 class WebGPUPipeline : public GPUObjectBase, public ContextDestructionObserver {
     40class WebGPUPipeline : public GPUObjectBase {
    4241public:
    4342    virtual ~WebGPUPipeline();
    … …  
    4645    static Lock& instancesMutex();
    4746
    48     void contextDestroyed() final;
    49 
    5047    virtual bool isRenderPipeline() const { return false; }
    5148    virtual bool isComputePipeline() const { return false; }
    5249
     50    ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
    5351    virtual bool isValid() const = 0;
    5452
    … …  
    6260protected:
    6361    WebGPUPipeline(WebGPUDevice&, GPUErrorScopes&);
     62
     63    ScriptExecutionContext* m_scriptExecutionContext;
    6464};
    6565

  • trunk/Source/WebCore/html/canvas/WebGLProgram.cpp

    r250381 r250386  
    6363WebGLProgram::WebGLProgram(WebGLRenderingContextBase& ctx)
    6464    : WebGLSharedObject(ctx)
    65     , ContextDestructionObserver(ctx.scriptExecutionContext())
    66 {
    67     ASSERT(scriptExecutionContext());
     65    , m_scriptExecutionContext(ctx.scriptExecutionContext())
     66{
     67    ASSERT(m_scriptExecutionContext);
    6868
    6969    {
    … …  
    8686        instances(lock).remove(this);
    8787    }
    88 }
    89 
    90 void WebGLProgram::contextDestroyed()
    91 {
    92     InspectorInstrumentation::willDestroyWebGLProgram(*this);
    93 
    94     ContextDestructionObserver::contextDestroyed();
    9588}
    9689

  • trunk/Source/WebCore/html/canvas/WebGLProgram.h

    r250381 r250386  
    2828#if ENABLE(WEBGL)
    2929
    30 #include "ContextDestructionObserver.h"
    3130#include "WebGLSharedObject.h"
    3231#include <wtf/Forward.h>
    … …  
    3837class WebGLShader;
    3938
    40 class WebGLProgram final : public WebGLSharedObject, public ContextDestructionObserver {
     39class WebGLProgram final : public WebGLSharedObject {
    4140public:
    4241    static Ref<WebGLProgram> create(WebGLRenderingContextBase&);
    … …  
    4645    static Lock& instancesMutex();
    4746
    48     void contextDestroyed() final;
     47    ScriptExecutionContext* scriptExecutionContext() const { return m_scriptExecutionContext; }
    4948
    5049    unsigned numActiveAttribLocations();
    … …  
    7776    void cacheInfoIfNeeded();
    7877
     78    ScriptExecutionContext* m_scriptExecutionContext;
     79
    7980    Vector<GC3Dint> m_activeAttribLocations;
    8081
Note: See TracChangeset for help on using the changeset viewer.