Bug 107182 – IndexedDB: Conditionalize usage of env_idb.h to fix build for non-Chromium ports

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Michael Pruett]

Currently Source/WebCore/platform/leveldb/LevelDBDatabase.cpp includes <env_idb.h>. This file is available only for the Chromium port but an implementation should be made available for other ports.

[Martin Robinson]

Created attachment 183301 [details]
Patch

[David Grogan]

Comment on attachment 183301 [details]
Patch

lgtm

[Martin Robinson]

Thanks David. I'll wait for all the bubbles to turn green before committing this.

[Tony Chang]

Comment on attachment 183301 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=183301&action=review

> Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:58
> +#if PLATFORM(CHROMIUM)
> +static leveldb::Env* defaultLevelDBEnvironment()
> +{
> +    return leveldb::IDBEnv();
> +}
> +#else
> +static leveldb::Env* defaultLevelDBEnvironment()

Nit: Why not scope the #if around the return?

[Martin Robinson]

(In reply to comment #4)
> (From update of attachment 183301 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=183301&action=review
> 
> > Source/WebCore/platform/leveldb/LevelDBDatabase.cpp:58
> > +#if PLATFORM(CHROMIUM)
> > +static leveldb::Env* defaultLevelDBEnvironment()
> > +{
> > +    return leveldb::IDBEnv();
> > +}
> > +#else
> > +static leveldb::Env* defaultLevelDBEnvironment()
> 
> Nit: Why not scope the #if around the return?

Just my preference against having conditional compilation inside functions instead of surrounding them. Michael actually suggested a way to make this patch simpler, so I'll try that.

[Martin Robinson]

Created attachment 183318 [details]
Patch

[Martin Robinson]

Committed r140099: <http://trac.webkit.org/changeset/140099>