687755 - Make it easy to forward methods from the DOM storage wrapper to the right implementation class

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Boris Zbarsky [:bzbarsky]]

This is a spinoff bug to track landing the first (already reviewed) patch in bug 686049.

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: Refactor some code to make it easier to add new nsDOMStorageDBWrapper methods that forward to the various storage implementations.

Comment 2

[Boris Zbarsky [:bzbarsky]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/30a5dfdf8aba

Comment 3

[Honza Bambas (:mayhemer)]

According bug 683316 comment 4, could we update this to also support methods that has |void| return type somehow?

Maybe:

+#define IMPL_FORWARDER(_return, _code)                                \
+  PR_BEGIN_MACRO                                                      \
+  if (aStorage->CanUseChromePersist())                                \
+    _return mChromePersistentDB._code;                                \
+  if (nsDOMStorageManager::gStorageManager->InPrivateBrowsingMode())  \
+    _return mPrivateBrowsingDB._code;                                 \
+  if (aStorage->SessionOnly())                                        \
+    _return mSessionOnlyDB._code;                                     \
+  _return mPersistentDB._code;                                        \
+  PR_END_MACRO
+

And then:

 nsresult
 nsDOMStorageDBWrapper::GetAllKeys(DOMStorageImpl* aStorage,
                                   nsTHashtable<nsSessionStorageEntry>* aKeys)
 {
   IMPL_FORWARDER(return, GetAllKeys(aStorage, aKeys));
 }

 void
 nsDOMStorageDBWrapper::Whatever(...)
 {
   IMPL_FORWARDER((void), Whatever(...));
 }

Comment 4

[(no longer active)]

https://hg.mozilla.org/mozilla-central/rev/30a5dfdf8aba

Comment 5

[Boris Zbarsky [:bzbarsky]]

I was assuming you'd add a macro for that in bug 683316.  I'd prefer a IMPL_FORWARDER_GUTS macro with two arguments and an IMPL_FORWARDER and IMPL_VOID_FORWARDER that invoke it the right way.