diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
|---|---|---|
| committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
| commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
| tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/html/HTMLObjectElement.cpp | |
| parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
| download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 | |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/html/HTMLObjectElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLObjectElement.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/html/HTMLObjectElement.cpp b/WebCore/html/HTMLObjectElement.cpp index c07d050..69974a8 100644 --- a/WebCore/html/HTMLObjectElement.cpp +++ b/WebCore/html/HTMLObjectElement.cpp @@ -287,12 +287,8 @@ bool HTMLObjectElement::rendererIsNeeded(RenderStyle* style) Frame* frame = document()->frame(); if (!frame) return false; - - // Temporary Workaround for Gears plugin - see bug 24215 for details and bug 24346 to track removal. - // Gears expects the plugin to be instantiated even if display:none is set - // for the object element. - bool isGearsPlugin = equalIgnoringCase(getAttribute(typeAttr), "application/x-googlegears"); - return isGearsPlugin || HTMLPlugInImageElement::rendererIsNeeded(style); + + return HTMLPlugInImageElement::rendererIsNeeded(style); } void HTMLObjectElement::insertedIntoDocument() |