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

Unified Diff: content/browser/frame_host/navigation_entry_impl.cc

Issue 2494633004: Remove about:srcdoc url conversion. (Closed)
Patch Set: Rebase Created 4 years 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/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index b450e8ec3ae6cf7ba5397ba32c8053193cd522e2..6f37ddaef3aaf50f18c91047b416de0b7205aab6 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -875,22 +875,8 @@ std::map<std::string, bool> NavigationEntryImpl::GetSubframeUniqueNames(
// renderer should be allowed to just commit the initial blank frame if
// that was the default URL. PageState doesn't matter there, because
// content injected into about:blank frames doesn't use it.
- //
- // Be careful not to include iframe srcdoc URLs in this check, which do
- // need their PageState. The committed URL in that case gets rewritten to
- // about:blank, but we can detect it via the PageState's URL.
- //
- // See https://crbug.com/657896 for details.
- bool is_about_blank = false;
- ExplodedPageState exploded_page_state;
- if (DecodePageState(child->frame_entry->page_state().ToEncodedData(),
- &exploded_page_state)) {
- ExplodedFrameState frame_state = exploded_page_state.top;
- if (UTF16ToUTF8(frame_state.url_string.string()) == url::kAboutBlankURL)
- is_about_blank = true;
- }
-
- names[child->frame_entry->frame_unique_name()] = is_about_blank;
+ names[child->frame_entry->frame_unique_name()] =
+ child->frame_entry->url() == url::kAboutBlankURL;
}
}
return names;

Powered by Google App Engine
This is Rietveld 408576698