diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 23:50:34 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 23:50:34 +0000 |
| commit | bc1dc981a9c6f2acbb0a1cad88656ad42559eace (patch) | |
| tree | c209827f3782bbc9e4311066137c185009d0908a /chrome | |
| parent | dbf91a10fad02f02fe110c551eeaf4309fec06f2 (diff) | |
| download | chromium_src-bc1dc981a9c6f2acbb0a1cad88656ad42559eace.zip chromium_src-bc1dc981a9c6f2acbb0a1cad88656ad42559eace.tar.gz chromium_src-bc1dc981a9c6f2acbb0a1cad88656ad42559eace.tar.bz2 | |
Revert 57388 - Fix browser hang when blocking hulu pop-out
Flash while drawing the movie frames cannot handle being sized 0-by-0 and
a storm of math exception happen which prevents flash from pumping messages
BUG=52754
TEST=see bug
Reverting because Adam's fix for hulu obviates this workarround which can
have side effect elsewhere. See the bug.
Review URL: http://codereview.chromium.org/3132043
TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/3150038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57425 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/blocked_popup_container.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/blocked_popup_container.cc b/chrome/browser/blocked_popup_container.cc index d78077f..d349314 100644 --- a/chrome/browser/blocked_popup_container.cc +++ b/chrome/browser/blocked_popup_container.cc @@ -3,9 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/blocked_popup_container.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/rect.h" // static @@ -34,12 +33,6 @@ void BlockedPopupContainer::AddTabContents(TabContents* tab_contents, return; } - // BUG:52754 Super hack time. If we supress a popup that has flash 10.1 - // playing a movie, it cannot handle being zero-sized: an unending series - // of divide by zero exceptions are thrown (and ignored) inside the flash - // in the UI thread thereby hanging the plugin and in turn hanging us. - tab_contents->view()->SizeContents(gfx::Size(10, 10)); - blocked_popups_.push_back(BlockedPopup(tab_contents, bounds)); tab_contents->set_delegate(this); if (blocked_popups_.size() == 1) |