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

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

Issue 1046953003: Add the WebHistoryCommitType to didFailProvisionalLoad, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/web/WebLocalFrameImpl.h ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1835 // Finally clear the active match, for two reasons: 1835 // Finally clear the active match, for two reasons:
1836 // We just finished the find 'session' and we don't want future (potenti ally 1836 // We just finished the find 'session' and we don't want future (potenti ally
1837 // unrelated) find 'sessions' operations to start at the same place. 1837 // unrelated) find 'sessions' operations to start at the same place.
1838 // The WebLocalFrameImpl could get reused and the activeMatch could end up pointing 1838 // The WebLocalFrameImpl could get reused and the activeMatch could end up pointing
1839 // to a document that is no longer valid. Keeping an invalid reference a round 1839 // to a document that is no longer valid. Keeping an invalid reference a round
1840 // is just asking for trouble. 1840 // is just asking for trouble.
1841 m_textFinder->resetActiveMatch(); 1841 m_textFinder->resetActiveMatch();
1842 } 1842 }
1843 } 1843 }
1844 1844
1845 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional) 1845 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType)
1846 { 1846 {
1847 if (!client()) 1847 if (!client())
1848 return; 1848 return;
1849 WebURLError webError = error; 1849 WebURLError webError = error;
1850 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType);
1850 if (wasProvisional) 1851 if (wasProvisional)
1851 client()->didFailProvisionalLoad(this, webError); 1852 client()->didFailProvisionalLoad(this, webError, webCommitType);
1852 else 1853 else
1853 client()->didFailLoad(this, webError); 1854 client()->didFailLoad(this, webError, webCommitType);
1854 } 1855 }
1855 1856
1856 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) 1857 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
1857 { 1858 {
1858 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); 1859 frame()->view()->setCanHaveScrollbars(canHaveScrollbars);
1859 } 1860 }
1860 1861
1861 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor) 1862 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor)
1862 { 1863 {
1863 m_inputEventsOffsetForEmulation = offset; 1864 m_inputEventsOffsetForEmulation = offset;
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
2085 { 2086 {
2086 m_frameWidget = frameWidget; 2087 m_frameWidget = frameWidget;
2087 } 2088 }
2088 2089
2089 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const 2090 WebFrameWidgetImpl* WebLocalFrameImpl::frameWidget() const
2090 { 2091 {
2091 return m_frameWidget; 2092 return m_frameWidget;
2092 } 2093 }
2093 2094
2094 } // namespace blink 2095 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.h ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698