am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.

Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'

* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
  Merge webkit.org at r51976 : Fix general conflicts.

4 files changed, 2 insertions, 43 deletions

diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 204a0c3..4d60569 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -162,23 +162,9 @@ RenderBlock::~RenderBlock()
 
 void RenderBlock::destroy()
 {
-<<<<<<< HEAD:WebCore/rendering/RenderBlock.cpp
-    // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will 
-    // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise. 
-    children()->destroyLeftoverChildren(); 
-
-    // Destroy our continuation before anything other than anonymous children. 
-    // The reason we don't destroy it before anonymous children is that they may 
-    // have continuations of their own that are anonymous children of our continuation. 
-    if (m_inlineContinuation) { 
-        m_inlineContinuation->destroy();
-        m_inlineContinuation = 0; 
-    }
-=======
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
     children()->destroyLeftoverChildren();
->>>>>>> webkit.org at r51976:WebCore/rendering/RenderBlock.cpp
 
     // Destroy our continuation before anything other than anonymous children.
     // The reason we don't destroy it before anonymous children is that they may
diff --git a/WebCore/rendering/RenderInline.cpp b/WebCore/rendering/RenderInline.cpp
index 6df5ffe..2f9a247 100644
--- a/WebCore/rendering/RenderInline.cpp
+++ b/WebCore/rendering/RenderInline.cpp
@@ -56,16 +56,6 @@ void RenderInline::destroy()
     // properly dirty line boxes that they are removed from.  Effects that do :before/:after only on hover could crash otherwise.
     children()->destroyLeftoverChildren();
 
-<<<<<<< HEAD:WebCore/rendering/RenderInline.cpp
-    // Destroy our continuation before anything other than anonymous children. 
-    // The reason we don't destroy it before anonymous children is that they may 
-    // have continuations of their own that are anonymous children of our continuation. 
-    if (m_continuation) { 
-        m_continuation->destroy(); 
-        m_continuation = 0; 
-    } 
-
-=======
     // Destroy our continuation before anything other than anonymous children.
     // The reason we don't destroy it before anonymous children is that they may
     // have continuations of their own that are anonymous children of our continuation.
@@ -74,7 +64,6 @@ void RenderInline::destroy()
         m_continuation = 0;
     }
     
->>>>>>> webkit.org at r51976:WebCore/rendering/RenderInline.cpp
     if (!documentBeingDestroyed()) {
         if (firstLineBox()) {
             // We can't wait for RenderBoxModelObject::destroy to clear the selection,
diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp
index ee7814c..7e0fee9 100644
--- a/WebCore/rendering/RenderLayer.cpp
+++ b/WebCore/rendering/RenderLayer.cpp
@@ -2182,12 +2182,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, GraphicsContext* p,
 #else
         TransformationMatrix transform;
         transform.translate(x, y);
-<<<<<<< HEAD:WebCore/rendering/RenderLayer.cpp
-        transform = *m_transform * transform;
-#endif
-=======
         transform = layerTransform * transform;
->>>>>>> webkit.org at r51976:WebCore/rendering/RenderLayer.cpp
+#endif
         
         // Apply the transform.
         p->save();
diff --git a/WebCore/rendering/RenderWidget.cpp b/WebCore/rendering/RenderWidget.cpp
index 33f03e2..8b7e899 100644
--- a/WebCore/rendering/RenderWidget.cpp
+++ b/WebCore/rendering/RenderWidget.cpp
@@ -305,21 +305,9 @@ void RenderWidget::updateWidgetPosition()
     int w = width() - borderLeft() - borderRight() - paddingLeft() - paddingRight();
     int h = height() - borderTop() - borderBottom() - paddingTop() - paddingBottom();
 
-<<<<<<< HEAD:WebCore/rendering/RenderWidget.cpp
-    IntRect newBounds(absPos.x(), absPos.y(), w, h);
-    IntRect oldBounds(m_widget->frameRect());
-    bool boundsChanged = newBounds != oldBounds;
-    if (boundsChanged) {
-        RenderWidgetProtector protector(this);
-        RefPtr<Node> protectedNode(node());
-        m_widget->setFrameRect(newBounds);
-    }
-    
-#ifndef FLATTEN_IFRAME
-=======
     bool boundsChanged = setWidgetGeometry(IntRect(absPos.x(), absPos.y(), w, h));
 
->>>>>>> webkit.org at r51976:WebCore/rendering/RenderWidget.cpp
+#ifndef FLATTEN_IFRAME
     // if the frame bounds got changed, or if view needs layout (possibly indicating
     // content size is wrong) we have to do a layout to set the right widget size
     if (m_widget->isFrameView()) {