Changeset 85433 in webkit


Ignore:
Timestamp:
May 1, 2011 3:28:12 PM (13 years ago)
Author:
Patrick Gansterer
Message:

2011-05-01 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

[WINCE] Fix OwnPtr strict issues
​https://bugs.webkit.org/show_bug.cgi?id=59898

  • page/wince/FrameWinCE.cpp: (WebCore::imageFromSelection):
  • platform/graphics/wince/FontPlatformData.cpp: (WebCore::FixedSizeFontData::create): (WebCore::FontPlatformPrivateData::FontPlatformData::hfont): (WebCore::FontPlatformPrivateData::FontPlatformData::getScaledFontHandle): (WebCore::FontPlatformPrivateData::FontPlatformData::discardFontHandle):
  • platform/graphics/wince/GraphicsContextWinCE.cpp: (WebCore::GraphicsContext::strokeArc): (WebCore::GraphicsContext::fillRect): (WebCore::GraphicsContext::clip): (WebCore::GraphicsContext::fillRoundedRect): (WebCore::GraphicsContext::drawRoundCorner): (WebCore::GraphicsContext::drawText):
  • platform/graphics/wince/ImageBufferWinCE.cpp: (WebCore::ImageBuffer::ImageBuffer):
  • platform/graphics/wince/ImageWinCE.cpp: (WebCore::BitmapImage::getHBITMAPOfSize):
  • platform/graphics/wince/SharedBitmap.cpp: (WebCore::SharedBitmap::SharedBitmap):
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85428 r85433  
     12011-05-01  Patrick Gansterer  <paroga@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        [WINCE] Fix OwnPtr strict issues
     6        https://bugs.webkit.org/show_bug.cgi?id=59898
     7
     8        * page/wince/FrameWinCE.cpp:
     9        (WebCore::imageFromSelection):
     10        * platform/graphics/wince/FontPlatformData.cpp:
     11        (WebCore::FixedSizeFontData::create):
     12        (WebCore::FontPlatformPrivateData::FontPlatformData::hfont):
     13        (WebCore::FontPlatformPrivateData::FontPlatformData::getScaledFontHandle):
     14        (WebCore::FontPlatformPrivateData::FontPlatformData::discardFontHandle):
     15        * platform/graphics/wince/GraphicsContextWinCE.cpp:
     16        (WebCore::GraphicsContext::strokeArc):
     17        (WebCore::GraphicsContext::fillRect):
     18        (WebCore::GraphicsContext::clip):
     19        (WebCore::GraphicsContext::fillRoundedRect):
     20        (WebCore::GraphicsContext::drawRoundCorner):
     21        (WebCore::GraphicsContext::drawText):
     22        * platform/graphics/wince/ImageBufferWinCE.cpp:
     23        (WebCore::ImageBuffer::ImageBuffer):
     24        * platform/graphics/wince/ImageWinCE.cpp:
     25        (WebCore::BitmapImage::getHBITMAPOfSize):
     26        * platform/graphics/wince/SharedBitmap.cpp:
     27        (WebCore::SharedBitmap::SharedBitmap):
     28
    1292011-05-01  Ryosuke Niwa  <rniwa@webkit.org>
    230

  • trunk/Source/WebCore/page/wince/FrameWinCE.cpp

    r77438 r85433  
    129129    }
    130130
    131     OwnPtr<HDC> bmpDC(CreateCompatibleDC(g_screenDC));
     131    OwnPtr<HDC> bmpDC = adoptPtr(CreateCompatibleDC(g_screenDC));
    132132    HBITMAP hBmp = CreateCompatibleBitmap(g_screenDC, w, h);
    133133    if (!hBmp)

  • trunk/Source/WebCore/platform/graphics/wince/FontPlatformData.cpp

    r81548 r85433  
    263263    winFont.lfFaceName[len] = L'\0';
    264264
    265     fontData->m_hfont.set(CreateFontIndirect(&winFont));
     265    fontData->m_hfont = adoptPtr(CreateFontIndirect(&winFont));
    266266
    267267    HGDIOBJ oldFont = SelectObject(g_screenDC, fontData->m_hfont.get());
    … …  
    395395
    396396    if (!m_private->m_rootFontData->m_hfont)
    397         m_private->m_rootFontData->m_hfont.set(CreateFontIndirect(&m_private->m_rootFontData->m_font));
     397        m_private->m_rootFontData->m_hfont = adoptPtr(CreateFontIndirect(&m_private->m_rootFontData->m_font));
    398398
    399399    return m_private->m_rootFontData->m_hfont.get();
    … …  
    411411        font.lfHeight = -height;
    412412        font.lfWidth = width;
    413         m_private->m_hfontScaled.set(CreateFontIndirect(&font));
     413        m_private->m_hfontScaled = adoptPtr(CreateFontIndirect(&font));
    414414    }
    415415
    … …  
    423423
    424424    if (m_private->m_rootFontData->m_hfont) {
    425         m_private->m_rootFontData->m_hfont.set(0);
     425        m_private->m_rootFontData->m_hfont = nullptr;
    426426        return true;
    427427    }
    428428
    429429    if (m_private->m_hfontScaled) {
    430         m_private->m_hfontScaled.set(0);
     430        m_private->m_hfontScaled = nullptr;
    431431        return true;
    432432    }

  • trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp

    r83216 r85433  
    832832    }
    833833
    834     OwnPtr<HRGN> clipRgn(CreateRectRgn(0, 0, 0, 0));
     834    OwnPtr<HRGN> clipRgn = adoptPtr(CreateRectRgn(0, 0, 0, 0));
    835835    bool newClip;
    836836    if (GetClipRgn(dc, clipRgn.get()) <= 0) {
    837837        newClip = true;
    838         clipRgn.set(CreateRectRgn(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom));
     838        clipRgn = adoptPtr(CreateRectRgn(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom));
    839839        SelectClipRgn(dc, clipRgn.get());
    840840    } else {
    … …  
    949949        return;
    950950
    951     OwnPtr<HBRUSH> hbrush(CreateSolidBrush(RGB(color.red(), color.green(), color.blue())));
     951    OwnPtr<HBRUSH> hbrush = adoptPtr(CreateSolidBrush(RGB(color.red(), color.green(), color.blue())));
    952952    FillRect(transparentDC.hdc(), &transparentDC.rect(), hbrush.get());
    953953}
    … …  
    963963    IntRect trRect = enclosingIntRect(m_data->mapRect(rect));
    964964
    965     OwnPtr<HRGN> clipRgn(CreateRectRgn(0, 0, 0, 0));
     965    OwnPtr<HRGN> clipRgn = adoptPtr(CreateRectRgn(0, 0, 0, 0));
    966966    if (GetClipRgn(m_data->m_dc, clipRgn.get()) > 0)
    967967        IntersectClipRect(m_data->m_dc, trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY());
    968968    else {
    969         clipRgn.set(CreateRectRgn(trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY()));
     969        clipRgn = adoptPtr(CreateRectRgn(trRect.x(), trRect.y(), trRect.maxX(), trRect.maxY()));
    970970        SelectClipRgn(m_data->m_dc, clipRgn.get());
    971971    }
    … …  
    12531253    clipRect.bottom = centerPoint.y();
    12541254
    1255     OwnPtr<HRGN> clipRgn(CreateRectRgn(0, 0, 0, 0));
     1255    OwnPtr<HRGN> clipRgn = adoptPtr(CreateRectRgn(0, 0, 0, 0));
    12561256    bool needsNewClip = (GetClipRgn(dc, clipRgn.get()) <= 0);
    12571257   
    … …  
    12881288        return;
    12891289
    1290     OwnPtr<HRGN> clipRgn(CreateRectRgn(0, 0, 0, 0));
    1291     if (needsNewClip)  {
    1292         clipRgn.set(CreateRectRgn(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom));
     1290    OwnPtr<HRGN> clipRgn = adoptPtr(CreateRectRgn(0, 0, 0, 0));
     1291    if (needsNewClip) {
     1292        clipRgn = adoptPtr(CreateRectRgn(clipRect.left, clipRect.top, clipRect.right, clipRect.bottom));
    12931293        SelectClipRgn(dc, clipRgn.get());
    1294     } else 
     1294    } else
    12951295        IntersectClipRect(dc, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
    1296    
     1296
    12971297    ::RoundRect(dc, rectWin.left , rectWin.top , rectWin.right , rectWin.bottom , width, height);
    1298    
     1298
    12991299    SelectClipRgn(dc, needsNewClip ? 0 : clipRgn.get());
    13001300}
    … …  
    16231623        offset += width;
    16241624
    1625         OwnPtr<HPEN> hPen(CreatePen(PS_DASH, 1, fontColor));
     1625        OwnPtr<HPEN> hPen = adoptPtr(CreatePen(PS_DASH, 1, fontColor));
    16261626        HGDIOBJ oldPen = SelectObject(m_data->m_dc, hPen.get());
    16271627

  • trunk/Source/WebCore/platform/graphics/wince/ImageBufferWinCE.cpp

    r76371 r85433  
    8080    UNUSED_PARAM(colorSpace);
    8181
    82     m_context.set(new GraphicsContext(0));
     82    m_context = adoptPtr(new GraphicsContext(0));
    8383    m_context->setBitmap(m_data.m_bitmap);
    8484    success = true;

  • trunk/Source/WebCore/platform/graphics/wince/ImageWinCE.cpp

    r75748 r85433  
    7171    int bufferSize = bmpInfo.bmWidthBytes * bmpInfo.bmHeight;
    7272
    73     OwnPtr<HDC> hdc(CreateCompatibleDC(0));
     73    OwnPtr<HDC> hdc = adoptPtr(CreateCompatibleDC(0));
    7474    HGDIOBJ hOldBmp = SelectObject(hdc.get(), bmp);
    7575

  • trunk/Source/WebCore/platform/graphics/wince/SharedBitmap.cpp

    r77785 r85433  
    6767    , m_hasAlpha(false)
    6868    , m_validHeight(abs(size.height()))
    69     , m_hbitmap(0)
    7069{
    7170#ifndef NDEBUG
Note: See TracChangeset for help on using the changeset viewer.