Commit e57434c7 authored by allan.jensen@digia.com's avatar allan.jensen@digia.com
Browse files

Assertion while scrolling news.google.com

https://bugs.webkit.org/show_bug.cgi?id=115303

Reviewed by Anders Carlsson.

Do not relayout when accessing script elements during painting.

* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::renderWidgetForJSBindings):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154672 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 754dada6
2013-08-27 Allan Sandfeld Jensen <allan.jensen@digia.com>
Assertion while scrolling news.google.com
https://bugs.webkit.org/show_bug.cgi?id=115303
Reviewed by Anders Carlsson.
Do not relayout when accessing script elements during painting.
* html/HTMLEmbedElement.cpp:
(WebCore::HTMLEmbedElement::renderWidgetForJSBindings):
2013-08-27 Benjamin Poulain <benjamin@webkit.org>
 
Remove DOMSettableTokenList's overload of add() and remove()
......@@ -28,6 +28,7 @@
#include "CSSPropertyNames.h"
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameView.h"
#include "HTMLImageLoader.h"
#include "HTMLNames.h"
#include "HTMLObjectElement.h"
......@@ -67,7 +68,9 @@ static inline RenderWidget* findWidgetRenderer(const Node* n)
RenderWidget* HTMLEmbedElement::renderWidgetForJSBindings() const
{
document()->updateLayoutIgnorePendingStylesheets();
FrameView* view = document()->view();
if (!view || (!view->isInLayout() && !view->isPainting()))
document()->updateLayoutIgnorePendingStylesheets();
return findWidgetRenderer(this);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment