← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/svg/SVGFontFaceElement.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/svg/SVGFontFaceElement.cpp
62
62
    removeFromMappedElementSheet();
63
63
}
64
64
 
65
 
static void mapAttributeToCSSProperty(HashMap<AtomicStringImpl*, int>* propertyNameToIdMap, const QualifiedName& attrName)
66
 
{
67
 
    int propertyId = cssPropertyID(attrName.localName());
68
 
    ASSERT(propertyId > 0);
69
 
    propertyNameToIdMap->set(attrName.localName().impl(), propertyId);
70
 
}
71
 
 
72
65
static int cssPropertyIdForSVGAttributeName(const QualifiedName& attrName)
73
66
{
74
67
    if (!attrName.namespaceURI().isNull())
282
275
            srcElement = static_cast<SVGFontFaceSrcElement*>(child);
283
276
    }
284
277
 
285
 
    bool describesParentFont = parentNode()->hasTagName(fontTag);
 
278
    bool describesParentFont = parentNode()->hasTagName(SVGNames::fontTag);
286
279
    RefPtr<CSSValueList> list;
287
280
 
288
281
    if (describesParentFont) {