[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8b459cfd00981c6eac81bfc95c77924d9e1a5970
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 23:51:17 2010 +0000

    Unreviewed. Build fixes for make distcheck.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53503 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 277476d..9230907 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-19  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Unreviewed. Build fixes for make distcheck - missing files.
+
+        * GNUmakefile.am:
+
 2010-01-19  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 17efbef..ad72cab 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -951,6 +951,7 @@ webcore_sources += \
 	WebCore/history/HistoryItem.h \
 	WebCore/history/PageCache.cpp \
 	WebCore/history/PageCache.h \
+	WebCore/html/canvas/CanvasContextAttributes.h \
 	WebCore/html/canvas/CanvasGradient.cpp \
 	WebCore/html/canvas/CanvasGradient.h \
 	WebCore/html/canvas/CanvasPattern.cpp \
@@ -1554,6 +1555,7 @@ webcore_sources += \
 	WebCore/platform/graphics/GraphicsContext.cpp \
 	WebCore/platform/graphics/GraphicsContext.h \
 	WebCore/platform/graphics/GraphicsContextPrivate.h \
+	WebCore/platform/graphics/GraphicsLayer.h \
 	WebCore/platform/graphics/GraphicsTypes.cpp \
 	WebCore/platform/graphics/GraphicsTypes.h \
 	WebCore/platform/graphics/Icon.h \
@@ -1587,6 +1589,7 @@ webcore_sources += \
 	WebCore/platform/graphics/StrokeStyleApplier.h \
 	WebCore/platform/graphics/TextRenderingMode.h \
 	WebCore/platform/graphics/TextRun.h \
+	WebCore/platform/graphics/TypesettingFeatures.h \
 	WebCore/platform/graphics/UnitBezier.h \
 	WebCore/platform/graphics/WidthIterator.cpp \
 	WebCore/platform/graphics/WidthIterator.h \
@@ -1709,6 +1712,7 @@ webcore_sources += \
 	WebCore/plugins/PluginQuirkSet.h \
 	WebCore/plugins/PluginStream.cpp \
 	WebCore/plugins/PluginStream.h \
+	WebCore/plugins/PluginWidget.h \
 	WebCore/plugins/PluginView.cpp \
 	WebCore/plugins/PluginView.h \
 	WebCore/plugins/npapi.cpp \
@@ -1858,6 +1862,7 @@ webcore_sources += \
 	WebCore/rendering/TableLayout.h \
 	WebCore/rendering/TextControlInnerElements.cpp \
 	WebCore/rendering/TextControlInnerElements.h \
+	WebCore/rendering/TrailingFloatsRootInlineBox.h \
 	WebCore/rendering/TransformState.cpp \
 	WebCore/rendering/TransformState.h \
 	WebCore/rendering/break_lines.cpp \
@@ -3623,6 +3628,7 @@ webcore_dist += \
 	WebCore/html/HTMLEntityNames.gperf \
 	WebCore/html/HTMLAttributeNames.in \
 	WebCore/xml/xmlattrs.in \
+	WebCore/xml/xmlnsattrs.in \
 	WebCore/xml/XPathGrammar.y
 
 # Installing web inspector files
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index a71fc89..b596a8f 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -14,6 +14,16 @@
 
 2010-01-19  Gustavo Noronha Silva  <gns at gnome.org>
 
+        Unreviewed. Changes to the test I forgot to make after a last
+        minute change before landing 53294 - this causes make distcheck to
+        fail.
+
+        * tests/testloading.c:
+        (load_error_status_changed_cb):
+        (test_loading_error):
+
+2010-01-19  Gustavo Noronha Silva  <gns at gnome.org>
+
         Reviewed by Xan Lopez.
 
         News items for 1.1.19.
diff --git a/WebKit/gtk/tests/testloading.c b/WebKit/gtk/tests/testloading.c
index f6f1f2e..fd9a05c 100644
--- a/WebKit/gtk/tests/testloading.c
+++ b/WebKit/gtk/tests/testloading.c
@@ -184,11 +184,11 @@ static void load_error_status_changed_cb(GObject* object, GParamSpec* pspec, Web
         g_assert(fixture->has_been_failed);
         g_assert(!fixture->has_been_finished);
         fixture->has_been_finished = TRUE;
-        g_main_loop_quit(fixture->loop);
         break;
     case WEBKIT_LOAD_FAILED:
         g_assert(!fixture->has_been_failed);
         fixture->has_been_failed = TRUE;
+        g_main_loop_quit(fixture->loop);
         break;
     default:
         break;
@@ -220,10 +220,10 @@ static void test_loading_error(WebLoadingFixture* fixture, gconstpointer data)
     g_main_loop_run(fixture->loop);
 
     g_assert(fixture->has_been_provisional);
-    g_assert(fixture->has_been_committed);
+    g_assert(!fixture->has_been_committed);
     g_assert(fixture->has_been_load_error);
     g_assert(fixture->has_been_failed);
-    g_assert(fixture->has_been_finished);
+    g_assert(!fixture->has_been_finished);
 }
 
 /* Cancelled load */

-- 
WebKit Debian packaging