From 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 8 Jun 2011 10:42:08 +0100
Subject: Merge WebKit at r82507: Fix conflicts

- RenderLayerBacking.cpp
  Due to ANDROID_OVERFLOW_SCROLL
  http://trac.webkit.org/changeset/81715

- Document.cpp
  Due to domTreeVersion and ANDROID_STYLE_VERSION
  http://trac.webkit.org/changeset/80797

- CachedResourceLoader.cpp
  Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
  http://trac.webkit.org/changeset/80695

- Settings.cpp/h
  http://trac.webkit.org/changeset/81289
  http://trac.webkit.org/changeset/81635

- MediaPlayer.cpp
  Whitespace only
  http://trac.webkit.org/changeset/80874

- RenderBox.cpp
  Due to isHorizontalWritingMode
  http://trac.webkit.org/changeset/81716

- RenderLayer.cpp/h
  Due to ANDROID_OVERFLOW_SCROLL
  http://trac.webkit.org/changeset/81981

- CSSStyleSelector.cpp
  Due to ANDROID_CSS_RING
  http://trac.webkit.org/changeset/80582
  http://trac.webkit.org/changeset/80993
  http://trac.webkit.org/changeset/80998
  http://trac.webkit.org/changeset/81684
  http://trac.webkit.org/changeset/82378

- CSSParser.cpp
  Due to ANDROID_CSS_RING
  http://trac.webkit.org/changeset/80582
  http://trac.webkit.org/changeset/81684

- StyleElement.cpp
  Due to cherry pick of http://trac.webkit.org/changeset/80787
  http://trac.webkit.org/changeset/82054

- EventHandler.cpp
  Due to ANDROID_PLUGINS
  http://trac.webkit.org/changeset/81618
  http://trac.webkit.org/changeset/81835

- SliderThumbElement.cpp
  Due to touch events
  http://trac.webkit.org/changeset/81216

- MediaControls.cpp
  Due to touch events
  http://trac.webkit.org/changeset/80857
  Note that the WebKit history for this file is confusing as it was
  renamed in http://trac.webkit.org/changeset/83545 and then re-added in
  http://trac.webkit.org/changeset/84222 but trac is not smart enough to
  track history backwards from http://trac.webkit.org/changeset/84222.

Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
---
 Source/WebCore/rendering/RenderLayerBacking.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'Source/WebCore/rendering/RenderLayerBacking.cpp')

diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index ec3b6fd..26a10dd 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -1115,26 +1115,20 @@ void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, Graph
 {
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willPaint(m_owningLayer->renderer()->frame(), clip);
 
-<<<<<<< HEAD
-    // We have to use the same root as for hit testing, because both methods
-    // can compute and cache clipRects.
-    IntRect enclosingBBox = compositedBounds();
-#if ENABLE(ANDROID_OVERFLOW_SCROLL)
-    // If we encounter a scrollable layer, layers inside the scrollable layer
-    // will need their entire content recorded.
-    if (m_owningLayer->hasOverflowParent())
-        enclosingBBox.setSize(clip.size());
-#endif
-=======
     IntSize offset = graphicsLayer->offsetFromRenderer();
     context.translate(-offset);
->>>>>>> webkit.org at r82507
 
     IntRect clipRect(clip);
     clipRect.move(offset);
     
     // The dirtyRect is in the coords of the painting root.
     IntRect dirtyRect = compositedBounds();
+#if ENABLE(ANDROID_OVERFLOW_SCROLL)
+    // If we encounter a scrollable layer, layers inside the scrollable layer
+    // will need their entire content recorded.
+    if (m_owningLayer->hasOverflowParent())
+        dirtyRect.setSize(clip.size());
+#endif
     dirtyRect.intersect(clipRect);
 
     // We have to use the same root as for hit testing, because both methods can compute and cache clipRects.
-- 
cgit v1.1