Navigation transitions (web to native app): Get names and rects of transition elements (Step 2)

Source/web/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple 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.
@@ skipping 65 matching lines @@
 #include "public/web/WebDOMEvent.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFormElement.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebNode.h"
 #include "public/web/WebPermissionClient.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebPluginParams.h"
 #include "public/web/WebPluginPlaceholder.h"
 #include "public/web/WebSecurityOrigin.h"
+#include "public/web/WebTransitionElementData.h"
 #include "public/web/WebViewClient.h"
 #include "web/PluginPlaceholderImpl.h"
 #include "web/SharedWorkerRepositoryClientImpl.h"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebDevToolsAgentPrivate.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebPluginLoadObserver.h"
 #include "web/WebViewImpl.h"
 #include "wtf/StringExtras.h"
@@ skipping 375 matching lines @@
     navigationInfo.extraData = ds->extraData();
     navigationInfo.navigationType = ds->navigationType();
     navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy);
     navigationInfo.isRedirect = ds->isRedirect();
     navigationInfo.isTransitionNavigation = isTransitionNavigation;
 
     WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigation(navigationInfo);
     return static_cast<NavigationPolicy>(webPolicy);
 }
 
-void FrameLoaderClientImpl::dispatchAddNavigationTransitionData(const String& allowedDestinationOrigin, const String& selector, const String& markup)
+
+struct TransitionElementData {

[Nate Chapin, 2014/11/05 18:29:43]

I don't see any uses of this struct.

[Zhen Wang, 2014/11/06 17:59:26]

See the changes in Document.cpp.

[Nate Chapin, 2014/11/11 00:28:17]

It's defined in Document.h, why the redefinition here?

[Zhen Wang, 2014/11/11 15:12:20]

Oh. My mistake. Fixed.

+    String scope;
+    String selector;
+    String markup;
+    Vector<String> names;
+    Vector<IntRect> rects;
+};
+
+void FrameLoaderClientImpl::dispatchAddNavigationTransitionData(const Document::TransitionElementData& data)
 {
-    if (m_webFrame->client())
-        m_webFrame->client()->addNavigationTransitionData(allowedDestinationOrigin, selector, markup);
+    if (m_webFrame->client()) {

[Nate Chapin, 2014/11/05 18:29:43]

Early exit if m_webFrame->client() is null, rather than wrapping this whole
function in an if()?

[Zhen Wang, 2014/11/06 17:59:26]

Done.

+        // TODO(zhenw): change to use WebTransitionElementData after the chrome side is done.

[Nate Chapin, 2014/11/05 18:29:43]

blink uses FIXME: instead of TODO(name):

[Zhen Wang, 2014/11/06 17:59:26]

Done.

+        Vector<String> names;
+        Vector<IntRect> rects;
+        for (size_t i = 0; i < data.elements.size(); ++i) {
+            names.append(data.elements[i].name);
+            rects.append(data.elements[i].rect);
+        }
+        m_webFrame->client()->addNavigationTransitionData(
+            WebString(data.scope),
+            WebString(data.selector),
+            WebString(data.markup),
+            WebVector<WebString>(names),
+            WebVector<WebRect>(rects));
+    }
 }
 
 void FrameLoaderClientImpl::dispatchWillRequestResource(FetchRequest* request)
 {
     if (m_webFrame->client()) {
         WebCachedURLRequest urlRequest(request);
         m_webFrame->client()->willRequestResource(m_webFrame, urlRequest);
     }
 }
 
@@ skipping 358 matching lines @@
         m_webFrame->client()->didAbortLoading(m_webFrame);
 }
 
 void FrameLoaderClientImpl::dispatchDidChangeManifest()
 {
     if (m_webFrame->client())
         m_webFrame->client()->didChangeManifest(m_webFrame);
 }
 
 } // namespace blink