Bug 25271 - Fix the build with disabled DOM storage
Summary: Fix the build with disabled DOM storage
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC All
: P3 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-04-17 13:02 PDT by Laszlo Gombos
Modified: 2009-04-21 06:19 PDT (History)
0 users

See Also:


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

Note You need to log in before you can comment on or make changes to this bug.
Description Laszlo Gombos 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).
Comment 1 Laszlo Gombos 2009-04-17 13:05:44 PDT
Created attachment 29586 [details]
Proposed fix.
Comment 2 Laszlo Gombos 2009-04-17 15:25:09 PDT
Created attachment 29589 [details]
Fix disabled database support build as well
Comment 3 Sam Weinig 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.
Comment 4 Laszlo Gombos 2009-04-19 11:13:23 PDT
Created attachment 29607 [details]
Revised patch based on feedback from Sam.
Comment 5 Ariya Hidayat 2009-04-21 06:19:40 PDT
Landed in r42709
http://trac.webkit.org/changeset/42709