Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Loskutov2019-10-01 09:08:29 -0400
committerEric Williams2019-10-02 09:39:04 -0400
commitbb4fbd51a4a0cd92d004003a8522f41f23d088e8 (patch)
treea6bea30994565062c396f378d89a45e7f383bdd4 /tests
parentf20a08551c2f37b351e3bd140c8bfe5bd5475569 (diff)
downloadeclipse.platform.swt-bb4fbd51a4a0cd92d004003a8522f41f23d088e8.tar.gz
eclipse.platform.swt-bb4fbd51a4a0cd92d004003a8522f41f23d088e8.tar.xz
eclipse.platform.swt-bb4fbd51a4a0cd92d004003a8522f41f23d088e8.zip
Bug 551588: [GTK] Performance of TextLayout.getBounds() is very
bad for long text Avoid the fetching of many PangoLayoutIter* objects by re-using them where possible. Refactored and optimized some of the TextLayout getLineBounds() and getBounds() methods to avoid unnecessary native calls and slowdowns. Return to pre-bug 491712 behaviour by using the height returned by pango_layout_get_size(). Tested with the snippets attached on Fedora 30, GTK3.24, and X11. No ill effects observed in the IDE, and no AllNonBrowser JUnit tests fail. Change-Id: I6feb11e6cf7515508f4ef1a155256c2987a83613 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Also-by: Peter Severin <peter@wireframesketcher.com> Also-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutBenchmark.java50
-rw-r--r--tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutExample.java152
-rw-r--r--tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutRegressionTest.java50
3 files changed, 252 insertions, 0 deletions
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutBenchmark.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutBenchmark.java
new file mode 100644
index 0000000000..c89d468c0e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutBenchmark.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Peter Severin and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Peter Severin - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.gtk.snippets;
+
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.TextLayout;
+import org.eclipse.swt.widgets.Display;
+
+public class Bug551588_TextLayoutBenchmark {
+ final static String longString;
+
+ static {
+ String loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+
+ StringBuilder b = new StringBuilder();
+ for (int i = 0; i < 10; i++) {
+ b.append(loremIpsum);
+ }
+ longString = b.toString();
+ }
+
+ public static void main(String[] args) {
+ Display display = new Display();
+
+ long start = System.currentTimeMillis();
+ TextLayout textLayout = new TextLayout(display);
+ textLayout.setText(longString);
+ textLayout.setWidth(1);
+ Rectangle textBounds = textLayout.getBounds();
+ long end = System.currentTimeMillis();
+
+ System.out.println("Time: " + (end - start) + "ms");
+ System.out.println("Text bounds: " + textBounds);
+
+ textLayout.dispose();
+
+ display.dispose();
+ }
+} \ No newline at end of file
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutExample.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutExample.java
new file mode 100644
index 0000000000..bed67ced9d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutExample.java
@@ -0,0 +1,152 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Peter Severin and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Peter Severin - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.gtk.snippets;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.TextLayout;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+
+public class Bug551588_TextLayoutExample {
+ final static String longString;
+
+ static {
+ String loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+
+ StringBuilder b = new StringBuilder();
+ for (int i = 0; i < 20; i++) {
+ b.append(loremIpsum);
+ }
+ longString = b.toString();
+ }
+
+ public static void main(String[] args) {
+ Display display = new Display();
+ final Shell shell = new Shell(display);
+ shell.setText("Bug551588");
+ shell.setLayout(new FillLayout());
+
+ final ScrolledComposite sc = new ScrolledComposite(shell, SWT.V_SCROLL);
+
+ final TextLayoutControl textLayout = new TextLayoutControl(sc, SWT.NONE);
+ textLayout.setText(longString);
+
+ sc.setContent(textLayout);
+ sc.addListener(SWT.Resize, event -> {
+ int availableWidth = sc.getClientArea().width;
+ textLayout.setSize(textLayout.computeSize(availableWidth, SWT.DEFAULT));
+ int availableWidthPrime = sc.getClientArea().width;
+ if (availableWidth != availableWidthPrime) {
+ textLayout.setSize(textLayout.computeSize(availableWidthPrime, SWT.DEFAULT));
+ }
+ });
+ shell.setSize(300, 300);
+ shell.open();
+ while (!shell.isDisposed()) {
+ if (!display.readAndDispatch())
+ display.sleep();
+ }
+ display.dispose();
+ }
+
+}
+
+class TextLayoutControl extends Canvas {
+ private final TextLayout textLayout;
+
+ private Listener listener = event -> TextLayoutControl.this.handleEvent(event);
+
+ public TextLayoutControl(Composite parent, int style) {
+ super(parent, checkStyle(style));
+
+ textLayout = new TextLayout(parent.getDisplay());
+
+ final int[] events = new int[] { SWT.Paint, SWT.Resize, SWT.Dispose };
+
+ for (int i = 0; i < events.length; i++) {
+ addListener(events[i], listener);
+ }
+ }
+
+ public void setText(String string) {
+ textLayout.setText(string);
+ redraw();
+ }
+
+ private static int checkStyle(int style) {
+ style &= ~SWT.H_SCROLL;
+ style &= ~SWT.V_SCROLL;
+ style |= SWT.DOUBLE_BUFFERED;
+
+ return style;
+ }
+
+ private void handleEvent(Event event) {
+ switch (event.type) {
+ case SWT.Paint:
+ onPaint(event.gc);
+ break;
+ case SWT.Resize:
+ onResize();
+ redraw();
+ break;
+ case SWT.Dispose:
+ onDispose();
+ break;
+ }
+ }
+
+ private void onDispose() {
+ textLayout.dispose();
+ }
+
+ private void onPaint(GC gc) {
+ Rectangle clientArea = getClientArea();
+ gc.fillRectangle(clientArea);
+
+ int x = clientArea.x;
+ int y = clientArea.y;
+
+ textLayout.draw(gc, x, y);
+ }
+
+ private void onResize() {
+ final Rectangle bounds = getBounds();
+ textLayout.setWidth(bounds.width);
+ }
+
+ @Override
+ public Point computeSize(int wHint, int hHint, boolean changed) {
+ int oldWidth = textLayout.getWidth();
+ Rectangle size;
+
+ try {
+ textLayout.setWidth(wHint);
+ size = textLayout.getBounds();
+ } finally {
+ textLayout.setWidth(oldWidth);
+ }
+
+ return new Point(size.width, size.height);
+ }
+} \ No newline at end of file
diff --git a/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutRegressionTest.java b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutRegressionTest.java
new file mode 100644
index 0000000000..396739fc2e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug551588_TextLayoutRegressionTest.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Peter Severin and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Peter Severin - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.gtk.snippets;
+
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.TextLayout;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.widgets.Display;
+
+public class Bug551588_TextLayoutRegressionTest {
+
+ public static void main(String[] args) {
+ Display display = new Display();
+
+ Font font = display.getSystemFont();
+ FontData fontData = font.getFontData()[0];
+ fontData.setHeight(100);
+ Font bigFont = new Font(display, fontData);
+
+ test(display, bigFont, 0);
+ test(display, bigFont, 1);
+ test(display, bigFont, 2);
+ test(display, bigFont, 3);
+
+ bigFont.dispose();
+
+ display.dispose();
+ }
+
+ private static void test(Display display, Font bigFont, int line)
+ {
+ TextLayout textLayout = new TextLayout(display);
+ textLayout.setText("a\na\na\na");
+ textLayout.setStyle(new TextStyle(bigFont, null, null), line * 2, line * 2);
+ System.out.println("Text bounds: " + textLayout.getBounds());
+ textLayout.dispose();
+ }
+} \ No newline at end of file

Back to the top