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

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

Issue 1426923007: Remove PluginLoadObserver and related logic, it was only used for NPAPI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 1909 matching lines...) Expand 10 before | Expand all | Expand 10 after
1920 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType) 1920 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType)
1921 { 1921 {
1922 if (!client()) 1922 if (!client())
1923 return; 1923 return;
1924 WebURLError webError = error; 1924 WebURLError webError = error;
1925 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType); 1925 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType);
1926 if (wasProvisional) 1926 if (wasProvisional)
1927 client()->didFailProvisionalLoad(this, webError, webCommitType); 1927 client()->didFailProvisionalLoad(this, webError, webCommitType);
1928 else 1928 else
1929 client()->didFailLoad(this, webError, webCommitType); 1929 client()->didFailLoad(this, webError, webCommitType);
1930 if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
1931 plugin->didFailLoading(error);
1932 }
1933
1934 void WebLocalFrameImpl::didFinish()
1935 {
1936 if (!client())
1937 return;
1938 client()->didFinishLoad(this);
1939 if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
1940 plugin->didFinishLoading();
1930 } 1941 }
1931 1942
1932 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) 1943 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
1933 { 1944 {
1934 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); 1945 frame()->view()->setCanHaveScrollbars(canHaveScrollbars);
1935 } 1946 }
1936 1947
1937 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor) 1948 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor)
1938 { 1949 {
1939 m_inputEventsOffsetForEmulation = offset; 1950 m_inputEventsOffsetForEmulation = offset;
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 } 2223 }
2213 2224
2214 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2225 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2215 { 2226 {
2216 if (!frame()) 2227 if (!frame())
2217 return WebSandboxFlags::None; 2228 return WebSandboxFlags::None;
2218 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2229 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2219 } 2230 }
2220 2231
2221 } // namespace blink 2232 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698