Title: [154672] trunk/Source/WebCore
- Revision
- 154672
- Author
- [email protected]
- Date
- 2013-08-27 03:00:36 -0700 (Tue, 27 Aug 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154671 => 154672)
--- trunk/Source/WebCore/ChangeLog 2013-08-27 09:54:21 UTC (rev 154671)
+++ trunk/Source/WebCore/ChangeLog 2013-08-27 10:00:36 UTC (rev 154672)
@@ -1,3 +1,15 @@
+2013-08-27 Allan Sandfeld Jensen <[email protected]>
+
+ 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 <[email protected]>
Remove DOMSettableTokenList's overload of add() and remove()
Modified: trunk/Source/WebCore/html/HTMLEmbedElement.cpp (154671 => 154672)
--- trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2013-08-27 09:54:21 UTC (rev 154671)
+++ trunk/Source/WebCore/html/HTMLEmbedElement.cpp 2013-08-27 10:00:36 UTC (rev 154672)
@@ -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 @@
RenderWidget* HTMLEmbedElement::renderWidgetForJSBindings() const
{
- document()->updateLayoutIgnorePendingStylesheets();
+ FrameView* view = document()->view();
+ if (!view || (!view->isInLayout() && !view->isPainting()))
+ document()->updateLayoutIgnorePendingStylesheets();
return findWidgetRenderer(this);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
