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

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 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 1957 matching lines...) Expand 10 before | Expand all | Expand 10 after
1968 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType) 1968 void WebLocalFrameImpl::didFail(const ResourceError& error, bool wasProvisional, HistoryCommitType commitType)
1969 { 1969 {
1970 if (!client()) 1970 if (!client())
1971 return; 1971 return;
1972 WebURLError webError = error; 1972 WebURLError webError = error;
1973 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType); 1973 WebHistoryCommitType webCommitType = static_cast<WebHistoryCommitType>(commi tType);
1974 if (wasProvisional) 1974 if (wasProvisional)
1975 client()->didFailProvisionalLoad(this, webError, webCommitType); 1975 client()->didFailProvisionalLoad(this, webError, webCommitType);
1976 else 1976 else
1977 client()->didFailLoad(this, webError, webCommitType); 1977 client()->didFailLoad(this, webError, webCommitType);
1978 if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
1979 plugin->didFailLoading(error);
1980 }
1981
1982 void WebLocalFrameImpl::didFinish()
1983 {
1984 if (!client())
1985 return;
1986 client()->didFinishLoad(this);
1987 if (WebPluginContainerImpl* plugin = pluginContainerFromFrame(frame()))
1988 plugin->didFinishLoading();
1978 } 1989 }
1979 1990
1980 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars) 1991 void WebLocalFrameImpl::setCanHaveScrollbars(bool canHaveScrollbars)
1981 { 1992 {
1982 frame()->view()->setCanHaveScrollbars(canHaveScrollbars); 1993 frame()->view()->setCanHaveScrollbars(canHaveScrollbars);
1983 } 1994 }
1984 1995
1985 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor) 1996 void WebLocalFrameImpl::setInputEventsTransformForEmulation(const IntSize& offse t, float contentScaleFactor)
1986 { 1997 {
1987 m_inputEventsOffsetForEmulation = offset; 1998 m_inputEventsOffsetForEmulation = offset;
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 } 2243 }
2233 2244
2234 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2245 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2235 { 2246 {
2236 if (!frame()) 2247 if (!frame())
2237 return WebSandboxFlags::None; 2248 return WebSandboxFlags::None;
2238 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2249 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2239 } 2250 }
2240 2251
2241 } // namespace blink 2252 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/Source/web/WebPluginContainerImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698