[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Thu Apr 8 01:56:48 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1b70f9d09a32348f70ec6b166d8ec08cf33bb788
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 23 12:43:18 2010 +0000
2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
[Gtk] Implement layoutTestController.numberOfPages
https://bugs.webkit.org/show_bug.cgi?id=35228
* platform/gtk/Skipped:
2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
[Gtk] Implement layoutTestController.numberOfPages
https://bugs.webkit.org/show_bug.cgi?id=35228
* webkit/webkitprivate.h:
* webkit/webkitwebframe.cpp:
(webkit_web_frame_number_of_pages):
2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Eric Seidel.
[Gtk] Implement layoutTestController.numberOfPages
https://bugs.webkit.org/show_bug.cgi?id=35228
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::numberOfPages):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55144 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9a51294..e922c6e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Gtk] Implement layoutTestController.numberOfPages
+ https://bugs.webkit.org/show_bug.cgi?id=35228
+
+ * platform/gtk/Skipped:
+
2010-02-23 Tony Chang <tony at chromium.org>
Not reviewed.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 5c9b6bb..3658798 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5851,9 +5851,6 @@ http/tests/incremental/split-hex-entities.pl
# https://bugs.webkit.org/show_bug.cgi?id=32717
fast/frames/flattening/
-# Implement LayoutTestController::numberOfPages().
-printing/numberOfPages.html
-
# Crashes on release/debug bots, see https://bugs.webkit.org/show_bug.cgi?id=35080
fast/css/font-face-opentype.html
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 07da0a9..032a7a0 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Gtk] Implement layoutTestController.numberOfPages
+ https://bugs.webkit.org/show_bug.cgi?id=35228
+
+ * webkit/webkitprivate.h:
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_number_of_pages):
+
2010-02-23 José Millán Soto <jmillan at igalia.com>
Reviewed by Xan Lopez.
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 44b4d0c..046f33e 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -301,6 +301,9 @@ extern "C" {
WEBKIT_API int
webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const gchar* id, float pageWidth, float pageHeight);
+ WEBKIT_API int
+ webkit_web_frame_number_of_pages(WebKitWebFrame* frame, float pageWidth, float pageHeight);
+
WEBKIT_API guint
webkit_web_frame_get_pending_unload_event_count(WebKitWebFrame* frame);
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index fbd246d..540df29 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -867,6 +867,25 @@ int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const
}
/**
+ * webkit_web_frame_number_of_pages
+ * @frame: a #WebKitWebFrame
+ * @pageWidth: width of a page
+ * @pageHeight: height of a page
+ *
+ * Return value: The number of pages to be printed.
+ */
+int webkit_web_frame_number_of_pages(WebKitWebFrame* frame, float pageWidth, float pageHeight)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), NULL);
+
+ Frame* coreFrame = core(frame);
+ if (!coreFrame)
+ return -1;
+
+ return PrintContext::numberOfPages(coreFrame, FloatSize(pageWidth, pageHeight));
+}
+
+/**
* webkit_web_frame_get_pending_unload_event_count:
* @frame: a #WebKitWebFrame
*
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e066519..536204b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ [Gtk] Implement layoutTestController.numberOfPages
+ https://bugs.webkit.org/show_bug.cgi?id=35228
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::numberOfPages):
+
2010-02-23 Laszlo Gombos <laszlo.1.gombos at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 668b852..568ee8d 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -56,6 +56,7 @@ unsigned int webkit_worker_thread_count(void);
void webkit_white_list_access_from_origin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
gchar* webkit_web_frame_counter_value_for_element_by_id(WebKitWebFrame* frame, const gchar* id);
int webkit_web_frame_page_number_for_element_by_id(WebKitWebFrame* frame, const gchar* id, float pageWidth, float pageHeight);
+int webkit_web_frame_number_of_pages(WebKitWebFrame* frame, float pageWidth, float pageHeight);
void webkit_web_inspector_execute_script(WebKitWebInspector* inspector, long callId, const gchar* script);
}
@@ -149,10 +150,9 @@ int LayoutTestController::pageNumberForElementById(JSStringRef id, float pageWid
return pageNumber;
}
-int LayoutTestController::numberOfPages(float, float)
+int LayoutTestController::numberOfPages(float pageWidth, float pageHeight)
{
- // FIXME: implement
- return -1;
+ return webkit_web_frame_number_of_pages(mainFrame, pageWidth, pageHeight);
}
size_t LayoutTestController::webHistoryItemCount()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list