Changeset 84489 in webkit


Ignore:
Timestamp:
Apr 21, 2011 6:07:46 AM (13 years ago)
Author:
Nikolas Zimmermann
Message:

2011-04-21 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Centralize typedef unsigned short Glyph in Glyph.h
​https://bugs.webkit.org/show_bug.cgi?id=59087

  • GNUmakefile.list.am: Add Glyph.h to build.
  • WebCore.gypi: Ditto.
  • WebCore.vcproj/WebCore.vcproj: Ditto.
  • WebCore.xcodeproj/project.pbxproj: Ditto.
  • platform/graphics/Glyph.h: Added.
  • platform/graphics/GlyphBuffer.h: Include Glyph.h instead of duplicating the Glyph typedef.
  • platform/graphics/GlyphMetricsMap.h: Ditto.
  • platform/graphics/GlyphPageTreeNode.h: Ditto.
Location:
trunk/Source/WebCore
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r84485 r84489  
     12011-04-21  Nikolas Zimmermann  <nzimmermann@rim.com>
     2
     3        Reviewed by Dirk Schulze.
     4
     5        Centralize typedef unsigned short Glyph in Glyph.h
     6        https://bugs.webkit.org/show_bug.cgi?id=59087
     7
     8        * GNUmakefile.list.am: Add Glyph.h to build.
     9        * WebCore.gypi: Ditto.
     10        * WebCore.vcproj/WebCore.vcproj: Ditto.
     11        * WebCore.xcodeproj/project.pbxproj: Ditto.
     12        * platform/graphics/Glyph.h: Added.
     13        * platform/graphics/GlyphBuffer.h: Include Glyph.h instead of duplicating the Glyph typedef.
     14        * platform/graphics/GlyphMetricsMap.h: Ditto.
     15        * platform/graphics/GlyphPageTreeNode.h: Ditto.
     16
    1172011-04-21  Pavel Feldman  <pfeldman@google.com>
    218

  • trunk/Source/WebCore/GNUmakefile.list.am

    r84410 r84489  
    24252425        Source/WebCore/platform/graphics/GeneratedImage.h \
    24262426        Source/WebCore/platform/graphics/Generator.h \
     2427        Source/WebCore/platform/graphics/Glyph.h \
    24272428        Source/WebCore/platform/graphics/GlyphBuffer.h \
    24282429        Source/WebCore/platform/graphics/GlyphMetricsMap.h \

  • trunk/Source/WebCore/WebCore.gypi

    r84429 r84489  
    820820            'platform/graphics/FontWidthVariant.h',
    821821            'platform/graphics/Generator.h',
     822            'platform/graphics/Glyph.h',
    822823            'platform/graphics/GlyphBuffer.h',
    823824            'platform/graphics/GlyphMetricsMap.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r84389 r84489  
    2705827058                                </File>
    2705927059                                <File
     27060                                        RelativePath="..\platform\graphics\Glyph.h"
     27061                                        >
     27062                                </File>
     27063                                <File
    2706027064                                        RelativePath="..\platform\graphics\GlyphBuffer.h"
    2706127065                                        >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r84224 r84489  
    132132                0865CCE60EDDF51B00DF9EC3 /* WMLNoopElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0865CCE40EDDF51B00DF9EC3 /* WMLNoopElement.cpp */; };
    133133                0865CCE70EDDF51B00DF9EC3 /* WMLNoopElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 0865CCE50EDDF51B00DF9EC3 /* WMLNoopElement.h */; };
     134                086BBD0F136039C2008B15D8 /* Glyph.h in Headers */ = {isa = PBXBuildFile; fileRef = 086BBD0E136039C2008B15D8 /* Glyph.h */; settings = {ATTRIBUTES = (Private, ); }; };
    134135                08700BE70F086C5300919419 /* InputElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08700BE60F086C5300919419 /* InputElement.cpp */; };
    135136                087281550F26B9B600AFC596 /* OptionElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 087281510F26B9B600AFC596 /* OptionElement.cpp */; };
    … …  
    65646565                0865CCE40EDDF51B00DF9EC3 /* WMLNoopElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WMLNoopElement.cpp; sourceTree = "<group>"; };
    65656566                0865CCE50EDDF51B00DF9EC3 /* WMLNoopElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WMLNoopElement.h; sourceTree = "<group>"; };
     6567                086BBD0E136039C2008B15D8 /* Glyph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Glyph.h; sourceTree = "<group>"; };
    65666568                08700BE60F086C5300919419 /* InputElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputElement.cpp; sourceTree = "<group>"; };
    65676569                087281510F26B9B600AFC596 /* OptionElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionElement.cpp; sourceTree = "<group>"; };
    … …  
    1788017882                                BC23F0DA0DAFF4A4009FDC91 /* GeneratedImage.h */,
    1788117883                                BCE04C890DAFF7A0007A0F41 /* Generator.h */,
     17884                                086BBD0E136039C2008B15D8 /* Glyph.h */,
    1788217885                                B2C3DA5B0D006CD600EF6F26 /* GlyphBuffer.h */,
    1788317886                                C5D4AA78116BAFB60069CA93 /* GlyphMetricsMap.h */,
    … …  
    2300423007                                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */,
    2300523008                                977E2E0F12F0FC9C00C13379 /* XSSFilter.h in Headers */,
     23009                                086BBD0F136039C2008B15D8 /* Glyph.h in Headers */,
    2300623010                        );
    2300723011                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

    r84101 r84489  
    3232
    3333#include "FloatSize.h"
     34#include "Glyph.h"
    3435#include <wtf/UnusedParam.h>
    3536#include <wtf/Vector.h>
    … …  
    4546namespace WebCore {
    4647
    47 typedef unsigned short Glyph;
    4848class SimpleFontData;
    4949

  • trunk/Source/WebCore/platform/graphics/GlyphMetricsMap.h

    r76248 r84489  
    3030#define GlyphMetricsMap_h
    3131
     32#include "Glyph.h"
    3233#include <wtf/FixedArray.h>
    3334#include <wtf/HashMap.h>
    … …  
    3637
    3738namespace WebCore {
    38 
    39 typedef unsigned short Glyph;
    4039
    4140const float cGlyphSizeUnknown = -1;

  • trunk/Source/WebCore/platform/graphics/GlyphPageTreeNode.h

    r59583 r84489  
    3030#define GlyphPageTreeNode_h
    3131
     32#include "Glyph.h"
    3233#include <string.h>
    3334#include <wtf/HashMap.h>
    … …  
    4647class GlyphPageTreeNode;
    4748class SimpleFontData;
    48 
    49 typedef unsigned short Glyph;
    5049
    5150// Holds the glyph index and the corresponding SimpleFontData information for a given
Note: See TracChangeset for help on using the changeset viewer.