~ubuntu-branches/ubuntu/lucid/webkit/lucid-security

« back to all changes in this revision

Viewing changes to WebCore/inspector/InspectorDatabaseResource.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
* 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:
37
37
#include "Frame.h"
38
38
#include "InspectorFrontend.h"
39
39
#include "ScriptObject.h"
40
 
#include "ScriptObjectQuarantine.h"
41
40
 
42
41
namespace WebCore {
43
42
 
59
58
        return;
60
59
 
61
60
    ScriptObject jsonObject = frontend->newScriptObject();
62
 
    ScriptObject database;
63
 
    if (!getQuarantinedScriptObject(m_database.get(), database))
64
 
        return;
65
61
    jsonObject.set("id", m_id);
66
62
    jsonObject.set("domain", m_domain);
67
63
    jsonObject.set("name", m_name);