Changeset 119105 in webkit


Ignore:
Timestamp:
May 31, 2012 8:27:15 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Crash when closing web page if selection is active
https://bugs.webkit.org/show_bug.cgi?id=87962

Patch by Arvid Nilsson <anilsson@rim.com> on 2012-05-31
Reviewed by Antonio Gomes.

The embedder may try to remove a layer from the compositor at a stage
where the compositor has been set to 0.

  • Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::addCompositingThreadOverlay):
(BlackBerry::WebKit::WebPage::removeCompositingThreadOverlay):

Location:
trunk/Source/WebKit/blackberry
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r119046 r119105  
    62476247#if USE(ACCELERATED_COMPOSITING)
    62486248    ASSERT(Platform::userInterfaceThreadMessageClient()->isCurrentThread());
     6249    if (!d->compositor())
     6250        return;
     6251
    62496252    overlay->d->setPage(d);
    62506253    d->compositor()->addOverlay(overlay->d->layerCompositingThread());
     
    62566259#if USE(ACCELERATED_COMPOSITING)
    62576260    ASSERT(Platform::userInterfaceThreadMessageClient()->isCurrentThread());
    6258     d->compositor()->removeOverlay(overlay->d->layerCompositingThread());
     6261    if (d->compositor())
     6262        d->compositor()->removeOverlay(overlay->d->layerCompositingThread());
    62596263    overlay->d->clear();
    62606264    overlay->d->setPage(0);
  • trunk/Source/WebKit/blackberry/ChangeLog

    r119046 r119105  
     12012-05-31  Arvid Nilsson  <anilsson@rim.com>
     2
     3        [BlackBerry] Crash when closing web page if selection is active
     4        https://bugs.webkit.org/show_bug.cgi?id=87962
     5
     6        Reviewed by Antonio Gomes.
     7
     8        The embedder may try to remove a layer from the compositor at a stage
     9        where the compositor has been set to 0.
     10
     11        * Api/WebPage.cpp:
     12        (BlackBerry::WebKit::WebPage::addCompositingThreadOverlay):
     13        (BlackBerry::WebKit::WebPage::removeCompositingThreadOverlay):
     14
    1152012-05-30  Konrad Piascik  <kpiascik@rim.com>
    216
Note: See TracChangeset for help on using the changeset viewer.