[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
alex at webkit.org
alex at webkit.org
Wed Dec 22 18:24:55 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 26df767f2997299381804b53d97dd8f065fdda82
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 18:16:50 2010 +0000
2010-12-09 Alejandro G. Castro <alex at igalia.com>
Reviewed by Martin Robinson.
[GTK] Add hasSpellingMarker support to the DRT
https://bugs.webkit.org/show_bug.cgi?id=50739
Added a new private API function to support the spelling marker
tests in the DRT.
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
2010-12-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Martin Robinson.
[GTK] Add hasSpellingMarker support to the DRT
https://bugs.webkit.org/show_bug.cgi?id=50739
Implemented the hasSpellingMarker to support spelling tests.
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::hasSpellingMarker):
2010-12-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Martin Robinson.
[GTK] Add hasSpellingMarker support to the DRT
https://bugs.webkit.org/show_bug.cgi?id=50739
Unskipped spelling tests and added a bug for the one failing,
added results for a new ones also.
* platform/gtk/Skipped:
* platform/gtk/editing/spelling/inline_spelling_markers-expected.txt: Added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73740 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2fe8a49..bb93ada 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-10 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Add hasSpellingMarker support to the DRT
+ https://bugs.webkit.org/show_bug.cgi?id=50739
+
+ Unskipped spelling tests and added a bug for the one failing,
+ added results for a new ones also.
+
+ * platform/gtk/Skipped:
+ * platform/gtk/editing/spelling/inline_spelling_markers-expected.txt: Added.
+
2010-12-10 Joone Hur <joone at kldp.org>
Reviewed by Xan Lopez.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index c92671c..808bf66 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -964,13 +964,6 @@ editing/selection/unrendered-004.html
editing/selection/unrendered-005.html
editing/selection/unrendered-space.html
editing/selection/word-granularity.html
-editing/spelling/inline_spelling_markers.html
-editing/spelling/spellcheck-attribute.html
-editing/spelling/spelling-hasspellingmarker.html
-editing/spelling/spelling-backspace-between-lines.html
-editing/spelling/spelling-linebreak.html
-editing/spelling/spelling-attribute-change.html
-editing/spelling/spelling-attribute-at-child.html
editing/style/5065910.html
editing/style/apple-style-editable-mix.html
editing/style/block-style-001.html
@@ -5572,3 +5565,6 @@ media/controls-without-preload.html
fast/history/history-back-initial-vs-final-url.html
http/tests/navigation/post-frames-goback1.html
http/tests/navigation/postredirect-frames-goback1.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=50740
+editing/spelling/spelling-backspace-between-lines.html
diff --git a/LayoutTests/platform/gtk/editing/spelling/inline_spelling_markers-expected.txt b/LayoutTests/platform/gtk/editing/spelling/inline_spelling_markers-expected.txt
new file mode 100644
index 0000000..b3caca0
--- /dev/null
+++ b/LayoutTests/platform/gtk/editing/spelling/inline_spelling_markers-expected.txt
@@ -0,0 +1,39 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x38
+ RenderText {#text} at (0,0) size 494x19
+ text run at (0,0) width 494: "This tests the correct placement of inline spelling and grammar markers in text."
+ RenderBR {BR} at (494,15) size 0x0
+ RenderText {#text} at (0,19) size 477x19
+ text run at (0,19) width 477: "Spelling markers should line up exactly under misspelled words in all cases."
+ RenderBlock (anonymous) at (0,54) size 784x19
+ RenderText {#text} at (0,0) size 31x19
+ text run at (0,0) width 31: "LTR"
+ RenderBlock (anonymous) at (0,95) size 784x19
+ RenderText {#text} at (0,0) size 31x19
+ text run at (0,0) width 31: "RTL"
+ RenderBlock (anonymous) at (0,136) size 784x19
+ RenderText {#text} at (0,0) size 184x19
+ text run at (0,0) width 184: "LTR (text-overflow:ellipses):"
+ RenderBlock (anonymous) at (0,177) size 784x19
+ RenderText {#text} at (0,0) size 184x19
+ text run at (0,0) width 184: "RTL (text-overflow:ellipses):"
+layer at (8,81) size 202x22 clip at (9,82) size 200x20 scrollWidth 221
+ RenderBlock {DIV} at (0,73) size 202x22 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 220x19
+ text run at (1,1) width 220: "the the adlj adaasj sdklj. there there"
+layer at (8,122) size 202x22 clip at (9,123) size 200x20 scrollX 20 scrollWidth 220
+ RenderBlock {DIV} at (0,114) size 202x22 [border: (1px solid #000000)]
+ RenderText {#text} at (-19,1) size 220x19
+ text run at (-19,1) width 220 RTL override: "the the adlj adaasj sdklj. there there"
+layer at (8,163) size 202x22 clip at (9,164) size 200x20 scrollWidth 221
+ RenderBlock {DIV} at (0,155) size 202x22 [border: (1px solid #000000)]
+ RenderText {#text} at (1,1) size 220x19
+ text run at (1,1) width 220: "the the adlj adaasj sdklj. there there"
+layer at (8,204) size 202x22 clip at (9,205) size 200x20 scrollX 20 scrollWidth 220
+ RenderBlock {DIV} at (0,196) size 202x22 [border: (1px solid #000000)]
+ RenderText {#text} at (-19,1) size 220x19
+ text run at (-19,1) width 220 RTL override: "the the adlj adaasj sdklj. there there"
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 1f548bb..073fd53 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,17 @@
+2010-12-09 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Add hasSpellingMarker support to the DRT
+ https://bugs.webkit.org/show_bug.cgi?id=50739
+
+ Added a new private API function to support the spelling marker
+ tests in the DRT.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
2010-12-10 Alejandro G. Castro <alex at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
index c0241f4..a751c77 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
@@ -515,3 +515,10 @@ unsigned int DumpRenderTreeSupportGtk::workerThreadCount()
return 0;
#endif
}
+
+bool DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker(WebKitWebFrame *frame, gint from, gint length)
+{
+ g_return_val_if_fail(WEBKIT_IS_WEB_FRAME(frame), FALSE);
+
+ return core(frame)->editor()->selectionStartHasSpellingMarkerFor(from, length);
+}
diff --git a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
index 4f2bcb2..61764ab 100644
--- a/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
+++ b/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
@@ -78,6 +78,7 @@ public:
static void whiteListAccessFromOrigin(const gchar* sourceOrigin, const gchar* destinationProtocol, const gchar* destinationHost, bool allowDestinationSubdomains);
static void resetOriginAccessWhiteLists();
static unsigned int workerThreadCount();
+ static bool webkitWebFrameSelectionHasSpellingMarker(WebKitWebFrame*, gint from, gint length);
private:
static bool s_drtRun;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 404ac4c..5ab92e4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-10 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Martin Robinson.
+
+ [GTK] Add hasSpellingMarker support to the DRT
+ https://bugs.webkit.org/show_bug.cgi?id=50739
+
+ Implemented the hasSpellingMarker to support spelling tests.
+
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::hasSpellingMarker):
+
2010-12-10 Eric Seidel <eric at webkit.org>
Reviewed by Ojan Vafai.
diff --git a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
index 402a865..487a02e 100644
--- a/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -816,10 +816,9 @@ void LayoutTestController::abortModal()
{
}
-bool LayoutTestController::hasSpellingMarker(int, int)
+bool LayoutTestController::hasSpellingMarker(int from, int length)
{
- // FIXME: Implement this.
- return false;
+ return DumpRenderTreeSupportGtk::webkitWebFrameSelectionHasSpellingMarker(mainFrame, from, length);
}
void LayoutTestController::dumpConfigurationForViewport(int availableWidth, int availableHeight)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list