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

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 1983913002: Test to see if we can bring in document data from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebLocalFrameImpl::loadData Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1881 matching lines...) Expand 10 before | Expand all | Expand 10 after
1892 // reload will re-attempt the original request. It is essential that 1892 // reload will re-attempt the original request. It is essential that
1893 // we only do this when there is an unreachableURL since a non-empty 1893 // we only do this when there is an unreachableURL since a non-empty
1894 // unreachableURL informs FrameLoader::reload to load unreachableURL 1894 // unreachableURL informs FrameLoader::reload to load unreachableURL
1895 // instead of the currently loaded URL. 1895 // instead of the currently loaded URL.
1896 ResourceRequest request; 1896 ResourceRequest request;
1897 if (replace && !unreachableURL.isEmpty() && frame()->loader().provisionalDoc umentLoader()) 1897 if (replace && !unreachableURL.isEmpty() && frame()->loader().provisionalDoc umentLoader())
1898 request = frame()->loader().provisionalDocumentLoader()->originalRequest (); 1898 request = frame()->loader().provisionalDocumentLoader()->originalRequest ();
1899 request.setURL(baseURL); 1899 request.setURL(baseURL);
1900 request.setCheckForBrowserSideNavigation(false); 1900 request.setCheckForBrowserSideNavigation(false);
1901 1901
1902 FrameLoadRequest frameRequest(0, request, SubstituteData(data, mimeType, tex tEncoding, unreachableURL)); 1902 FrameLoadRequest frameRequest(frame()->document(), request, SubstituteData(d ata, mimeType, textEncoding, unreachableURL));
1903 DCHECK(frameRequest.substituteData().isValid()); 1903 DCHECK(frameRequest.substituteData().isValid());
1904 frameRequest.setReplacesCurrentItem(replace); 1904 frameRequest.setReplacesCurrentItem(replace);
1905 if (isClientRedirect) 1905 if (isClientRedirect)
1906 frameRequest.setClientRedirect(ClientRedirectPolicy::ClientRedirect); 1906 frameRequest.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
1907 1907
1908 HistoryItem* historyItem = item; 1908 HistoryItem* historyItem = item;
1909 frame()->loader().load( 1909 frame()->loader().load(
1910 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem, 1910 frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem,
1911 static_cast<HistoryLoadType>(webHistoryLoadType)); 1911 static_cast<HistoryLoadType>(webHistoryLoadType));
1912 } 1912 }
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
2100 return WebSandboxFlags::None; 2100 return WebSandboxFlags::None;
2101 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2101 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2102 } 2102 }
2103 2103
2104 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2104 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2105 { 2105 {
2106 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2106 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2107 } 2107 }
2108 2108
2109 } // namespace blink 2109 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp ('k') | third_party/WebKit/public/web/WebFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698