[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-36-g0136662

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit 1903ad87dcd1f3ad13cfc2a509bfc326a0160314
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Sep 6 22:57:19 2010 -0400

    fix variable rename

diff --git a/debian/patches/cve-2010-2901.patch b/debian/patches/cve-2010-2901.patch
index df95114..a130342 100644
--- a/debian/patches/cve-2010-2901.patch
+++ b/debian/patches/cve-2010-2901.patch
@@ -3,8 +3,8 @@ author: Michael Gilbert <michael.s.gilbert at gmail.com>
 origin: http://trac.webkit.org/changeset/63048
 Index: webkit-1.2.4/WebCore/rendering/RenderObject.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderObject.cpp	2010-09-03 15:18:07.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderObject.cpp	2010-09-06 22:03:38.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/rendering/RenderObject.cpp	2010-09-06 22:55:29.000000000 -0400
++++ webkit-1.2.4/WebCore/rendering/RenderObject.cpp	2010-09-06 22:56:03.000000000 -0400
 @@ -560,6 +560,19 @@
      return 0;
  }
@@ -27,8 +27,8 @@ Index: webkit-1.2.4/WebCore/rendering/RenderObject.cpp
      return 0;
 Index: webkit-1.2.4/WebCore/rendering/RenderObject.h
 ===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderObject.h	2010-09-03 15:18:07.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderObject.h	2010-09-06 22:03:38.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/rendering/RenderObject.h	2010-09-06 22:55:29.000000000 -0400
++++ webkit-1.2.4/WebCore/rendering/RenderObject.h	2010-09-06 22:56:03.000000000 -0400
 @@ -193,7 +193,8 @@
  
      // Convenience function for getting to the nearest enclosing box of a RenderObject.
@@ -41,8 +41,8 @@ Index: webkit-1.2.4/WebCore/rendering/RenderObject.h
  #ifndef NDEBUG
 Index: webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/InlineFlowBox.cpp	2010-09-03 15:18:07.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp	2010-09-06 22:06:03.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/rendering/InlineFlowBox.cpp	2010-09-06 22:55:28.000000000 -0400
++++ webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp	2010-09-06 22:56:24.000000000 -0400
 @@ -639,11 +639,24 @@
              // outlines.
              if (renderer()->style()->visibility() == VISIBLE && renderer()->hasOutline() && !isRootInlineBox()) {
@@ -50,7 +50,7 @@ Index: webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp
 -                if ((inlineFlow->continuation() || inlineFlow->isInlineContinuation()) && !boxModelObject()->hasSelfPaintingLayer()) {
 +
 +                RenderBlock* cb = 0;
-+                bool containingBlockPaintsContinuationOutline = inlineFlow->continuation() || inlineFlow->isInlineElementContinuation();
++                bool containingBlockPaintsContinuationOutline = inlineFlow->continuation() || inlineFlow->isInlineContinuation();
 +                if (containingBlockPaintsContinuationOutline) {
 +                    cb = renderer()->containingBlock()->containingBlock();
 +
@@ -73,8 +73,8 @@ Index: webkit-1.2.4/WebCore/rendering/InlineFlowBox.cpp
              }
 Index: webkit-1.2.4/WebCore/rendering/RenderBlock.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/rendering/RenderBlock.cpp	2010-09-06 22:03:04.000000000 -0400
-+++ webkit-1.2.4/WebCore/rendering/RenderBlock.cpp	2010-09-06 22:03:38.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/rendering/RenderBlock.cpp	2010-09-06 22:55:28.000000000 -0400
++++ webkit-1.2.4/WebCore/rendering/RenderBlock.cpp	2010-09-06 22:56:03.000000000 -0400
 @@ -1766,8 +1766,18 @@
      if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseChildOutlines)) {
          if (inlineContinuation() && inlineContinuation()->hasOutline() && inlineContinuation()->style()->visibility() == VISIBLE) {

-- 
WebKit Debian packaging