Changeset 148862 in webkit


Ignore:
Timestamp:
Apr 22, 2013 12:57:46 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Fix multiple definition of ImageBuffer::platformLayer() in the BlackBerry port
https://bugs.webkit.org/show_bug.cgi?id=114936

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-04-22
Reviewed by Carlos Garcia Campos.

We already have a definition in ImageBufferBlackBerry.cpp.

  • platform/graphics/ImageBuffer.cpp:

(WebCore):

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r148859 r148862  
     12013-04-22  Alberto Garcia  <agarcia@igalia.com>
     2
     3        Fix multiple definition of ImageBuffer::platformLayer() in the BlackBerry port
     4        https://bugs.webkit.org/show_bug.cgi?id=114936
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        We already have a definition in ImageBufferBlackBerry.cpp.
     9
     10        * platform/graphics/ImageBuffer.cpp:
     11        (WebCore):
     12
    1132013-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/WebCore/platform/graphics/ImageBuffer.cpp

    r148264 r148862  
    100100}
    101101
    102 #if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) && !USE(CAIRO)
     102#if USE(ACCELERATED_COMPOSITING) && !USE(SKIA) && !USE(CAIRO) && !PLATFORM(BLACKBERRY)
    103103PlatformLayer* ImageBuffer::platformLayer() const
    104104{
Note: See TracChangeset for help on using the changeset viewer.