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

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

Issue 1843663005: Change bool ignoreCache to WebFrameLoadType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 2820 matching lines...) Expand 10 before | Expand all | Expand 10 after
2831 if (!encodingName.isEmpty()) 2831 if (!encodingName.isEmpty())
2832 newEncodingName = encodingName; 2832 newEncodingName = encodingName;
2833 m_page->frameHost().setOverrideEncoding(newEncodingName); 2833 m_page->frameHost().setOverrideEncoding(newEncodingName);
2834 2834
2835 if (m_page->mainFrame()->isLocalFrame()) { 2835 if (m_page->mainFrame()->isLocalFrame()) {
2836 if (!m_page->deprecatedLocalMainFrame()->loader().currentItem()) 2836 if (!m_page->deprecatedLocalMainFrame()->loader().currentItem())
2837 return; 2837 return;
2838 FrameLoadRequest request = FrameLoadRequest( 2838 FrameLoadRequest request = FrameLoadRequest(
2839 nullptr, 2839 nullptr,
2840 m_page->deprecatedLocalMainFrame()->loader().resourceRequestForReloa d( 2840 m_page->deprecatedLocalMainFrame()->loader().resourceRequestForReloa d(
2841 FrameLoadTypeReload, KURL(), ClientRedirect)); 2841 FrameLoadTypeReload, KURL(), ClientRedirectPolicy::ClientRedirec t));
2842 request.setClientRedirect(ClientRedirect); 2842 request.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
2843 m_page->deprecatedLocalMainFrame()->loader().load(request, FrameLoadType Reload); 2843 m_page->deprecatedLocalMainFrame()->loader().load(request, FrameLoadType Reload);
2844 } 2844 }
2845 } 2845 }
2846 2846
2847 WebFrame* WebViewImpl::mainFrame() 2847 WebFrame* WebViewImpl::mainFrame()
2848 { 2848 {
2849 return WebFrame::fromFrame(m_page ? m_page->mainFrame() : nullptr); 2849 return WebFrame::fromFrame(m_page ? m_page->mainFrame() : nullptr);
2850 } 2850 }
2851 2851
2852 WebFrame* WebViewImpl::findFrameByName( 2852 WebFrame* WebViewImpl::findFrameByName(
(...skipping 1741 matching lines...) Expand 10 before | Expand all | Expand 10 after
4594 { 4594 {
4595 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than 4595 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa ctor rather than
4596 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. 4596 // page's scale factor, which can be 1 in use-zoom-for-dsf mode.
4597 if (!page()) 4597 if (!page())
4598 return 1; 4598 return 1;
4599 4599
4600 return page()->deviceScaleFactor(); 4600 return page()->deviceScaleFactor();
4601 } 4601 }
4602 4602
4603 } // namespace blink 4603 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebRemoteFrameImpl.cpp ('k') | third_party/WebKit/Source/web/tests/FrameTestHelpers.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698