[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 18:18:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a537513b525e613f6da4f45d28875225ec78c6a1
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 9 18:54:14 2010 +0000
2010-12-09 Antonio Gomes <agomes at rim.com>
Reviewed by Martin Robinson.
[Gtk] Populate DumpRenderTreeSupportGtk (part IV)
https://bugs.webkit.org/show_bug.cgi?id=48429
WebKit/gtk:
Moved also webkit_worker_thread_count() to DumpRenderTreeSupportGtk,
since it was only used by DRT for now.
Since this method was the only one in webkitworker.cpp, the file was
also removed.
* GNUmakefile.am:
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::workerThreadCount):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
* webkit/webkitprivate.h:
* webkit/webkitworkers.cpp: Removed.
WebKitTools/DumpRenderTree/gtk:
Adjust call sites of webkit_thread_count to use the DumpRenderTreeSupportGtk version now.
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::workerThreadCount):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index fa635e5..a9bde80 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-09 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (part IV)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ Moved also webkit_worker_thread_count() to DumpRenderTreeSupportGtk,
+ since it was only used by DRT for now.
+
+ Since this method was the only one in webkitworker.cpp, the file was
+ also removed.
+
+ * GNUmakefile.am:
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::workerThreadCount):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ * webkit/webkitprivate.h:
+ * webkit/webkitworkers.cpp: Removed.
+
2010-12-06 Philippe Normand <pnormand at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/GNUmakefile.am b/WebKit/gtk/GNUmakefile.am
index 7fdf253..6dc2bde 100644
--- a/WebKit/gtk/GNUmakefile.am
+++ b/WebKit/gtk/GNUmakefile.am
@@ -197,8 +197,7 @@ webkitgtk_sources += \
WebKit/gtk/webkit/webkitsecurityorigin.cpp \
WebKit/gtk/webkit/webkitwebsettings.cpp \
WebKit/gtk/webkit/webkitwebview.cpp \
- WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \
- WebKit/gtk/webkit/webkitworkers.cpp
+ WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME at -@WEBKITGTK_API_VERSION at .pc
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index 91e5a11..3baa190 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (C) Research In Motion Limited 2010. All rights reserved.
* Copyright (C) 2010 Joone Hur <joone at kldp.org>
+ * Copyright (C) 2009 Google Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -47,6 +48,7 @@
#if ENABLE(SVG)
#include "SVGSMILElement.h"
#endif
+#include "WorkerThread.h"
#include "webkitprivate.h"
#include "webkitwebviewprivate.h"
#include "webkitwebview.h"
@@ -421,3 +423,12 @@ void DumpRenderTreeSupportGtk::dumpConfigurationForViewport(WebKitWebView* webVi
fprintf(stdout, "viewport size %dx%d scale %f with limits [%f, %f]\n", attrs.layoutSize.width(), attrs.layoutSize.height(), attrs.initialScale, attrs.minimumScale, attrs.maximumScale);
}
+
+unsigned int DumpRenderTreeSupportGtk::workerThreadCount()
+{
+#if ENABLE(WORKERS)
+ return WebCore::WorkerThread::workerThreadCount();
+#else
+ return 0;
+#endif
+}
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index dd1d49d..6203f53 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -73,6 +73,7 @@ public:
static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
static void resetOriginAccessWhiteLists();
+ static unsigned int workerThreadCount();
private:
static bool s_drtRun;
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 083640d..ad793d1 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -260,9 +260,6 @@ extern "C" {
WEBKIT_API void
webkit_application_cache_set_maximum_size(unsigned long long size);
- WEBKIT_API unsigned int
- webkit_worker_thread_count();
-
// WebKitWebDataSource private
WebKitWebDataSource*
webkit_web_data_source_new_with_loader(PassRefPtr<WebKit::DocumentLoader>);
diff --git a/WebKit/gtk/webkit/webkitworkers.cpp b/WebKit/gtk/webkit/webkitworkers.cpp
deleted file mode 100644
index 255863c..0000000
--- a/WebKit/gtk/webkit/webkitworkers.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "webkitprivate.h"
-
-#include "WorkerThread.h"
-
-unsigned int webkit_worker_thread_count(void)
-{
-#if ENABLE(WORKERS)
- return WebCore::WorkerThread::workerThreadCount();
-#else
- return 0;
-#endif
-}
-
-
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 07b2858..0f3356c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-09 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Martin Robinson.
+
+ [Gtk] Populate DumpRenderTreeSupportGtk (part IV)
+ https://bugs.webkit.org/show_bug.cgi?id=48429
+
+ Adjust call sites of webkit_thread_count to use the DumpRenderTreeSupportGtk version now.
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::workerThreadCount):
+
2010-12-06 Philippe Normand <pnormand at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 835f7d8..5bd80db 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -51,7 +51,6 @@
extern "C" {
void webkit_application_cache_set_maximum_size(unsigned long long size);
-unsigned int webkit_worker_thread_count(void);
void webkit_web_inspector_execute_script(WebKitWebInspector* inspector, long callId, const gchar* script);
}
@@ -185,7 +184,7 @@ size_t LayoutTestController::webHistoryItemCount()
unsigned LayoutTestController::workerThreadCount() const
{
- return webkit_worker_thread_count();
+ return DumpRenderTreeSupportGtk::workerThreadCount();
}
void LayoutTestController::notifyDone()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list