Changeset 84221 in webkit
- Timestamp:
- Apr 18, 2011 8:49:34 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 78 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r84218 r84221 1 2011-04-18 Zan Dobersek <zandobersek@gmail.com> 2 3 Reviewed by Martin Robinson. 4 5 Update pixel results for tests that draw the selection rectangle. 6 7 * platform/gtk/editing/selection/4402375-expected.checksum: 8 * platform/gtk/editing/selection/4402375-expected.png: 9 * platform/gtk/editing/selection/image-before-linebreak-expected.checksum: 10 * platform/gtk/editing/selection/image-before-linebreak-expected.png: 11 * platform/gtk/editing/selection/replaced-boundaries-1-expected.checksum: 12 * platform/gtk/editing/selection/replaced-boundaries-1-expected.png: 13 * platform/gtk/editing/selection/replaced-boundaries-2-expected.checksum: 14 * platform/gtk/editing/selection/replaced-boundaries-2-expected.png: 15 * platform/gtk/editing/selection/replaced-boundaries-3-expected.checksum: 16 * platform/gtk/editing/selection/replaced-boundaries-3-expected.png: 17 * platform/gtk/editing/selection/transformed-selection-rects-expected.checksum: 18 * platform/gtk/editing/selection/transformed-selection-rects-expected.png: 19 * platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.checksum: 20 * platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.png: 21 * platform/gtk/svg/text/selection-doubleclick-expected.checksum: 22 * platform/gtk/svg/text/selection-doubleclick-expected.png: 23 * platform/gtk/svg/text/selection-tripleclick-expected.checksum: 24 * platform/gtk/svg/text/selection-tripleclick-expected.png: 25 * platform/gtk/svg/text/text-align-01-b-expected.checksum: 26 * platform/gtk/svg/text/text-align-01-b-expected.png: 27 * platform/gtk/svg/text/text-align-02-b-expected.checksum: 28 * platform/gtk/svg/text/text-align-02-b-expected.png: 29 * platform/gtk/svg/text/text-align-03-b-expected.checksum: 30 * platform/gtk/svg/text/text-align-03-b-expected.png: 31 * platform/gtk/svg/text/text-align-04-b-expected.checksum: 32 * platform/gtk/svg/text/text-align-04-b-expected.png: 33 * platform/gtk/svg/text/text-align-05-b-expected.checksum: 34 * platform/gtk/svg/text/text-align-05-b-expected.png: 35 * platform/gtk/svg/text/text-align-06-b-expected.checksum: 36 * platform/gtk/svg/text/text-align-06-b-expected.png: 37 * platform/gtk/svg/text/text-altglyph-01-b-expected.checksum: 38 * platform/gtk/svg/text/text-altglyph-01-b-expected.png: 39 * platform/gtk/svg/text/text-deco-01-b-expected.checksum: 40 * platform/gtk/svg/text/text-deco-01-b-expected.png: 41 * platform/gtk/svg/text/text-fonts-01-t-expected.checksum: 42 * platform/gtk/svg/text/text-fonts-01-t-expected.png: 43 * platform/gtk/svg/text/text-fonts-02-t-expected.checksum: 44 * platform/gtk/svg/text/text-fonts-02-t-expected.png: 45 * platform/gtk/svg/text/text-intro-05-t-expected.checksum: 46 * platform/gtk/svg/text/text-intro-05-t-expected.png: 47 * platform/gtk/svg/text/text-path-01-b-expected.checksum: 48 * platform/gtk/svg/text/text-path-01-b-expected.png: 49 * platform/gtk/svg/text/text-spacing-01-b-expected.checksum: 50 * platform/gtk/svg/text/text-spacing-01-b-expected.png: 51 * platform/gtk/svg/text/text-text-01-b-expected.checksum: 52 * platform/gtk/svg/text/text-text-01-b-expected.png: 53 * platform/gtk/svg/text/text-text-03-b-expected.checksum: 54 * platform/gtk/svg/text/text-text-03-b-expected.png: 55 * platform/gtk/svg/text/text-text-04-t-expected.checksum: 56 * platform/gtk/svg/text/text-text-04-t-expected.png: 57 * platform/gtk/svg/text/text-text-05-t-expected.checksum: 58 * platform/gtk/svg/text/text-text-05-t-expected.png: 59 * platform/gtk/svg/text/text-text-06-t-expected.checksum: 60 * platform/gtk/svg/text/text-text-06-t-expected.png: 61 * platform/gtk/svg/text/text-text-07-t-expected.checksum: 62 * platform/gtk/svg/text/text-text-07-t-expected.png: 63 * platform/gtk/svg/text/text-text-08-b-expected.checksum: 64 * platform/gtk/svg/text/text-text-08-b-expected.png: 65 * platform/gtk/svg/text/text-tref-01-b-expected.checksum: 66 * platform/gtk/svg/text/text-tref-01-b-expected.png: 67 * platform/gtk/svg/text/text-tselect-01-b-expected.checksum: 68 * platform/gtk/svg/text/text-tselect-01-b-expected.png: 69 * platform/gtk/svg/text/text-tselect-02-f-expected.checksum: 70 * platform/gtk/svg/text/text-tselect-02-f-expected.png: 71 * platform/gtk/svg/text/text-tspan-01-b-expected.checksum: 72 * platform/gtk/svg/text/text-tspan-01-b-expected.png: 73 * platform/gtk/svg/text/text-ws-01-t-expected.checksum: 74 * platform/gtk/svg/text/text-ws-01-t-expected.png: 75 * platform/gtk/svg/text/text-ws-02-t-expected.checksum: 76 * platform/gtk/svg/text/text-ws-02-t-expected.png: 77 * platform/gtk/svg/text/textPathBoundsBug-expected.checksum: 78 * platform/gtk/svg/text/textPathBoundsBug-expected.png: 79 1 80 2011-04-18 Mike Reed <reed@google.com> 2 81 -
trunk/LayoutTests/platform/gtk/editing/selection/4402375-expected.checksum
r77450 r84221 1 fec3644bea7c8228a75428adbcec52bd 1 364bdb0424ed7d5c6796a35227a6f387 -
trunk/LayoutTests/platform/gtk/editing/selection/image-before-linebreak-expected.checksum
r77450 r84221 1 c764771a732d878ae2b8c011adf8c953 1 ff71e4614b7a46e9de9aa5be527b0898 -
trunk/LayoutTests/platform/gtk/editing/selection/replaced-boundaries-1-expected.checksum
r77453 r84221 1 e195d5ed6adaa1d8ec4197c1781e85c7 1 af831a414283e8a15fa8931941af6eac -
trunk/LayoutTests/platform/gtk/editing/selection/replaced-boundaries-2-expected.checksum
r77453 r84221 1 989de4f0ce416f7bb512fa39ae1d4f96 1 68ee83f6304cbcc91d0e8e947612c880 -
trunk/LayoutTests/platform/gtk/editing/selection/replaced-boundaries-3-expected.checksum
r82033 r84221 1 5b9a1cbd159214ab57782620cff42458 1 350f35a81c19bc891557168dcbd4bb46 -
trunk/LayoutTests/platform/gtk/editing/selection/transformed-selection-rects-expected.checksum
r77453 r84221 1 abe9dfb5853dc6b9d83640e0cbbf5b51 1 13ab3aca9fd431c82ab10104f3c20bf5 -
trunk/LayoutTests/platform/gtk/svg/text/foreignObject-text-clipping-bug-expected.checksum
r79736 r84221 1 53d3d300da6078b9a73bbf19f2d5ce46 1 1174a494428cb1375857a5cbecaddd13 -
trunk/LayoutTests/platform/gtk/svg/text/selection-doubleclick-expected.checksum
r79736 r84221 1 31a7e607d8957cb42407a8f140154dcb 1 f50429f174efcf8e7feee30a48a16026 -
trunk/LayoutTests/platform/gtk/svg/text/selection-tripleclick-expected.checksum
r79736 r84221 1 0aa7f8ebaccf84b9edb7277b75a4f3bd 1 9e8db0fe8eac9c7638eaffe8711db290 -
trunk/LayoutTests/platform/gtk/svg/text/text-align-01-b-expected.checksum
r78595 r84221 1 11d16437959790be3edd288925b6ca1d 1 05d6380d6c151168439c0cacb1d4fbcc -
trunk/LayoutTests/platform/gtk/svg/text/text-align-02-b-expected.checksum
r79735 r84221 1 d20efd61315ce6041488124f33fc413e 1 aac71e2cfee7ed979ed97af1e9668310 -
trunk/LayoutTests/platform/gtk/svg/text/text-align-03-b-expected.checksum
r79735 r84221 1 f8db948581c03c6617fca1122b348dcb 1 d603b96b4171f818a9ca86294a6bec7c -
trunk/LayoutTests/platform/gtk/svg/text/text-align-04-b-expected.checksum
r78595 r84221 1 ddd2f232902cff07d80bce05160331e6 1 ad755d7c06f9f91ccc9b34be75c1958e -
trunk/LayoutTests/platform/gtk/svg/text/text-align-05-b-expected.checksum
r78595 r84221 1 1ad5aa0dfdfc56465cd8c299c003bb1e 1 b703b2127e7933ade296c7d5c668b78f -
trunk/LayoutTests/platform/gtk/svg/text/text-align-06-b-expected.checksum
r79735 r84221 1 d527b93c0617779e5db07f0f9a5f1aa7 1 c74570748722e469e7d755b1aeeba0bd -
trunk/LayoutTests/platform/gtk/svg/text/text-altglyph-01-b-expected.checksum
r78595 r84221 1 4d937751477d0aa9fa0cb3a50a1747af 1 c0de312b47e815068968644cc108b4d2 -
trunk/LayoutTests/platform/gtk/svg/text/text-deco-01-b-expected.checksum
r78595 r84221 1 0 7296df9f611fb9ed3999af7bc0c0b641 055b93ac98ba31b0e558eb963cbd3a95 -
trunk/LayoutTests/platform/gtk/svg/text/text-fonts-01-t-expected.checksum
r78595 r84221 1 f59fe52577774d8fa9453348f4d21742 1 69ca2811c56879cac802b1cdd97a6c73 -
trunk/LayoutTests/platform/gtk/svg/text/text-fonts-02-t-expected.checksum
r78614 r84221 1 f526af192e059c1756e6579e90c1f4b0 1 9a25695ef7f8adee0220bdc6e9da759c -
trunk/LayoutTests/platform/gtk/svg/text/text-intro-05-t-expected.checksum
r82353 r84221 1 d03180be49ea5f857155154a03f8034e 1 6f62bd9218a3311fac4d9022663dd2ac -
trunk/LayoutTests/platform/gtk/svg/text/text-path-01-b-expected.checksum
r78595 r84221 1 47ca64b78030c9c84fb539c55e033946 1 97a90b748a6cd1f5c2a93f102c39a0da -
trunk/LayoutTests/platform/gtk/svg/text/text-spacing-01-b-expected.checksum
r78595 r84221 1 ca5bc4c7c006ceaa77878b2ddc73ebe7 1 44068619f71f23a25b3a6fb7d6bfd71b -
trunk/LayoutTests/platform/gtk/svg/text/text-text-01-b-expected.checksum
r78595 r84221 1 910bac2e4c6d9e685485a24d15d7faf1 1 fbee189cbe9f970a6848236bdb46aabd -
trunk/LayoutTests/platform/gtk/svg/text/text-text-03-b-expected.checksum
r78595 r84221 1 f06b9a95e4c4ee2d6b5ce9829ca3321a 1 023b1a5749c9dbc40da27e2ed2c57f59 -
trunk/LayoutTests/platform/gtk/svg/text/text-text-04-t-expected.checksum
r78595 r84221 1 da1ae832abc1326b5ecb5dc861d86fb11 2a094caccef04ec8f6d3c3dae39df3d1 -
trunk/LayoutTests/platform/gtk/svg/text/text-text-05-t-expected.checksum
r78595 r84221 1 0e4a805b215f9076aa73c73171926ae3 1 f01ddb2db8a3dc549377774000bd4a76 -
trunk/LayoutTests/platform/gtk/svg/text/text-text-06-t-expected.checksum
r78595 r84221 1 fcb873d98c69521269c55c275f606880 1 3de34267b329f545a0af6dc58a1f1fa6 -
trunk/LayoutTests/platform/gtk/svg/text/text-text-07-t-expected.checksum
r78595 r84221 1 7df9e341e9e145f208b4e8f2f72a3b5a 1 482affdde73e6badd7e4371c5dc0578b -
trunk/LayoutTests/platform/gtk/svg/text/text-text-08-b-expected.checksum
r78595 r84221 1 2d61265fff97f452c5c25d93919d6daf 1 64e2a232092717013028fe2f6736fb60 -
trunk/LayoutTests/platform/gtk/svg/text/text-tref-01-b-expected.checksum
r78595 r84221 1 5c8ef589026d717fe74a50fba935db97 1 2941ea9100737ce948693e0fb003ab46 -
trunk/LayoutTests/platform/gtk/svg/text/text-tselect-01-b-expected.checksum
r78595 r84221 1 f1e691615efd0917ebb331ce7c04afa7 1 6e1af4b39fbc8abf0780583b52af071f -
trunk/LayoutTests/platform/gtk/svg/text/text-tselect-02-f-expected.checksum
r78595 r84221 1 73b0d08b6e726a53a20a73ef7d809e29 1 ddccb6ff4c2211914c683c99efb5d43c -
trunk/LayoutTests/platform/gtk/svg/text/text-tspan-01-b-expected.checksum
r78595 r84221 1 7bac566fd4118450d16c6a9e4ebc6a9f 1 9e03fa1a819e9308e4878efcc9b55ac7 -
trunk/LayoutTests/platform/gtk/svg/text/text-ws-01-t-expected.checksum
r78595 r84221 1 ba7233db59be21fa70bc981e51ac3b2f 1 0ed24139216e03e2e6b41079a8de8d3c -
trunk/LayoutTests/platform/gtk/svg/text/text-ws-02-t-expected.checksum
r78595 r84221 1 a1af63cf8546e25d06fe09e0b8522bcb 1 265132ab2b6daae5185e6f92a04c6c9e -
trunk/LayoutTests/platform/gtk/svg/text/textPathBoundsBug-expected.checksum
r78595 r84221 1 2a7bcdf71dc81e12afc67d888c952f3d 1 ca09d1f686e413c3653bcbec63f7d9eb -
trunk/Source/WebKit/gtk/ChangeLog
r83675 r84221 1 2011-04-18 Zan Dobersek <zandobersek@gmail.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Need support for dumping focus rectangles in pixel results 6 https://bugs.webkit.org/show_bug.cgi?id=53647 7 8 Add a support function that returns the rectangle of the current 9 selection in frame. 10 11 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 12 (DumpRenderTreeSupportGtk::rectangleForSelection): 13 * WebCoreSupport/DumpRenderTreeSupportGtk.h: 14 1 15 2011-04-12 Xan Lopez <xlopez@igalia.com> 2 16 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r83530 r84221 749 749 inputElement->setValueForUser(String::fromUTF8(valueBuffer.get())); 750 750 } 751 752 void DumpRenderTreeSupportGtk::rectangleForSelection(WebKitWebFrame* frame, GdkRectangle* rectangle) 753 { 754 Frame* coreFrame = core(frame); 755 if (!coreFrame) 756 return; 757 758 IntRect bounds = enclosingIntRect(coreFrame->selection()->bounds()); 759 rectangle->x = bounds.x(); 760 rectangle->y = bounds.y(); 761 rectangle->width = bounds.width(); 762 rectangle->height = bounds.height(); 763 } -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
r83530 r84221 99 99 static double defaultMinimumTimerInterval(); // Not really tied to WebView 100 100 static void setMinimumTimerInterval(WebKitWebView*, double); 101 static void rectangleForSelection(WebKitWebFrame*, GdkRectangle*); 101 102 102 103 // Accessibility -
trunk/Tools/ChangeLog
r84216 r84221 1 2011-04-18 Zan Dobersek <zandobersek@gmail.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Need support for dumping focus rectangles in pixel results 6 https://bugs.webkit.org/show_bug.cgi?id=53647 7 8 Dump the selection rect if it has been requested. 9 10 * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp: 11 (createBitmapContextFromWebView): 12 1 13 2011-04-18 Eric Seidel <eric@webkit.org> 2 14 -
trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp
r76749 r84221 33 33 #include "GtkVersioning.h" 34 34 #include "PixelDumpSupportCairo.h" 35 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h" 35 36 #include <webkit/webkit.h> 36 37 37 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool )38 PassRefPtr<BitmapContext> createBitmapContextFromWebView(bool, bool, bool, bool drawSelectionRect) 38 39 { 39 40 WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame); … … 50 51 cairo_surface_t* imageSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); 51 52 cairo_t* context = cairo_create(imageSurface); 53 52 54 #ifdef GTK_API_VERSION_2 53 55 gdk_cairo_set_source_pixmap(context, pixmap, 0, 0); … … 58 60 #endif 59 61 62 if (drawSelectionRect) { 63 GdkRectangle rectangle; 64 DumpRenderTreeSupportGtk::rectangleForSelection(mainFrame, &rectangle); 65 66 cairo_set_line_width(context, 1.0); 67 cairo_rectangle(context, rectangle.x, rectangle.y, rectangle.width, rectangle.height); 68 cairo_set_source_rgba(context, 1.0, 0.0, 0.0, 1.0); 69 cairo_stroke(context); 70 } 71 60 72 return BitmapContext::createByAdoptingBitmapAndContext(0, context); 61 73 }
Note: See TracChangeset
for help on using the changeset viewer.