Changeset 85135 in webkit


Ignore:
Timestamp:
Apr 27, 2011 6:42:20 PM (13 years ago)
Author:
jamesr@google.com
Message:

2011-04-27 James Robinson <jamesr@chromium.org>

Reviewed by Adam Barth.

Fix OwnPtr strict issues in chromium linux build
https://bugs.webkit.org/show_bug.cgi?id=59664

  • platform/graphics/chromium/ComplexTextControllerLinux.cpp: (WebCore::ComplexTextController::getNormalizedTextRun):
  • platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::ImageBuffer):
  • platform/graphics/skia/PlatformContextSkia.cpp: (WebCore::PlatformContextSkia::PlatformContextSkia):

2011-04-27 James Robinson <jamesr@chromium.org>

Reviewed by Adam Barth.

Fix OwnPtr strict issues in chromium linux build
https://bugs.webkit.org/show_bug.cgi?id=59664

  • src/WebImageDecoder.cpp: (WebKit::WebImageDecoder::getFrameAtIndex):
  • src/WebImageSkia.cpp: (WebKit::WebImage::fromData):
Location:
trunk/Source
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r85133 r85135  
     12011-04-27  James Robinson  <jamesr@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix OwnPtr strict issues in chromium linux build
     6        https://bugs.webkit.org/show_bug.cgi?id=59664
     7
     8        * platform/graphics/chromium/ComplexTextControllerLinux.cpp:
     9        (WebCore::ComplexTextController::getNormalizedTextRun):
     10        * platform/graphics/skia/ImageBufferSkia.cpp:
     11        (WebCore::ImageBuffer::ImageBuffer):
     12        * platform/graphics/skia/PlatformContextSkia.cpp:
     13        (WebCore::PlatformContextSkia::PlatformContextSkia):
     14
    1152011-04-27  Chris Rogers  <crogers@google.com>
    216
  • trunk/Source/WebCore/platform/graphics/chromium/ComplexTextControllerLinux.cpp

    r85013 r85135  
    395395    normalizeSpacesAndMirrorChars(sourceText, originalRun.rtl(), normalizedBuffer.get(), normalizedBufferLength);
    396396
    397     normalizedRun.set(new TextRun(originalRun));
     397    normalizedRun = adoptPtr(new TextRun(originalRun));
    398398    normalizedRun->setText(normalizedBuffer.get(), normalizedBufferLength);
    399399    return *normalizedRun;
  • trunk/Source/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

    r84374 r85135  
    7575    m_data.m_canvas = canvas;
    7676    m_data.m_platformContext.setCanvas(m_data.m_canvas.get());
    77     m_context.set(new GraphicsContext(&m_data.m_platformContext));
     77    m_context = adoptPtr(new GraphicsContext(&m_data.m_platformContext));
    7878    m_context->platformContext()->setDrawingToImageBuffer(true);
    7979
  • trunk/Source/WebCore/platform/graphics/skia/PlatformContextSkia.cpp

    r85017 r85135  
    216216    , m_drawingToImageBuffer(false)
    217217    , m_accelerationMode(NoAcceleration)
    218 #if ENABLE(ACCELERATED_2D_CANVAS)
    219     , m_gpuCanvas(0)
    220 #endif
    221218    , m_backingStoreState(None)
    222219{
  • trunk/Source/WebKit/chromium/ChangeLog

    r85126 r85135  
     12011-04-27  James Robinson  <jamesr@chromium.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Fix OwnPtr strict issues in chromium linux build
     6        https://bugs.webkit.org/show_bug.cgi?id=59664
     7
     8        * src/WebImageDecoder.cpp:
     9        (WebKit::WebImageDecoder::getFrameAtIndex):
     10        * src/WebImageSkia.cpp:
     11        (WebKit::WebImage::fromData):
     12
    1132011-04-27  Adam Barth  <abarth@webkit.org>
    214
  • trunk/Source/WebKit/chromium/src/WebImageDecoder.cpp

    r75748 r85135  
    4141#if WEBKIT_USING_SKIA
    4242#include <wtf/OwnPtr.h>
     43#include <wtf/PassOwnPtr.h>
     44#endif
     45
    4346#include <wtf/PassRefPtr.h>
    44 #endif
    4547
    4648using namespace WebCore;
     
    111113        return WebImage();
    112114#if WEBKIT_USING_SKIA
    113     OwnPtr<NativeImageSkia>image(frameBuffer->asNewNativeImage());
     115    OwnPtr<NativeImageSkia> image = adoptPtr(frameBuffer->asNewNativeImage());
    114116    return WebImage(*image);
    115117#elif WEBKIT_USING_CG
  • trunk/Source/WebKit/chromium/src/WebImageSkia.cpp

    r50720 r85135  
    4141
    4242#include <wtf/OwnPtr.h>
     43#include <wtf/PassOwnPtr.h>
    4344#include <wtf/PassRefPtr.h>
    4445
     
    7778    }
    7879
    79     OwnPtr<NativeImageSkia> frame(source.createFrameAtIndex(index));
    80     if (!frame.get())
     80    OwnPtr<NativeImageSkia> frame = adoptPtr(source.createFrameAtIndex(index));
     81    if (!frame)
    8182        return WebImage();
    8283
Note: See TracChangeset for help on using the changeset viewer.