diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/inspector/InspectorDatabaseResource.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/inspector/InspectorDatabaseResource.h')
| -rw-r--r-- | Source/WebCore/inspector/InspectorDatabaseResource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.h b/Source/WebCore/inspector/InspectorDatabaseResource.h index 550fcd8..9fa7ebd 100644 --- a/Source/WebCore/inspector/InspectorDatabaseResource.h +++ b/Source/WebCore/inspector/InspectorDatabaseResource.h @@ -48,13 +48,13 @@ public: void bind(InspectorFrontend::Database*); Database* database() { return m_database.get(); } - long id() const { return m_id; } + int id() const { return m_id; } private: InspectorDatabaseResource(PassRefPtr<Database>, const String& domain, const String& name, const String& version); RefPtr<Database> m_database; - long m_id; + int m_id; String m_domain; String m_name; String m_version; |