Changeset 83530 in webkit
- Timestamp:
- Apr 11, 2011 4:23:13 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83528 r83530 1 2011-02-03 Martin Robinson <mrobinson@igalia.com> 2 3 Reviewed by Eric Seidel. 4 5 [GTK] The GTK+ DRT needs an implementation of the PlainTextController 6 https://bugs.webkit.org/show_bug.cgi?id=53605 7 8 * platform/gtk/Skipped: Unskipped test which is now passing. 9 1 10 2011-04-11 Stephen White <senorblanco@chromium.org> 2 11 -
trunk/LayoutTests/platform/gtk/Skipped
r83479 r83530 1306 1306 http/tests/security/local-user-CSS-from-remote.html 1307 1307 1308 # Need an implementation of PlainTextController1309 # https://bugs.webkit.org/show_bug.cgi?id=536051310 editing/text-iterator/basic-iteration.html1311 1312 1308 # LayoutTestController needs layoutTestController.displayInvalidatedRegion 1313 1309 # https://bugs.webkit.org/show_bug.cgi?id=54073 -
trunk/Source/WebKit/gtk/ChangeLog
r83493 r83530 1 2011-02-03 Martin Robinson <mrobinson@igalia.com> 2 3 Reviewed by Eric Seidel. 4 5 [GTK] The GTK+ DRT needs an implementation of the PlainTextController 6 https://bugs.webkit.org/show_bug.cgi?id=53605 7 8 Added jsValueToDOMRange to DumpRenderTreeSupportGtk. This static method can convert 9 a JSValueRef to a WebKitDOMRange. When it's possible to do this with the public 10 API, we can remove this method. 11 12 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 13 (DumpRenderTreeSupportGtk::jsValueToDOMRange): Added. 14 * WebCoreSupport/DumpRenderTreeSupportGtk.h: Added declaration. 15 1 16 2011-04-11 Mario Sanchez Prada <msanchez@igalia.com> 2 17 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r83333 r83530 43 43 #include "JSLock.h" 44 44 #include "JSNodeList.h" 45 #include "JSRange.h" 45 46 #include "JSValue.h" 46 47 #include "NodeList.h" … … 54 55 #include "Settings.h" 55 56 #include "TextIterator.h" 57 #include "WebKitDOMRangePrivate.h" 56 58 #include "WorkerThread.h" 57 59 #include "webkitglobalsprivate.h" … … 128 130 } 129 131 132 WebKitDOMRange* DumpRenderTreeSupportGtk::jsValueToDOMRange(JSContextRef context, JSValueRef value) 133 { 134 if (!value) 135 return 0; 136 137 JSLock lock(SilenceAssertionsOnly); 138 ExecState* exec = toJS(context); 139 140 Range* range = toRange(toJS(exec, value)); 141 if (!range) 142 return 0; 143 return kit(range); 144 } 145 130 146 /** 131 147 * getFrameChildren: -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
r83271 r83530 21 21 22 22 #include "JSStringRef.h" 23 #include <webkit/webkitdefines.h>24 25 23 #include <atk/atk.h> 26 24 #include <glib.h> 27 25 #include <webkit/webkitdefines.h> 28 #include <webkit/webkit webframe.h>26 #include <webkit/webkitdomdefines.h> 29 27 #include <wtf/text/CString.h> 30 28 … … 63 61 64 62 static JSValueRef shadowRoot(JSContextRef, JSValueRef); 63 static WebKitDOMRange* jsValueToDOMRange(JSContextRef, JSValueRef); 65 64 66 65 // FIXME: Move these to webkitwebframe.h once their API has been discussed. -
trunk/Tools/ChangeLog
r83504 r83530 1 2011-02-03 Martin Robinson <mrobinson@igalia.com> 2 3 Reviewed by Eric Seidel. 4 5 [GTK] The GTK+ DRT needs an implementation of the PlainTextController 6 https://bugs.webkit.org/show_bug.cgi?id=53605 7 8 Add an implementation of the PlainTextController for the GTK+ DRT. 9 10 * DumpRenderTree/gtk/DumpRenderTree.cpp: 11 (addControllerToWindow): Added this helper method. 12 (webViewWindowObjectCleared): Use the new helper to add EventSender 13 and the PlainTextController to the window object. 14 * GNUmakefile.am: Added PlainTextController source files. 15 * DumpRenderTree/gtk/PlainTextController.cpp: Added. This will rely 16 on DumpRenderTreeSupportGtk to convert a JSValueRef into a WebKitDOMRange 17 until that functionality exists somewhere in the WebKitGTK+ stack. 18 * DumpRenderTree/gtk/PlainTextController.h: Added. 19 1 20 2011-04-11 Yael Aharon <yael.aharon@nokia.com> 2 21 -
trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
r83077 r83530 40 40 #include "LayoutTestController.h" 41 41 #include "PixelDumpSupport.h" 42 #include "PlainTextController.h" 42 43 #include "TextInputController.h" 43 44 #include "WebCoreSupport/DumpRenderTreeSupportGtk.h" … … 815 816 } 816 817 818 static void addControllerToWindow(JSContextRef context, JSObjectRef windowObject, const char* controllerName, JSValueRef controller) 819 { 820 JSStringRef controllerNameStr = JSStringCreateWithUTF8CString(controllerName); 821 JSObjectSetProperty(context, windowObject, controllerNameStr, controller, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, 0); 822 JSStringRelease(controllerNameStr); 823 } 824 817 825 static void webViewWindowObjectCleared(WebKitWebView* view, WebKitWebFrame* frame, JSGlobalContextRef context, JSObjectRef windowObject, gpointer data) 818 826 { … … 829 837 ASSERT(!exception); 830 838 831 JSStringRef eventSenderStr = JSStringCreateWithUTF8CString("eventSender"); 832 JSValueRef eventSender = makeEventSender(context, !webkit_web_frame_get_parent(frame)); 833 JSObjectSetProperty(context, windowObject, eventSenderStr, eventSender, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, 0); 834 JSStringRelease(eventSenderStr); 835 836 JSStringRef textInputControllerStr = JSStringCreateWithUTF8CString("textInputController"); 837 JSValueRef textInputController = makeTextInputController(context); 838 JSObjectSetProperty(context, windowObject, textInputControllerStr, textInputController, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, 0); 839 JSStringRelease(textInputControllerStr); 839 addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame))); 840 addControllerToWindow(context, windowObject, "plainText", makePlainTextController(context)); 841 addControllerToWindow(context, windowObject, "textInputController", makeTextInputController(context)); 840 842 } 841 843 -
trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp
r77917 r83530 37 37 #include <JavaScriptCore/JSStringRef.h> 38 38 #include <cstring> 39 #include <webkit/webkit.h> 39 40 40 41 static JSValueRef setMarkedTextCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) -
trunk/Tools/GNUmakefile.am
r83300 r83530 85 85 Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \ 86 86 Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \ 87 Tools/DumpRenderTree/gtk/PlainTextController.cpp \ 88 Tools/DumpRenderTree/gtk/PlainTextController.h \ 87 89 Tools/DumpRenderTree/gtk/TextInputController.h \ 88 90 Tools/DumpRenderTree/gtk/TextInputController.cpp \
Note: See TracChangeset
for help on using the changeset viewer.