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

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

Issue 1371673002: Remove a bunch of provisionalDataSource() usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 1912 matching lines...) Expand 10 before | Expand all | Expand 10 after
1923 // Finally clear the active match, for two reasons: 1923 // Finally clear the active match, for two reasons:
1924 // We just finished the find 'session' and we don't want future (potenti ally 1924 // We just finished the find 'session' and we don't want future (potenti ally
1925 // unrelated) find 'sessions' operations to start at the same place. 1925 // unrelated) find 'sessions' operations to start at the same place.
1926 // The WebLocalFrameImpl could get reused and the activeMatch could end up pointing 1926 // The WebLocalFrameImpl could get reused and the activeMatch could end up pointing
1927 // to a document that is no longer valid. Keeping an invalid reference a round 1927 // to a document that is no longer valid. Keeping an invalid reference a round
1928 // is just asking for trouble. 1928 // is just asking for trouble.
1929 m_textFinder->resetActiveMatch(); 1929 m_textFinder->resetActiveMatch();
1930 } 1930 }
1931 } 1931 }
1932 1932
1933 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType)
1934 {
1935 if (!client())
1936 return;
1937 WebURLError webError = error;
1938 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType);
1939 if (wasProvisional)
1940 client()->didFailProvisionalLoad(this, webError, webCommitType);
1941 else
1942 client()->didFailLoad(this, webError, webCommitType);
1943 }
1944
1945 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) 1933 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
1946 { 1934 {
1947 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); 1935 frame()->view()->setCanHaveScrollbars(canHaveScrollbars);
1948 } 1936 }
1949 1937
1950 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor) 1938 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor)
1951 { 1939 {
1952 m_inputEventsOffsetForEmulation = offset; 1940 m_inputEventsOffsetForEmulation = offset;
1953 m_inputEventsScaleFactorForEmulation = contentScaleFactor; 1941 m_inputEventsScaleFactorForEmulation = contentScaleFactor;
1954 if (frame()->view()) 1942 if (frame()->view())
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
2198 } 2186 }
2199 2187
2200 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2188 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2201 { 2189 {
2202 if (!frame()) 2190 if (!frame())
2203 return WebSandboxFlags::None; 2191 return WebSandboxFlags::None;
2204 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2192 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2205 } 2193 }
2206 2194
2207 } // namespace blink 2195 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698