Bug 25271

Summary:

Fix the build with disabled DOM storage

Product:

WebKit

Reporter:

Laszlo Gombos <laszlo.gombos>

Component:

WebCore Misc.

Assignee:

Nobody <webkit-unassigned>

Status:

RESOLVED FIXED

Severity:

Normal

Priority:

Version:

528+ (Nightly build)

Hardware:

OS:

All

Attachments:

Description	Flags
Proposed fix.	none
Fix disabled database support build as well	sam: review+
Revised patch based on feedback from Sam.	darin: review+

Laszlo Gombos

Reported 2009-04-17 13:02:40 PDT

Build failure if DOM storage is disabled; probably introduced by http://trac.webkit.org/changeset/41734 (ScriptObjectQuarantine.cpp).

Attachments
Proposed fix. (2.18 KB, patch) 2009-04-17 13:05 PDT, Laszlo Gombos	no flags	Details Formatted Diff Diff
Fix disabled database support build as well (2.60 KB, patch) 2009-04-17 15:25 PDT, Laszlo Gombos	sam: review+	Details Formatted Diff Diff
Revised patch based on feedback from Sam. (2.74 KB, patch) 2009-04-19 11:13 PDT, Laszlo Gombos	darin: review+	Details Formatted Diff Diff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.

Laszlo Gombos

Comment 1 2009-04-17 13:05:44 PDT

Created attachment 29586 [details] Proposed fix.

Laszlo Gombos

Comment 2 2009-04-17 15:25:09 PDT

Created attachment 29589 [details] Fix disabled database support build as well

Sam Weinig

Comment 3 2009-04-18 22:23:24 PDT

Comment on attachment 29589 [details] Fix disabled database support build as well > Index: WebCore/bindings/js/ScriptObjectQuarantine.cpp > =================================================================== > --- WebCore/bindings/js/ScriptObjectQuarantine.cpp (revision 42609) > +++ WebCore/bindings/js/ScriptObjectQuarantine.cpp (working copy) > @@ -34,8 +34,12 @@ > #include "Database.h" > #include "Document.h" > #include "Frame.h" > +#if ENABLE(DATABASE) > #include "JSDatabase.h" > +#endif > +#if ENABLE(DOM_STORAGE) > #include "JSStorage.h" > +#endif These #if'd #includes should be moved to the bottom of the #include list (paragraphed separately) Otherwise, r=me.

Laszlo Gombos

Comment 4 2009-04-19 11:13:23 PDT

Created attachment 29607 [details] Revised patch based on feedback from Sam.

Ariya Hidayat

Comment 5 2009-04-21 06:19:40 PDT

Landed in r42709 http://trac.webkit.org/changeset/42709

Note You need to log in before you can comment on or make changes to this bug.