ServiceWorker: Make a way to retrieve a service worker version id (Chromium)

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 0ca01ad816c2115d2f4f59d147d63c04bac880dc..e7712f93cee75e0cbdf7c8381548826f00f12da1 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -23,6 +23,7 @@
 #include "content/child/plugin_messages.h"
 #include "content/child/quota_dispatcher.h"
 #include "content/child/request_extra_data.h"
+#include "content/child/service_worker/service_worker_handle_reference.h"
 #include "content/child/service_worker/service_worker_network_provider.h"
 #include "content/child/service_worker/service_worker_provider_context.h"
 #include "content/child/service_worker/web_service_worker_provider_impl.h"
@@ -3268,6 +3269,16 @@ bool RenderFrameImpl::isControlledByServiceWorker(WebDataSource& data_source) {
       kInvalidServiceWorkerHandleId;
 }
 
+int64_t RenderFrameImpl::serviceWorkerID(WebDataSource& data_source) {

[Michael van Ouwerkerk, 2014/10/28 11:16:00]

Drive-by nit: why not just int64 like in the rest of this file?

[nhiroki, 2014/10/28 12:08:54]

There are two reasons:
1) According to base/basictypes.h, int64 was already deprecated and using
int64_t is recommended.
2) This overrides WebFrameClient::serviceWorkerID newly defined in my blink-side
patch. I think new interface shouldn't depend on the deprecated data type.

[Michael van Ouwerkerk, 2014/10/28 12:17:21]

Cool, thanks!

+  ServiceWorkerNetworkProvider* provider =
+      ServiceWorkerNetworkProvider::FromDocumentState(
+          DocumentState::FromDataSource(&data_source));
+  DCHECK(isControlledByServiceWorker(data_source));
+  if (provider->context()->controller())
+    return provider->context()->controller()->version_id();
+  return kInvalidServiceWorkerVersionId;

[nasko, 2014/10/28 22:30:08]

nit: an empty line above will make it a bit more readable

[nhiroki, 2014/10/29 03:11:52]

Done.

+}
+
 void RenderFrameImpl::postAccessibilityEvent(const blink::WebAXObject& obj,
                                              blink::WebAXEvent event) {
   HandleWebAccessibilityEvent(obj, event);