← Back to branch summary

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

« back to all changes in this revision

Viewing changes to WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.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:
WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp
30
30
#include "config.h"
31
31
#include "DocumentLoaderGtk.h"
32
32
 
 
33
#include "webkitprivate.h"
33
34
#include "webkitwebdatasource.h"
34
35
 
35
36
using namespace WebCore;
60
61
{
61
62
    WebCore::DocumentLoader::attachToFrame();
62
63
 
63
 
    refDataSource();
 
64
    if (m_dataSource) {
 
65
        refDataSource();
 
66
        return;
 
67
    }
 
68
 
 
69
    // We may get to here without having a datasource, when the data
 
70
    // is coming from the page cache.
 
71
    WebKitWebDataSource* dataSource = webkit_web_data_source_new_with_loader(this);
 
72
    setDataSource(dataSource);
 
73
    g_object_unref(dataSource);
64
74
}
65
75
 
66
76
void DocumentLoader::detachFromFrame()
110
120
    ASSERT(m_dataSource);
111
121
    m_isDataSourceReffed = false;
112
122
    g_object_unref(m_dataSource);
 
123
    m_dataSource = 0;
113
124
}
114
125
 
115
126
} // end namespace WebKit