Changeset 66700 in webkit


Ignore:
Timestamp:
Sep 2, 2010 6:38:51 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-09-02 Rafael Antognolli <​antognolli@profusion.mobi>

Reviewed by Martin Robinson.

[Cairo] Remove glib dependency (caused by use of GOwnPtr)
​https://bugs.webkit.org/show_bug.cgi?id=45053

Use OwnPtr instead of GOwnPtr to keep track of Fc* references
in FontCacheCairo.cpp.

No features added, so no new tests.

  • CMakeListsEfl.txt: Updating build system to look for GOwnPtrCairo.*
  • GNUmakefile.am: Ditto.
  • platform/graphics/cairo/FontCacheCairo.cpp: Using OwnPtr instead of GOwnPtr. (WebCore::FontCache::createFontPlatformData):
  • platform/graphics/cairo/GOwnPtrCairo.cpp: Removed.
  • platform/graphics/cairo/GOwnPtrCairo.h: Removed.
  • platform/graphics/cairo/OwnPtrCairo.cpp: Added. (WTF::FcPattern): (WTF::FcObjectSet): (WTF::FcFontSet):
  • platform/graphics/cairo/OwnPtrCairo.h: Added.
Location:
trunk/WebCore
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/CMakeListsEfl.txt

    r66417 r66700  
    7070    platform/graphics/cairo/FontCustomPlatformData.cpp
    7171    platform/graphics/cairo/FontPlatformDataCairo.cpp
    72     platform/graphics/cairo/GOwnPtrCairo.cpp
     72    platform/graphics/cairo/OwnPtrCairo.cpp
    7373    platform/graphics/cairo/PlatformRefPtrCairo.cpp
    7474    platform/graphics/cairo/GlyphPageTreeNodeCairo.cpp

  • trunk/WebCore/ChangeLog

    r66698 r66700  
     12010-09-02  Rafael Antognolli  <antognolli@profusion.mobi>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [Cairo] Remove glib dependency (caused by use of GOwnPtr)
     6        https://bugs.webkit.org/show_bug.cgi?id=45053
     7
     8        Use OwnPtr instead of GOwnPtr to keep track of Fc* references
     9        in FontCacheCairo.cpp.
     10
     11        No features added, so no new tests.
     12
     13        * CMakeListsEfl.txt: Updating build system to look for GOwnPtrCairo.*
     14        * GNUmakefile.am: Ditto.
     15        * platform/graphics/cairo/FontCacheCairo.cpp: Using OwnPtr instead of GOwnPtr.
     16        (WebCore::FontCache::createFontPlatformData):
     17        * platform/graphics/cairo/GOwnPtrCairo.cpp: Removed.
     18        * platform/graphics/cairo/GOwnPtrCairo.h: Removed.
     19        * platform/graphics/cairo/OwnPtrCairo.cpp: Added.
     20        (WTF::FcPattern):
     21        (WTF::FcObjectSet):
     22        (WTF::FcFontSet):
     23        * platform/graphics/cairo/OwnPtrCairo.h: Added.
     24
    1252010-09-02  Kinuko Yasuda  <kinuko@chromium.org>
    226

  • trunk/WebCore/GNUmakefile.am

    r66586 r66700  
    24502450        WebCore/platform/graphics/cairo/FontCustomPlatformData.h \
    24512451        WebCore/platform/graphics/cairo/FontPlatformData.h \
    2452         WebCore/platform/graphics/cairo/GOwnPtrCairo.cpp \
    2453         WebCore/platform/graphics/cairo/GOwnPtrCairo.h \
     2452        WebCore/platform/graphics/cairo/OwnPtrCairo.cpp \
     2453        WebCore/platform/graphics/cairo/OwnPtrCairo.h \
    24542454        WebCore/platform/graphics/cairo/GradientCairo.cpp \
    24552455        WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \

  • trunk/WebCore/platform/graphics/cairo/FontCacheCairo.cpp

    r61703 r66700  
    2424#include "CString.h"
    2525#include "Font.h"
    26 #include "GOwnPtrCairo.h"
     26#include "OwnPtrCairo.h"
    2727#include "SimpleFontData.h"
    2828#include <wtf/Assertions.h>
    … …  
    116116    const char* fcfamily = familyNameString.data();
    117117
    118     GOwnPtr<FcPattern> pattern(FcPatternCreate());
     118    OwnPtr<FcPattern> pattern(FcPatternCreate());
    119119    if (!FcPatternAddString(pattern.get(), FC_FAMILY, reinterpret_cast<const FcChar8*>(fcfamily)))
    120120        return 0;
    121121
    122     GOwnPtr<FcObjectSet> objectSet(FcObjectSetCreate());
     122    OwnPtr<FcObjectSet> objectSet(FcObjectSetCreate());
    123123    if (!FcObjectSetAdd(objectSet.get(), FC_FAMILY))
    124124        return 0;
    125125
    126     GOwnPtr<FcFontSet> fontSet(FcFontList(0, pattern.get(), objectSet.get()));
     126    OwnPtr<FcFontSet> fontSet(FcFontList(0, pattern.get(), objectSet.get()));
    127127
    128128    if (!fontSet)

  • trunk/WebCore/platform/graphics/cairo/OwnPtrCairo.cpp

    r66699 r66700  
    1919
    2020#include "config.h"
    21 #include "GOwnPtrCairo.h"
     21#include "OwnPtrCairo.h"
    2222
    2323#if defined(USE_FREETYPE)
    … …  
    2929
    3030#if defined(USE_FREETYPE)
    31 template <> void freeOwnedGPtr<FcPattern>(FcPattern* ptr)
     31template <> void deleteOwnedPtr<FcPattern>(FcPattern* ptr)
    3232{
    3333    if (ptr)
    … …  
    3535}
    3636
    37 template <> void freeOwnedGPtr<FcObjectSet>(FcObjectSet* ptr)
     37template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet* ptr)
    3838{
    3939    if (ptr)
    … …  
    4141}
    4242
    43 template <> void freeOwnedGPtr<FcFontSet>(FcFontSet* ptr)
     43template <> void deleteOwnedPtr<FcFontSet>(FcFontSet* ptr)
    4444{
    4545    if (ptr)

  • trunk/WebCore/platform/graphics/cairo/OwnPtrCairo.h

    r66699 r66700  
    1818 */
    1919
    20 #ifndef GOwnPtrCairo_h
    21 #define GOwnPtrCairo_h
     20#ifndef OwnPtrCairo_h
     21#define OwnPtrCairo_h
    2222
    23 #include "GOwnPtr.h"
     23#include "OwnPtr.h"
    2424
    2525#if defined(USE_FREETYPE)
    … …  
    3232
    3333#if defined(USE_FREETYPE)
    34 template <> void freeOwnedGPtr<FcPattern>(FcPattern*);
    35 template <> void freeOwnedGPtr<FcObjectSet>(FcObjectSet*);
    36 template <> void freeOwnedGPtr<FcFontSet>(FcFontSet*);
     34template <> void deleteOwnedPtr<FcPattern>(FcPattern*);
     35template <> void deleteOwnedPtr<FcObjectSet>(FcObjectSet*);
     36template <> void deleteOwnedPtr<FcFontSet>(FcFontSet*);
    3737#endif
    3838
Note: See TracChangeset for help on using the changeset viewer.