Title: [118459] trunk/Source/WebCore
- Revision
- 118459
- Author
- [email protected]
- Date
- 2012-05-24 18:49:40 -0700 (Thu, 24 May 2012)
Log Message
Unreviewed, rolling out r118452.
http://trac.webkit.org/changeset/118452
https://bugs.webkit.org/show_bug.cgi?id=87446
Causes many tests to assert on Mac, NRWT bails out (Requested
by sundiamonde on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-05-24
* rendering/RenderObject.cpp:
(WebCore::RenderObject::~RenderObject):
(WebCore::RenderObject::clearLayoutRootIfNeeded):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118458 => 118459)
--- trunk/Source/WebCore/ChangeLog 2012-05-25 01:42:10 UTC (rev 118458)
+++ trunk/Source/WebCore/ChangeLog 2012-05-25 01:49:40 UTC (rev 118459)
@@ -1,3 +1,16 @@
+2012-05-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r118452.
+ http://trac.webkit.org/changeset/118452
+ https://bugs.webkit.org/show_bug.cgi?id=87446
+
+ Causes many tests to assert on Mac, NRWT bails out (Requested
+ by sundiamonde on #webkit).
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::~RenderObject):
+ (WebCore::RenderObject::clearLayoutRootIfNeeded):
+
2012-05-24 Kevin Ollivier <[email protected]>
[wx] Unreviewed build fix. Add contextMenuItemVector stub.
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (118458 => 118459)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-05-25 01:42:10 UTC (rev 118458)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-05-25 01:49:40 UTC (rev 118459)
@@ -219,7 +219,7 @@
RenderObject::~RenderObject()
{
- ASSERT(documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
+ ASSERT(!node() || documentBeingDestroyed() || !frame()->view() || frame()->view()->layoutRoot() != this);
#ifndef NDEBUG
ASSERT(!m_hasAXObject);
renderObjectCounter.decrement();
@@ -2260,7 +2260,7 @@
inline void RenderObject::clearLayoutRootIfNeeded() const
{
- if (!documentBeingDestroyed() && frame()) {
+ if (node() && !documentBeingDestroyed() && frame()) {
if (FrameView* view = frame()->view()) {
if (view->layoutRoot() == this) {
ASSERT_NOT_REACHED();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
