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

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: nit fix 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 446f3727b1a0da28f74bea1d6fbea284bf256e55..9cb6c5a5eed62b85b729869f94ff476c31b93d2c 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -1552,12 +1552,28 @@ void ContentViewCoreImpl::RequestTextSurroundingSelection(
}
}
-void ContentViewCoreImpl::DidDeferAfterResponseStarted() {
+void ContentViewCoreImpl::DidDeferAfterResponseStarted(
+ const scoped_refptr<net::HttpResponseHeaders>& headers,
+ const GURL& url) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj(java_ref_.get(env));
if (obj.is_null())
return;
+
+ std::vector<GURL> entering_stylesheets;
+ if (headers)
+ TransitionRequestManager::ParseTransitionStylesheetsFromHeaders(
+ headers, entering_stylesheets, url);
+
Java_ContentViewCore_didDeferAfterResponseStarted(env, obj.obj());
+
+ std::vector<GURL>::const_iterator iter = entering_stylesheets.begin();
+ for (; iter != entering_stylesheets.end(); ++iter) {
+ ScopedJavaLocalRef<jstring> jstring_url(ConvertUTF8ToJavaString(
+ env, iter->spec()));
+ Java_ContentViewCore_addEnteringStylesheetToTransition(
+ 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