Changeset 87748 in webkit


Ignore:
Timestamp:
May 31, 2011 1:21:30 PM (13 years ago)
Author:
senorblanco@chromium.org
Message:

2011-05-31 Justin Novosad <​junov@chromium.org>

Reviewed by Stephen White.

[Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
​https://bugs.webkit.org/show_bug.cgi?id=61790
Changing the build guards in these two files that are required
by the accelerated compositing feature.

  • platform/graphics/gpu/LoopBlinnMathUtils.cpp:
  • platform/graphics/gpu/TilingData.cpp:
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r87746 r87748  
     12011-05-31  Justin Novosad  <junov@chromium.org>
     2
     3        Reviewed by Stephen White.
     4
     5        [Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
     6        https://bugs.webkit.org/show_bug.cgi?id=61790
     7        Changing the build guards in these two files that are required
     8        by the accelerated compositing feature.
     9
     10        * platform/graphics/gpu/LoopBlinnMathUtils.cpp:
     11        * platform/graphics/gpu/TilingData.cpp:
     12
     13<<<<<<< .mine
     142011-05-31  Justin Novosad  <junov@chromium.org>
     15
     16        Reviewed by Stephen White.
     17
     18        [Chromium] Build fails when ACCELERATED_2D_CANVAS is disabled
     19        https://bugs.webkit.org/show_bug.cgi?id=61790
     20        Changing the build guards in these two files that are required
     21        by the accelerated compositing feature.
     22
     23        * platform/graphics/gpu/LoopBlinnMathUtils.cpp:
     24        * platform/graphics/gpu/TilingData.cpp:
     25
     26=======
    1272011-05-31  Rob Buis  <rbuis@rim.com>
    228
    … …  
    129155        (WebCore::XMLDocumentParser::insertErrorMessageBlock):
    130156
     157>>>>>>> .r87747
    1311582011-05-31  Andreas Kling  <kling@webkit.org>
    132159

  • trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnMathUtils.cpp

    r82614 r87748  
    2626#include "config.h"
    2727
    28 #if ENABLE(ACCELERATED_2D_CANVAS)
     28#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
    2929
    3030#include "LoopBlinnMathUtils.h"

  • trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp

    r87094 r87748  
    3131#include "config.h"
    3232
    33 #if ENABLE(ACCELERATED_2D_CANVAS)
     33#if USE(ACCELERATED_COMPOSITING) || ENABLE(ACCELERATED_2D_CANVAS)
    3434
    3535#include "TilingData.h"
Note: See TracChangeset for help on using the changeset viewer.