Bug 112004 - Add USE(PLATFORM_STRATEGIES) ifdefs to StorageNamespace.cpp
Summary: Add USE(PLATFORM_STRATEGIES) ifdefs to StorageNamespace.cpp
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks: 111729
  Show dependency treegraph
 
Reported: 2013-03-11 07:26 PDT by Carlos Garcia Campos
Modified: 2013-03-18 07:29 PDT (History)
3 users (show)

See Also:


Attachments
Patch (2.10 KB, patch)
2013-03-11 07:29 PDT, Carlos Garcia Campos
rwlbuis: review+
Details | Formatted Diff | Diff
Patch for landing. (2.03 KB, patch)
2013-03-12 03:32 PDT, Carlos Garcia Campos
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Carlos Garcia Campos 2013-03-11 07:26:42 PDT
Platform strategies are used there without checking if PLATFORM_STRATEGIES  enabled. This breaks the build of ports not using platform strategies yet.
Comment 1 Carlos Garcia Campos 2013-03-11 07:29:38 PDT
Created attachment 192466 [details]
Patch
Comment 2 Rob Buis 2013-03-11 08:34:44 PDT
Comment on attachment 192466 [details]
Patch

LGTM.
Comment 3 Alexey Proskuryakov 2013-03-11 11:15:06 PDT
Comment on attachment 192466 [details]
Patch

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

> Source/WebCore/storage/StorageNamespace.cpp:34
> +#if USE(PLATFORM_STRATEGIES)
>  #include "PlatformStrategies.h"
>  #include "StorageStrategy.h"
> +#else
> +#include "StorageNamespaceImpl.h"
> +#endif

I think that it's best to not add ifdefs around includes, that's just unnecessary extra work.
Comment 4 Carlos Garcia Campos 2013-03-12 03:22:19 PDT
(In reply to comment #3)
> (From update of attachment 192466 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=192466&action=review
> 
> > Source/WebCore/storage/StorageNamespace.cpp:34
> > +#if USE(PLATFORM_STRATEGIES)
> >  #include "PlatformStrategies.h"
> >  #include "StorageStrategy.h"
> > +#else
> > +#include "StorageNamespaceImpl.h"
> > +#endif
> 
> I think that it's best to not add ifdefs around includes, that's just unnecessary extra work.

You are right, PlatformStrategies.h and StorageStrategy.h already have the #if USE(PLATFORM_STRATEGIES), I'll submit a new patch.
Comment 5 Carlos Garcia Campos 2013-03-12 03:32:27 PDT
Created attachment 192694 [details]
Patch for landing.

Updated patch to not use the #ifdefs for the headers that don't need it.
Comment 6 Carlos Garcia Campos 2013-03-12 09:21:05 PDT
Alexey, could you confirm the new patch is ok for you?
Comment 7 Rob Buis 2013-03-18 07:07:28 PDT
Comment on attachment 192694 [details]
Patch for landing.

LGTM.
Comment 8 WebKit Review Bot 2013-03-18 07:29:44 PDT
Comment on attachment 192694 [details]
Patch for landing.

Clearing flags on attachment: 192694

Committed r146065: <http://trac.webkit.org/changeset/146065>
Comment 9 WebKit Review Bot 2013-03-18 07:29:47 PDT
All reviewed patches have been landed.  Closing bug.