Changeset 111220 in webkit


Ignore:
Timestamp:
Mar 19, 2012 12:46:09 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[chromium] DRT crashes at shutdown.
https://bugs.webkit.org/show_bug.cgi?id=81504

Patch by Hao Zheng <zhenghao@chromium.org> on 2012-03-19
Reviewed by James Robinson.

WebCompositor must be destroyed after WebView is properly destroyed,
or some compositor objects like CCLayerTreeHost may not be destroyed.
However, it is really hard to make the destruction order correct
explicitly in ~TestShell. So move it out to DumpRenderTree.

  • DumpRenderTree/chromium/DumpRenderTree.cpp:

(main):

  • DumpRenderTree/chromium/TestShell.cpp:

(TestShell::~TestShell):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r111215 r111220  
     12012-03-19  Hao Zheng  <zhenghao@chromium.org>
     2
     3        [chromium] DRT crashes at shutdown.
     4        https://bugs.webkit.org/show_bug.cgi?id=81504
     5
     6        Reviewed by James Robinson.
     7
     8        WebCompositor must be destroyed after WebView is properly destroyed,
     9        or some compositor objects like CCLayerTreeHost may not be destroyed.
     10        However, it is really hard to make the destruction order correct
     11        explicitly in ~TestShell. So move it out to DumpRenderTree.
     12
     13        * DumpRenderTree/chromium/DumpRenderTree.cpp:
     14        (main):
     15        * DumpRenderTree/chromium/TestShell.cpp:
     16        (TestShell::~TestShell):
     17
    1182012-03-19  Dirk Pranke  <dpranke@chromium.org>
    219
  • trunk/Tools/DumpRenderTree/chromium/DumpRenderTree.cpp

    r107022 r111220  
    3232
    3333#include "TestShell.h"
     34#include "WebCompositor.h"
    3435#include "webkit/support/webkit_support.h"
    3536#include <v8/include/v8-testing.h>
     
    287288    }
    288289
     290    // Shutdown WebCompositor after TestShell is destructed properly.
     291    WebKit::WebCompositor::shutdown();
     292
    289293    return EXIT_SUCCESS;
    290294}
  • trunk/Tools/DumpRenderTree/chromium/TestShell.cpp

    r110784 r111220  
    177177    // Destroy the WebView before its WebViewHost.
    178178    m_drtDevToolsAgent->setWebView(0);
    179 
    180     WebCompositor::shutdown();
    181179}
    182180
Note: See TracChangeset for help on using the changeset viewer.