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

Side by Side Diff: Source/WebCore/plugins/PluginView.cpp

Issue 6711028: Merge 79897 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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 | « no previous file | no next file » | 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) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 3 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
4 * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in> 4 * Copyright (C) 2010 Girish Ramakrishnan <girish@forwardbias.in>
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 949
950 m_manualStream->didFinishLoading(0); 950 m_manualStream->didFinishLoading(0);
951 } 951 }
952 952
953 void PluginView::didFail(const ResourceError& error) 953 void PluginView::didFail(const ResourceError& error)
954 { 954 {
955 if (m_status != PluginStatusLoadedSuccessfully) 955 if (m_status != PluginStatusLoadedSuccessfully)
956 return; 956 return;
957 957
958 ASSERT(m_loadManually); 958 ASSERT(m_loadManually);
959 ASSERT(m_manualStream); 959
960 960 if (m_manualStream)
961 m_manualStream->didFail(0, error); 961 m_manualStream->didFail(0, error);
962 } 962 }
963 963
964 void PluginView::setCallingPlugin(bool b) const 964 void PluginView::setCallingPlugin(bool b) const
965 { 965 {
966 if (!m_plugin->quirks().contains(PluginQuirkHasModalMessageLoop)) 966 if (!m_plugin->quirks().contains(PluginQuirkHasModalMessageLoop))
967 return; 967 return;
968 968
969 if (b) 969 if (b)
970 ++s_callingPlugin; 970 ++s_callingPlugin;
971 else 971 else
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 setCallingPlugin(true); 1522 setCallingPlugin(true);
1523 NPBool value = privateBrowsingEnabled; 1523 NPBool value = privateBrowsingEnabled;
1524 setValue(m_instance, NPNVprivateModeBool, &value); 1524 setValue(m_instance, NPNVprivateModeBool, &value);
1525 setCallingPlugin(false); 1525 setCallingPlugin(false);
1526 PluginView::setCurrentPluginView(0); 1526 PluginView::setCurrentPluginView(0);
1527 } 1527 }
1528 1528
1529 } // namespace WebCore 1529 } // namespace WebCore
1530 1530
1531 #endif // ENABLE(NETSCAPE_PLUGIN_API) 1531 #endif // ENABLE(NETSCAPE_PLUGIN_API)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698