Kaynağa Gözat

remove support for option --dump-render-tree

This reverts commit 715cc3dd48a1f5a1be70be612afd732003d0eeda, as it
was rejected for inclusion in Qt5 and doesn't make sense to keep it,

https://codereview.qt-project.org/101318
Ashish Kulkarni 10 yıl önce
ebeveyn
işleme
f6e6a8e806

+ 0 - 1
CHANGELOG.md

@@ -2,7 +2,6 @@ v0.12.2 (unreleased)
 --------------------
 * use OpenSSL 1.0.1j for the Windows builds
 * fix build failure with unpatched Qt >= 5.3
-* add option --dump-render-tree for viewing the WebKit render tree
 * **#1539**: **[qt]** using OpenType fonts now results in selectable text on Windows
 * **#1638**: **[qt]** fix incorrect rendering of JPEG images on Windows Server 2008 x64
 * **#1639**: block access to local files on Windows when an invalid URL is used

+ 0 - 3
include/wkhtmltox/pdfsettings.hh

@@ -121,9 +121,6 @@ struct DLL_PUBLIC PdfGlobal {
 	//! The file where in to store the output
 	QString out;
 
-	//! dump render tree information to this file
-	QString dumpRenderTree;
-
 	QString documentTitle;
 
 	bool useCompression;

+ 0 - 1
src/lib/pdf_c_bindings.cc

@@ -114,7 +114,6 @@
  * - \b outlineDepth The maximal depth of the outline, e.g. "4".
  * - \b dumpOutline If not set to the empty string a XML representation of the outline is dumped to this file.
  * - \b out The path of the output file, if "-" output is sent to stdout, if empty the output is stored in a buffer.
- * - \b dumpRenderTree If not set to the empty string the WebKit render tree is dumped to this file.
  * - \b documentTitle The title of the PDF document.
  * - \b useCompression Should we use loss less compression when creating the pdf file? Must be either "true" or "false".
  * - \b margin.top Size of the top margin, e.g. "2cm"

+ 0 - 17
src/lib/pdfconverter.cc

@@ -1008,23 +1008,6 @@ void PdfConverterPrivate::printDocument() {
 		outline->dump(sd.stream);
 	}
 
-	if (!settings.dumpRenderTree.isEmpty()) {
-#if QT_VERSION < 0x050000
-		StreamDumper sd(settings.dumpRenderTree);
-		for (int d=0; d < objects.size(); ++d) {
-			if (!objects[d].loaderObject || objects[d].loaderObject->skip || objects[d].settings.isTableOfContent)
-				continue;
-
-			sd.stream << "===========================================================" << endl
-				<< objects[d].settings.page.toUtf8().constData() << endl
-				<< "===========================================================" << endl
-				<< objects[d].page->mainFrame()->renderTreeDump().toUtf8().constData() << endl << endl;
-		}
-#else
-		emit out.warning("dumpRenderTree is not supported on Qt5.");
-#endif
-	}
-
  	painter->end();
 #endif
 	if (settings.out == "-" && lout != "/dev/stdout") {

+ 0 - 2
src/lib/pdfsettings.cc

@@ -119,7 +119,6 @@ struct DLL_LOCAL ReflectImpl<PdfGlobal>: public ReflectClass {
 		WKHTMLTOPDF_REFLECT(outline);
 		WKHTMLTOPDF_REFLECT(dumpOutline);
 		WKHTMLTOPDF_REFLECT(out);
-		WKHTMLTOPDF_REFLECT(dumpRenderTree);
 		WKHTMLTOPDF_REFLECT(documentTitle);
 		WKHTMLTOPDF_REFLECT(useCompression);
 		WKHTMLTOPDF_REFLECT(margin);
@@ -379,7 +378,6 @@ PdfGlobal::PdfGlobal():
 	outlineDepth(4),
 	dumpOutline(""),
 	out(""),
-	dumpRenderTree(""),
 	documentTitle(""),
 	useCompression(true),
 	viewportSize(""),

+ 0 - 3
src/lib/pdfsettings.hh

@@ -124,9 +124,6 @@ struct DLL_PUBLIC PdfGlobal {
 	//! The file where in to store the output
 	QString out;
 
-	//! dump render tree information to this file
-	QString dumpRenderTree;
-
 	QString documentTitle;
 
 	bool useCompression;

+ 0 - 3
src/pdf/pdfarguments.cc

@@ -203,9 +203,6 @@ PdfCommandLineParser::PdfCommandLineParser(PdfGlobal & s, QList<PdfObject> & ps)
  	addarg("page-height", 0, "Page height", new UnitRealSetter(s.size.height,"unitreal"));
  	addarg("page-width", 0, "Page width", new UnitRealSetter(s.size.width,"unitreal"));
 
-#if QT_VERSION < 0x050000
-	addarg("dump-render-tree",0,"Dump the WebKit render tree to a file (for debugging)",new QStrSetter(s.dumpRenderTree,"file"));
-#endif
 	addGlobalLoadArgs(s.load);
 
 	extended(true);