Replicating WebFrame::uniqueName across renderers.

third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebFrameWidget.h"
+#include "public/web/WebRemoteFrame.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebTreeScopeType.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
+#include "wtf/Assertions.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 namespace FrameTestHelpers {
 
 namespace {
 
 // The frame test helpers coordinate frame loads in a carefully choreographed
 // dance. Since the parser is threaded, simply spinning the run loop once is not
 // enough to ensure completion of a load. Instead, the following pattern is
@@ skipping 164 matching lines @@
 {
     Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new ReloadTask(frame, true));
     pumpPendingRequests(frame);
 }
 
 void pumpPendingRequestsDoNotUse(WebFrame* frame)
 {
     pumpPendingRequests(frame);
 }
 
+WebLocalFrame* createLocalChild(WebRemoteFrame* parent, const WebString& name, WebFrameClient* client, WebFrame* previousSibling, const WebFrameOwnerProperties& properties)
+{
+    if (!client)
+        client = defaultWebFrameClient();
+
+    // |uniqueName| is normally calculated in a somewhat complicated way by

[dcheng, 2016/02/19 21:36:27]

I think we should make a nominal effort at uniqueness at least =)

How about this:

static int counter = 0;

StringBuilder uniqueName;
uniqueName.append(name);
uniqueName.appendNumber(++counter);

return parent->createLocalChild(..., uniqueName.toString(), ...);

[dcheng, 2016/02/19 21:37:02]

Also: nit

Change "way by" to "way by the"

[Łukasz Anforowicz, 2016/02/19 22:10:09]

Done.

[Łukasz Anforowicz, 2016/02/19 22:10:09]

Done.

+    // FrameTree class, but for test purposes the approximation below should be
+    // close enough.
+    ASSERT(!name.isEmpty());
+    WebString uniqueName = name;
+
+    return parent->createLocalChild(WebTreeScopeType::Document, name, uniqueName, WebSandboxFlags::None, client, previousSibling, properties);
+}
+
 WebViewHelper::WebViewHelper(SettingOverrider* settingOverrider)
     : m_webView(nullptr)
     , m_webViewWidget(nullptr)
     , m_settingOverrider(settingOverrider)
 {
 }
 
 WebViewHelper::~WebViewHelper()
 {
     reset();
@@ skipping 63 matching lines @@
     m_testWebViewClient->clearAnimationScheduled();
     webViewImpl()->resize(size);
     EXPECT_FALSE(m_testWebViewClient->animationScheduled());
     m_testWebViewClient->clearAnimationScheduled();
 }
 
 TestWebFrameClient::TestWebFrameClient() : m_loadsInProgress(0)
 {
 }
 
-WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& frameName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
+WebFrame* TestWebFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
 {
     WebFrame* frame = WebLocalFrame::create(scope, this);
     parent->appendChild(frame);
     return frame;
 }
 
 void TestWebFrameClient::frameDetached(WebFrame* frame, DetachType type)
 {
     if (type == DetachType::Remove && frame->parent())
         frame->parent()->removeChild(frame);
@@ skipping 39 matching lines @@
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(Platform::current()->unitTestSupport()->createLayerTreeViewForTesting());
     ASSERT(m_layerTreeView);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink