← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/css/StyleBase.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-02-04 19:30:57 UTC
  • mfrom: (1.2.8 upstream) (4.3.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100204193057-d3018lm1fipb0703
* New upstream release
* debian/copyright:
- Updated with changes since 1.1.19.

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/css/StyleBase.cpp
56
56
    StyleSheet* sheet = const_cast<StyleBase*>(this)->stylesheet();
57
57
    if (!sheet)
58
58
        return KURL();
59
 
    if (!sheet->href().isNull())
60
 
        return KURL(ParsedURLString, sheet->href());
61
 
    if (sheet->parent()) 
 
59
    if (!sheet->putativeBaseURL().isNull())
 
60
        return sheet->putativeBaseURL();
 
61
    if (sheet->parent())
62
62
        return sheet->parent()->baseURL();
63
63
    if (!sheet->ownerNode()) 
64
64
        return KURL();