Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 387703004: Navigation transitions: Parse out transition-entering-stylesheet link headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more tests on java side Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index dabf69c99ab3273679542dfdd3a8b6118b30c91a..94b03b22814de5516096b9772a0e3e1846a8052c 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1610,12 +1610,22 @@ void ContentViewCoreImpl::RequestTextSurroundingSelection(
}
}
-void ContentViewCoreImpl::DidDeferAfterResponseStarted() {
+void ContentViewCoreImpl::DidDeferAfterResponseStarted(
+ const TransitionLayerData& transition_layer_data) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
if (obj.is_null())
return;
Java_ContentViewCore_didDeferAfterResponseStarted(env, obj.obj());
+
+ std::vector<GURL>::const_iterator iter =
+ transition_layer_data.transition_stylesheets.begin();
+ for (; iter != transition_layer_data.transition_stylesheets.end(); ++iter) {
shatch 2014/07/22 20:06:29 Since there's 2 sets of stylesheets in the feature
+ ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
+ env, iter->spec()));
+ Java_ContentViewCore_addStylesheetToTransition(
+ env, obj.obj(), jstring_url.obj());
+ }
}
bool ContentViewCoreImpl::WillHandleDeferAfterResponseStarted() {
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/frame_host/render_frame_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698