| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> | 3 * (C) 2000 Simon Hausmann <hausmann@kde.org> |
| 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) | 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) |
| 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 238 |
| 239 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa
ddingLeft(), paddingTop())); | 239 childBox->setLocation(LayoutPoint(borderLeft(), borderTop()) + LayoutSize(pa
ddingLeft(), paddingTop())); |
| 240 childBox->style()->setHeight(Length(newSize.height(), Fixed)); | 240 childBox->style()->setHeight(Length(newSize.height(), Fixed)); |
| 241 childBox->style()->setWidth(Length(newSize.width(), Fixed)); | 241 childBox->style()->setWidth(Length(newSize.width(), Fixed)); |
| 242 childBox->forceLayout(); | 242 childBox->forceLayout(); |
| 243 clearNeedsLayout(); | 243 clearNeedsLayout(); |
| 244 | 244 |
| 245 statePusher.pop(); | 245 statePusher.pop(); |
| 246 } | 246 } |
| 247 | 247 |
| 248 void RenderEmbeddedObject::viewCleared() | |
| 249 { | |
| 250 // This is required for <object> elements whose contents are rendered by Web
Core (e.g. src="foo.html"). | |
| 251 if (node() && widget() && widget()->isFrameView()) { | |
| 252 FrameView* view = toFrameView(widget()); | |
| 253 int marginWidth = -1; | |
| 254 int marginHeight = -1; | |
| 255 if (node()->hasTagName(iframeTag)) { | |
| 256 HTMLIFrameElement* frame = toHTMLIFrameElement(node()); | |
| 257 marginWidth = frame->marginWidth(); | |
| 258 marginHeight = frame->marginHeight(); | |
| 259 } | |
| 260 if (marginWidth != -1) | |
| 261 view->setMarginWidth(marginWidth); | |
| 262 if (marginHeight != -1) | |
| 263 view->setMarginHeight(marginHeight); | |
| 264 } | |
| 265 } | |
| 266 | |
| 267 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) | 248 bool RenderEmbeddedObject::scroll(ScrollDirection direction, ScrollGranularity g
ranularity, float) |
| 268 { | 249 { |
| 269 return false; | 250 return false; |
| 270 } | 251 } |
| 271 | 252 |
| 272 bool RenderEmbeddedObject::canHaveChildren() const | 253 bool RenderEmbeddedObject::canHaveChildren() const |
| 273 { | 254 { |
| 274 return false; | 255 return false; |
| 275 } | 256 } |
| 276 | 257 |
| 277 } | 258 } |
| OLD | NEW |