Vector-of-structs (instead of struct-of-vectors) in "savable resources" IPC.

content/renderer/savable_resources.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/savable_resources.h"
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "content/renderer/web_frame_utils.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebElementCollection.h"
 #include "third_party/WebKit/public/web/WebInputElement.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNode.h"
 #include "third_party/WebKit/public/web/WebNodeList.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ skipping 14 matching lines @@
 namespace {
 
 // Get all savable resource links from current element. One element might
 // have more than one resource link. It is possible to have some links
 // in one CSS stylesheet.
 void GetSavableResourceLinkForElement(
     const WebElement& element,
     const WebDocument& current_doc,
     SavableResourcesResult* result) {
   if (element.hasHTMLTagName("iframe") || element.hasHTMLTagName("frame")) {
-    GURL original_url = current_doc.completeURL(element.getAttribute("src"));
-    WebFrame* subframe = WebFrame::fromFrameOwnerElement(element);
+    GURL complete_url = current_doc.completeURL(element.getAttribute("src"));
+    WebFrame* web_frame = WebFrame::fromFrameOwnerElement(element);
+
+    SavableSubframe subframe;
+    subframe.original_url = complete_url;
+    subframe.routing_id = GetRoutingIdForFrameOrProxy(web_frame);
+
     result->subframes->push_back(subframe);
-    result->subframe_original_urls->push_back(original_url);
     return;
   }
 
   // Check whether the node has sub resource URL or not.
   WebString value = GetSubResourceLinkFromElement(element);
   if (value.isNull())
     return;
   // Get absolute URL.
   GURL u = current_doc.completeURL(value);
   // ignore invalid URL
@@ skipping 85 matching lines @@
   // otherwise return NULL.
   if (!value.isNull() && !value.isEmpty() &&
       !base::StartsWith(value.utf8(), "javascript:",
                         base::CompareCase::INSENSITIVE_ASCII))
     return value;
 
   return WebString();
 }
 
 }  // namespace content