Diff
Modified: trunk/Source/WebKit/efl/ChangeLog (113010 => 113011)
--- trunk/Source/WebKit/efl/ChangeLog 2012-04-03 12:01:11 UTC (rev 113010)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-04-03 12:05:49 UTC (rev 113011)
@@ -1,3 +1,17 @@
+2012-04-03 Alexander Shalamov <[email protected]>
+
+ [EFL] LayoutTestController needs implementation of pageSizeAndMarginsInPixels
+ https://bugs.webkit.org/show_bug.cgi?id=82589
+
+ Add missing implementation for pageSizeAndMarginsInPixels to EFL's
+ DumpRenderTreeSupport.
+
+ Reviewed by Philippe Normand.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+ (DumpRenderTreeSupportEfl::pageSizeAndMarginsInPixels):
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
2012-04-02 Alexander Shalamov <[email protected]>
[EFL] LayoutTestController needs implementation of isPageBoxVisible
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (113010 => 113011)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-04-03 12:01:11 UTC (rev 113010)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2012-04-03 12:05:49 UTC (rev 113011)
@@ -174,6 +174,16 @@
return WebCore::PrintContext::pageNumberForElement(element, WebCore::FloatSize(pageWidth, pageHeight));
}
+String DumpRenderTreeSupportEfl::pageSizeAndMarginsInPixels(const Evas_Object* ewkFrame, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft)
+{
+ WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame);
+
+ if (!frame)
+ return String();
+
+ return WebCore::PrintContext::pageSizeAndMarginsInPixels(frame, pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft);
+}
+
bool DumpRenderTreeSupportEfl::pauseAnimation(Evas_Object* ewkFrame, const char* name, const char* elementId, double time)
{
WebCore::Frame* frame = EWKPrivate::coreFrame(ewkFrame);
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (113010 => 113011)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-04-03 12:01:11 UTC (rev 113010)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2012-04-03 12:05:49 UTC (rev 113011)
@@ -54,6 +54,7 @@
static void layoutFrame(Evas_Object* ewkFrame);
static int numberOfPages(const Evas_Object* ewkFrame, float pageWidth, float pageHeight);
static int numberOfPagesForElementId(const Evas_Object* ewkFrame, const char* elementId, float pageWidth, float pageHeight);
+ static String pageSizeAndMarginsInPixels(const Evas_Object* ewkFrame, int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft);
static bool pauseAnimation(Evas_Object* ewkFrame, const char* name, const char* elementId, double time);
static bool pauseTransition(Evas_Object* ewkFrame, const char* name, const char* elementId, double time);
static unsigned pendingUnloadEventCount(const Evas_Object* ewkFrame);
Modified: trunk/Tools/ChangeLog (113010 => 113011)
--- trunk/Tools/ChangeLog 2012-04-03 12:01:11 UTC (rev 113010)
+++ trunk/Tools/ChangeLog 2012-04-03 12:05:49 UTC (rev 113011)
@@ -1,3 +1,16 @@
+2012-04-03 Alexander Shalamov <[email protected]>
+
+ [EFL] LayoutTestController needs implementation of pageSizeAndMarginsInPixels
+ https://bugs.webkit.org/show_bug.cgi?id=82589
+
+ Add missing implementation for pageSizeAndMarginsInPixels to EFL's LayoutTestController
+ in order to unskip printing/page-format-data.html
+
+ Reviewed by Philippe Normand.
+
+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+ (LayoutTestController::pageSizeAndMarginsInPixels):
+
2012-04-03 Simon Pena <[email protected]>
[GTK] DRT missing didRunInsecureContent notification
Modified: trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (113010 => 113011)
--- trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-04-03 12:01:11 UTC (rev 113010)
+++ trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2012-04-03 12:05:49 UTC (rev 113011)
@@ -144,10 +144,15 @@
return DumpRenderTreeSupportEfl::isPageBoxVisible(browser->mainFrame(), pageIndex);
}
-JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int, int, int, int, int, int, int) const
+JSRetainPtr<JSStringRef> LayoutTestController::pageSizeAndMarginsInPixels(int pageNumber, int width, int height, int marginTop, int marginRight, int marginBottom, int marginLeft) const
{
- notImplemented();
- return 0;
+ String pageSizeAndMargins = DumpRenderTreeSupportEfl::pageSizeAndMarginsInPixels(browser->mainFrame(), pageNumber, width, height, marginTop, marginRight, marginBottom, marginLeft);
+
+ if (pageSizeAndMargins.isEmpty())
+ return 0;
+
+ JSRetainPtr<JSStringRef> returnValue(Adopt, JSStringCreateWithUTF8CString(pageSizeAndMargins.utf8().data()));
+ return returnValue;
}
size_t LayoutTestController::webHistoryItemCount()
