Changeset 118850 in webkit


Ignore:
Timestamp:
May 29, 2012 4:12:38 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] WebOverlay build fixes and bug fixes
​https://bugs.webkit.org/show_bug.cgi?id=87780

Patch by Arvid Nilsson <​anilsson@rim.com> on 2012-05-29
Reviewed by Rob Buis.

Fix build when accelerated compositing disabled, or debug build.

Also fix a bug where the selection overlay would not disappear properly
because of a typo in WebPage::removeOverlay(). Also convert said method
to early return style.

Debug build fixes contributed by Ming Xie.

  • Api/WebOverlay.cpp:

(BlackBerry::WebKit::WebOverlay::addAnimation):
(BlackBerry::WebKit::WebOverlay::setContentsToImage):
(WebKit):
(BlackBerry::WebKit::WebOverlay::setContentsToColor):
(BlackBerry::WebKit::WebOverlay::setDrawsContent):
(BlackBerry::WebKit::WebOverlay::invalidate):
(BlackBerry::WebKit::WebOverlay::setClient):
(BlackBerry::WebKit::WebOverlay::override):
(BlackBerry::WebKit::WebOverlay::resetOverrides):

  • Api/WebOverlayOverride.cpp:

(BlackBerry::WebKit::WebOverlayOverride::WebOverlayOverride):

  • Api/WebOverlay_p.h:

(BlackBerry::WebKit::WebOverlayPrivate::~WebOverlayPrivate):

  • Api/WebPage.cpp:

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

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

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/blackberry/Api/WebOverlay.cpp

    r118750 r118850  
    735735}
    736736
    737 void WebOverlay::addAnimation(WebAnimation*)
     737void WebOverlay::addAnimation(const WebAnimation&)
    738738{
    739739}
    … …  
    743743}
    744744
     745void WebOverlay::setContentsToImage(const unsigned char*, const Platform::IntSize&)
     746{
     747}
     748
     749void WebOverlay::setContentsToColor(int, int, int, int)
     750{
     751}
     752
     753void WebOverlay::setDrawsContent(bool)
     754{
     755}
     756
     757void WebOverlay::invalidate()
     758{
     759}
     760
     761void WebOverlay::setClient(WebOverlayClient*)
     762{
     763}
     764
     765WebOverlayOverride* WebOverlay::override()
     766{
     767}
     768
     769void WebOverlay::resetOverrides()
     770{
     771}
     772
    745773}
    746774}

  • trunk/Source/WebKit/blackberry/Api/WebOverlayOverride.cpp

    r118750 r118850  
    8787namespace WebKit {
    8888
    89 WebOverlayOverride::WebOverlayOverride(WebOverlayPrivate*)
     89WebOverlayOverride::WebOverlayOverride(WebOverlayPrivate*, bool)
    9090{
    9191}

  • trunk/Source/WebKit/blackberry/Api/WebOverlay_p.h

    r118750 r118850  
    6262    virtual ~WebOverlayPrivate()
    6363    {
    64         ASSERT(pthread_self() == d->nativeThread);
     64        ASSERT(pthread_self() == nativeThread);
    6565    }
    6666

  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r118785 r118850  
    62296229{
    62306230#if USE(ACCELERATED_COMPOSITING)
    6231     if (overlay->d->graphicsLayer() == d->overlayLayer()) {
    6232         overlay->removeFromParent();
    6233         overlay->d->clear();
    6234         overlay->d->setPage(0);
    6235     }
     6231    if (overlay->d->graphicsLayer()->parent() != d->overlayLayer())
     6232        return;
     6233
     6234    overlay->removeFromParent();
     6235    overlay->d->clear();
     6236    overlay->d->setPage(0);
    62366237#endif
    62376238}
    … …  
    62406241{
    62416242#if USE(ACCELERATED_COMPOSITING)
    6242     ASSERT(userInterfaceThreadMessageClient()->isCurrentThread());
     6243    ASSERT(Platform::userInterfaceThreadMessageClient()->isCurrentThread());
    62436244    overlay->d->setPage(d);
    62446245    d->compositor()->addOverlay(overlay->d->layerCompositingThread());
    … …  
    62496250{
    62506251#if USE(ACCELERATED_COMPOSITING)
    6251     ASSERT(userInterfaceThreadMessageClient()->isCurrentThread());
     6252    ASSERT(Platform::userInterfaceThreadMessageClient()->isCurrentThread());
    62526253    d->compositor()->removeOverlay(overlay->d->layerCompositingThread());
    62536254    overlay->d->clear();

  • trunk/Source/WebKit/blackberry/ChangeLog

    r118847 r118850  
     12012-05-29  Arvid Nilsson  <anilsson@rim.com>
     2
     3        [BlackBerry] WebOverlay build fixes and bug fixes
     4        https://bugs.webkit.org/show_bug.cgi?id=87780
     5
     6        Reviewed by Rob Buis.
     7
     8        Fix build when accelerated compositing disabled, or debug build.
     9
     10        Also fix a bug where the selection overlay would not disappear properly
     11        because of a typo in WebPage::removeOverlay(). Also convert said method
     12        to early return style.
     13
     14        Debug build fixes contributed by Ming Xie.
     15
     16        * Api/WebOverlay.cpp:
     17        (BlackBerry::WebKit::WebOverlay::addAnimation):
     18        (BlackBerry::WebKit::WebOverlay::setContentsToImage):
     19        (WebKit):
     20        (BlackBerry::WebKit::WebOverlay::setContentsToColor):
     21        (BlackBerry::WebKit::WebOverlay::setDrawsContent):
     22        (BlackBerry::WebKit::WebOverlay::invalidate):
     23        (BlackBerry::WebKit::WebOverlay::setClient):
     24        (BlackBerry::WebKit::WebOverlay::override):
     25        (BlackBerry::WebKit::WebOverlay::resetOverrides):
     26        * Api/WebOverlayOverride.cpp:
     27        (BlackBerry::WebKit::WebOverlayOverride::WebOverlayOverride):
     28        * Api/WebOverlay_p.h:
     29        (BlackBerry::WebKit::WebOverlayPrivate::~WebOverlayPrivate):
     30        * Api/WebPage.cpp:
     31        (BlackBerry::WebKit::WebPage::removeOverlay):
     32        (BlackBerry::WebKit::WebPage::addCompositingThreadOverlay):
     33        (BlackBerry::WebKit::WebPage::removeCompositingThreadOverlay):
     34
    1352012-05-29  Yong Li  <yoli@rim.com>
    236
Note: See TracChangeset for help on using the changeset viewer.