← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebCore/svg/graphics/filters/SVGFEMerge.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/graphics/filters/SVGFEMerge.cpp
30
30
 
31
31
namespace WebCore {
32
32
 
33
 
FEMerge::FEMerge(const Vector<FilterEffect*>& mergeInputs) 
 
33
FEMerge::FEMerge(const Vector<RefPtr<FilterEffect> >& mergeInputs) 
34
34
    : FilterEffect()
35
35
    , m_mergeInputs(mergeInputs)
36
36
{
37
37
}
38
38
 
39
 
PassRefPtr<FEMerge> FEMerge::create(const Vector<FilterEffect*>& mergeInputs)
 
39
PassRefPtr<FEMerge> FEMerge::create(const Vector<RefPtr<FilterEffect> >& mergeInputs)
40
40
{
41
41
    return adoptRef(new FEMerge(mergeInputs));
42
42
}
43
43
 
44
 
const Vector<FilterEffect*>& FEMerge::mergeInputs() const
 
44
const Vector<RefPtr<FilterEffect> >& FEMerge::mergeInputs() const
45
45
{
46
46
    return m_mergeInputs;
47
47
}
48
48
 
49
 
void FEMerge::setMergeInputs(const Vector<FilterEffect*>& mergeInputs)
 
49
void FEMerge::setMergeInputs(const Vector<RefPtr<FilterEffect> >& mergeInputs)
50
50
{
51
51
    m_mergeInputs = mergeInputs;
52
52
}