[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
kov at webkit.org
kov at webkit.org
Wed Jan 20 22:19:28 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 7050f7a6aabe8bb690b10f666b60693fd6fd0982
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 11 17:57:01 2010 +0000
Revert 53075 since it caused ASSERTS to be hit.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53084 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b5c6afe..b71e3a6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,13 +1,3 @@
-2010-01-11 Gustavo Noronha Silva <gns at gnome.org>
-
- https://bugs.webkit.org/show_bug.cgi?id=33472
- [GTK] Debug bots crashing in plugins/iframe-shims.html
-
- Skip test that fails on bots, but passes locally, so we can
- investigate.
-
- * platform/gtk/Skipped:
-
2010-01-08 Nate Chapin <japhet at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 0b772cd..e6ae3bb 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5744,7 +5744,3 @@ fast/profiler/dead-time.html
# Fails on and off (more often fails) on the release bot
media/event-attributes.html
-
-# Crashes on debug bots, but passes locally
-# See https://bugs.webkit.org/show_bug.cgi?id=33472
-plugins/iframe-shims.html
\ No newline at end of file
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index aa7041f..6d446a3 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,19 +1,3 @@
-2010-01-11 Gustavo Noronha Silva <gns at gnome.org>
-
- Reviewed by Xan Lopez.
-
- [GTK] couple fixes for signal emissions, and property notifications
- https://bugs.webkit.org/show_bug.cgi?id=33428
-
- Fix commitedLoad being called where it should not, causing it to
- be called one time too many in some cases. We now match Qt's and
- Mac's behavior here.
-
- * WebCoreSupport/FrameLoaderClientGtk.cpp:
- (WebKit::FrameLoaderClient::finishedLoading):
- * tests/testloading.c:
- (load_error_status_changed_cb):
-
2010-01-08 Gustavo Noronha Silva <gns at gnome.org>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 4d53501..a690d80 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -840,10 +840,9 @@ String FrameLoaderClient::generatedMIMETypeForURLScheme(const String&) const
void FrameLoaderClient::finishedLoading(WebCore::DocumentLoader* documentLoader)
{
- if (!m_pluginView) {
- FrameLoader* loader = documentLoader->frameLoader();
- loader->setEncoding(m_response.textEncodingName(), false);
- } else {
+ if (!m_pluginView)
+ committedLoad(documentLoader, 0, 0);
+ else {
m_pluginView->didFinishLoading();
m_pluginView = 0;
m_hasSentResponseToPlugin = false;
diff --git a/WebKit/gtk/tests/testloading.c b/WebKit/gtk/tests/testloading.c
index cb800c3..34897bb 100644
--- a/WebKit/gtk/tests/testloading.c
+++ b/WebKit/gtk/tests/testloading.c
@@ -175,10 +175,6 @@ static void load_error_status_changed_cb(GObject* object, GParamSpec* pspec, Web
* anything */
fixture->has_been_provisional = TRUE;
break;
- case WEBKIT_LOAD_COMMITTED:
- g_assert(!fixture->has_been_committed);
- fixture->has_been_committed = TRUE;
- break;
case WEBKIT_LOAD_FINISHED:
g_assert(fixture->has_been_provisional);
g_assert(fixture->has_been_load_error);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list