diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:30 +0100 |
| commit | 058ccc7ba0a4d59b9f6e92808332aa9895425fc7 (patch) | |
| tree | 276aad5a2bbc2fd7d65d21bfca42c9de88b3dd20 /WebCore/html/HTMLIFrameElement.cpp | |
| parent | 2796dd1bf3b4b01e7e1d96ea91bd3a212f647579 (diff) | |
| download | external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.zip external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.gz external_webkit-058ccc7ba0a4d59b9f6e92808332aa9895425fc7.tar.bz2 | |
Revert "Merge WebKit r47420"
This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
Diffstat (limited to 'WebCore/html/HTMLIFrameElement.cpp')
| -rw-r--r-- | WebCore/html/HTMLIFrameElement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/HTMLIFrameElement.cpp b/WebCore/html/HTMLIFrameElement.cpp index 123b134..478925a 100644 --- a/WebCore/html/HTMLIFrameElement.cpp +++ b/WebCore/html/HTMLIFrameElement.cpp @@ -3,7 +3,7 @@ * (C) 1999 Antti Koivisto (koivisto@kde.org) * (C) 2000 Simon Hausmann (hausmann@kde.org) * (C) 2001 Dirk Mueller (mueller@kde.org) - * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -89,7 +89,7 @@ void HTMLIFrameElement::parseMappedAttribute(MappedAttribute* attr) bool HTMLIFrameElement::rendererIsNeeded(RenderStyle* style) { - return isURLAllowed() && style->display() != NONE; + return isURLAllowed(m_URL) && style->display() != NONE; } RenderObject* HTMLIFrameElement::createRenderer(RenderArena* arena, RenderStyle*) |