Changeset 110032 in webkit
- Timestamp:
- Mar 7, 2012 12:43:57 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r110031 r110032 1 2012-03-07 Kangil Han <kangil.han@samsung.com> 2 3 [DRT] Remove PlainTextController implementations. 4 https://bugs.webkit.org/show_bug.cgi?id=79959 5 6 Reviewed by Hajime Morita. 7 8 PlainTextController usages in existing tests have been 9 replaced by internals API by bug 78570. 10 So this patch will remove PlainTextController implementations 11 to avoid further usage in new tests. 12 13 * fast/dom/Window/script-tests/window-property-descriptors.js: 14 * fast/dom/Window/window-properties.html: 15 * fast/dom/script-tests/prototype-inheritance-2.js: 16 * fast/dom/script-tests/prototype-inheritance.js: 17 1 18 2012-03-07 Fumitoshi Ukai <ukai@chromium.org> 2 19 -
trunk/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
r105217 r110032 22 22 "objCPlugin" : 1, 23 23 "objCPluginFunction" : 1, 24 "plainText" : 1,25 24 "textInputController" : 1, 26 25 -
trunk/LayoutTests/fast/dom/Window/window-properties.html
r105217 r110032 63 63 "window.objCPlugin" : 1, 64 64 "window.objCPluginFunction" : 1, 65 "window.plainText" : 1,66 65 "window.textInputController" : 1, 67 66 -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
r108729 r110032 21 21 "objCPlugin", 22 22 "objCPluginFunction", 23 "plainText",24 23 "textInputController", 25 24 -
trunk/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
r104126 r110032 12 12 "objCController", "textInputController", "navigationController", 13 13 "eventSender", "objCPlugin", "objCPluginFunction", 14 "appleScriptController", " plainText", "accessibilityController",14 "appleScriptController", "accessibilityController", 15 15 "gamepadController", 16 16 "internals", -
trunk/Source/WebKit/gtk/ChangeLog
r110002 r110032 1 2012-03-07 Kangil Han <kangil.han@samsung.com> 2 3 [DRT] Remove PlainTextController implementations. 4 https://bugs.webkit.org/show_bug.cgi?id=79959 5 6 Reviewed by Hajime Morita. 7 8 PlainTextController usages in existing tests have been 9 replaced by internals API by bug 78570. 10 So this patch will remove PlainTextController implementations 11 to avoid further usage in new tests. 12 13 * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: 14 * WebCoreSupport/DumpRenderTreeSupportGtk.h: 15 (DumpRenderTreeSupportGtk): 16 1 17 2012-03-06 Martin Robinson <mrobinson@igalia.com> 2 18 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
r109753 r110032 47 47 #include "JSLock.h" 48 48 #include "JSNodeList.h" 49 #include "JSRange.h"50 49 #include "JSValue.h" 51 50 #include "NodeList.h" … … 61 60 #include "TextIterator.h" 62 61 #include "WebKitAccessibleWrapperAtk.h" 63 #include "WebKitDOMRangePrivate.h"64 62 #include "WebKitMutationObserver.h" 65 63 #include "WorkerThread.h" … … 130 128 RefPtr<NodeList> nodes = document->nodesFromRect(x, y, top, right, bottom, left, ignoreClipping); 131 129 return toRef(exec, toJS(exec, jsDocument->globalObject(), nodes.get())); 132 }133 134 WebKitDOMRange* DumpRenderTreeSupportGtk::jsValueToDOMRange(JSContextRef context, JSValueRef value)135 {136 if (!value)137 return 0;138 139 JSLock lock(SilenceAssertionsOnly);140 ExecState* exec = toJS(context);141 142 Range* range = toRange(toJS(exec, value));143 if (!range)144 return 0;145 return kit(range);146 130 } 147 131 -
trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
r109753 r110032 24 24 #include <glib.h> 25 25 #include <webkit/webkitdefines.h> 26 #include <webkit/webkitdomdefines.h>27 26 #include <wtf/text/CString.h> 28 27 … … 59 58 60 59 static void clearOpener(WebKitWebFrame*); 61 62 static WebKitDOMRange* jsValueToDOMRange(JSContextRef, JSValueRef);63 60 64 61 // FIXME: Move these to webkitwebframe.h once their API has been discussed. -
trunk/Source/WebKit/qt/ChangeLog
r109915 r110032 1 2012-03-07 Kangil Han <kangil.han@samsung.com> 2 3 [DRT] Remove PlainTextController implementations. 4 https://bugs.webkit.org/show_bug.cgi?id=79959 5 6 Reviewed by Hajime Morita. 7 8 PlainTextController usages in existing tests have been 9 replaced by internals API by bug 78570. 10 So this patch will remove PlainTextController implementations 11 to avoid further usage in new tests. 12 13 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 14 * WebCoreSupport/DumpRenderTreeSupportQt.h: 15 1 16 2012-03-06 Philippe Normand <pnormand@igalia.com> 2 17 -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r107811 r110032 993 993 } 994 994 995 QString DumpRenderTreeSupportQt::plainText(const QVariant& range)996 {997 QMap<QString, QVariant> map = range.toMap();998 QVariant startContainer = map.value(QLatin1String("startContainer"));999 map = startContainer.toMap();1000 1001 return map.value(QLatin1String("innerText")).toString();1002 }1003 1004 995 QVariantList DumpRenderTreeSupportQt::nodesFromRect(const QWebElement& document, int x, int y, unsigned top, unsigned right, unsigned bottom, unsigned left, bool ignoreClipping) 1005 996 { -
trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
r107682 r110032 168 168 static QString markerTextForListItem(const QWebElement& listItem); 169 169 static QVariantMap computedStyleIncludingVisitedInfo(const QWebElement& element); 170 static QString plainText(const QVariant& rng);171 170 172 171 static void dumpFrameLoader(bool b); -
trunk/Tools/ChangeLog
r110028 r110032 1 2012-03-07 Kangil Han <kangil.han@samsung.com> 2 3 [DRT] Remove PlainTextController implementations. 4 https://bugs.webkit.org/show_bug.cgi?id=79959 5 6 Reviewed by Hajime Morita. 7 8 PlainTextController usages in existing tests have been 9 replaced by internals API by bug 78570. 10 So this patch will remove PlainTextController implementations 11 to avoid further usage in new tests. 12 13 * DumpRenderTree/DumpRenderTree.gypi: 14 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: 15 * DumpRenderTree/chromium/PlainTextController.cpp: Removed. 16 * DumpRenderTree/chromium/PlainTextController.h: Removed. 17 * DumpRenderTree/chromium/TestShell.cpp: 18 (TestShell::TestShell): 19 (TestShell::bindJSObjectsToWindow): 20 * DumpRenderTree/chromium/TestShell.h: 21 (TestShell): 22 * DumpRenderTree/gtk/DumpRenderTree.cpp: 23 (webViewWindowObjectCleared): 24 * DumpRenderTree/gtk/PlainTextController.cpp: Removed. 25 * DumpRenderTree/gtk/PlainTextController.h: Removed. 26 * DumpRenderTree/mac/FrameLoadDelegate.mm: 27 (-[FrameLoadDelegate didClearWindowObjectInStandardWorldForFrame:]): 28 * DumpRenderTree/mac/PlainTextController.h: Removed. 29 * DumpRenderTree/mac/PlainTextController.mm: Removed. 30 * DumpRenderTree/qt/DumpRenderTree.pro: 31 * DumpRenderTree/qt/DumpRenderTreeQt.cpp: 32 (WebCore::DumpRenderTree::DumpRenderTree): 33 (WebCore::DumpRenderTree::initJSObjects): 34 * DumpRenderTree/qt/DumpRenderTreeQt.h: 35 (DumpRenderTree): 36 * DumpRenderTree/qt/PlainTextControllerQt.cpp: Removed. 37 * DumpRenderTree/qt/PlainTextControllerQt.h: Removed. 38 * GNUmakefile.am: 39 1 40 2012-03-06 Grzegorz Czajkowski <g.czajkowski@samsung.com> 2 41 -
trunk/Tools/DumpRenderTree/DumpRenderTree.gypi
r106353 r110032 27 27 'chromium/NotificationPresenter.h', 28 28 'chromium/NotificationPresenter.cpp', 29 'chromium/PlainTextController.cpp',30 'chromium/PlainTextController.h',31 29 'chromium/Task.h', 32 30 'chromium/Task.cpp', -
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r105325 r110032 81 81 80045AEE147718E7008290A8 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 80045AEC147718E7008290A8 /* AccessibilityNotificationHandler.mm */; }; 82 82 8465E2C70FFA8DF2003B8342 /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */; }; 83 933BF5AB0F93FA5C000F0441 /* PlainTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 933BF5A90F93FA5C000F0441 /* PlainTextController.h */; };84 933BF5AC0F93FA5C000F0441 /* PlainTextController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */; };85 83 9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; }; 86 84 9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; }; … … 265 263 8465E2C60FFA8DF2003B8342 /* PixelDumpSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PixelDumpSupport.cpp; sourceTree = "<group>"; }; 266 264 9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 267 933BF5A90F93FA5C000F0441 /* PlainTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlainTextController.h; path = mac/PlainTextController.h; sourceTree = "<group>"; };268 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = PlainTextController.mm; path = mac/PlainTextController.mm; sourceTree = "<group>"; };269 265 9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; }; 270 266 A803FF7409CAAD08009B2A37 /* DumpRenderTree.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = DumpRenderTree.h; sourceTree = "<group>"; }; … … 470 466 BCA18B2F0C9B01B400114369 /* ObjCController.h */, 471 467 BCA18B300C9B01B400114369 /* ObjCController.m */, 472 933BF5A90F93FA5C000F0441 /* PlainTextController.h */,473 933BF5AA0F93FA5C000F0441 /* PlainTextController.mm */,474 468 BCA18B3A0C9B024900114369 /* TextInputController.h */, 475 469 BCA18B480C9B02C400114369 /* TextInputController.m */, … … 673 667 BCB284C70CFA83C4007E533E /* PixelDumpSupport.h in Headers */, 674 668 BCB284D00CFA83CC007E533E /* PixelDumpSupportCG.h in Headers */, 675 933BF5AB0F93FA5C000F0441 /* PlainTextController.h in Headers */,676 669 BCA18B650C9B08C200114369 /* PolicyDelegate.h in Headers */, 677 670 BCA18B670C9B08C200114369 /* ResourceLoadDelegate.h in Headers */, … … 873 866 BCB284CD0CFA83C8007E533E /* PixelDumpSupportCG.cpp in Sources */, 874 867 BCB284D60CFA83D1007E533E /* PixelDumpSupportMac.mm in Sources */, 875 933BF5AC0F93FA5C000F0441 /* PlainTextController.mm in Sources */,876 868 BCA18B660C9B08C200114369 /* PolicyDelegate.mm in Sources */, 877 869 BCA18B680C9B08C200114369 /* ResourceLoadDelegate.mm in Sources */, -
trunk/Tools/DumpRenderTree/chromium/TestShell.cpp
r109938 r110032 138 138 m_layoutTestController = adoptPtr(new LayoutTestController(this)); 139 139 m_eventSender = adoptPtr(new EventSender(this)); 140 m_plainTextController = adoptPtr(new PlainTextController());141 140 m_textInputController = adoptPtr(new TextInputController(this)); 142 141 #if ENABLE(NOTIFICATIONS) … … 699 698 m_layoutTestController->bindToJavascript(frame, WebString::fromUTF8("layoutTestController")); 700 699 m_eventSender->bindToJavascript(frame, WebString::fromUTF8("eventSender")); 701 m_plainTextController->bindToJavascript(frame, WebString::fromUTF8("plainText"));702 700 m_textInputController->bindToJavascript(frame, WebString::fromUTF8("textInputController")); 703 701 } -
trunk/Tools/DumpRenderTree/chromium/TestShell.h
r108225 r110032 37 37 #include "LayoutTestController.h" 38 38 #include "NotificationPresenter.h" 39 #include "PlainTextController.h"40 39 #include "TestEventPrinter.h" 41 40 #include "TextInputController.h" … … 216 215 OwnPtr<EventSender> m_eventSender; 217 216 OwnPtr<LayoutTestController> m_layoutTestController; 218 OwnPtr<PlainTextController> m_plainTextController;219 217 OwnPtr<TextInputController> m_textInputController; 220 218 OwnPtr<NotificationPresenter> m_notificationPresenter; -
trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
r109719 r110032 40 40 #include "LayoutTestController.h" 41 41 #include "PixelDumpSupport.h" 42 #include "PlainTextController.h"43 42 #include "SelfScrollingWebKitWebView.h" 44 43 #include "TextInputController.h" … … 836 835 837 836 addControllerToWindow(context, windowObject, "eventSender", makeEventSender(context, !webkit_web_frame_get_parent(frame))); 838 addControllerToWindow(context, windowObject, "plainText", makePlainTextController(context));839 837 addControllerToWindow(context, windowObject, "textInputController", makeTextInputController(context)); 840 838 WebCoreTestSupport::injectInternalsObject(context); -
trunk/Tools/DumpRenderTree/mac/FrameLoadDelegate.mm
r99762 r110032 41 41 #import "ObjCPlugin.h" 42 42 #import "ObjCPluginFunction.h" 43 #import "PlainTextController.h"44 43 #import "TextInputController.h" 45 44 #import "WebCoreTestSupport.h" … … 299 298 [pluginFunction release]; 300 299 301 [obj setValue:[PlainTextController sharedPlainTextController] forKey:@"plainText"];302 303 300 TextInputController *tic = [[TextInputController alloc] initWithWebView:webView]; 304 301 [obj setValue:tic forKey:@"textInputController"]; -
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
r109909 r110032 34 34 LayoutTestControllerQt.h \ 35 35 GCControllerQt.h \ 36 PlainTextControllerQt.h \37 36 QtInitializeTestFonts.h \ 38 37 testplugin.h … … 44 43 EventSenderQt.cpp \ 45 44 TextInputControllerQt.cpp \ 46 PlainTextControllerQt.cpp \47 45 WorkQueueItemQt.cpp \ 48 46 LayoutTestControllerQt.cpp \ -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r107171 r110032 38 38 #include "LayoutTestControllerQt.h" 39 39 #include "TextInputControllerQt.h" 40 #include "PlainTextControllerQt.h"41 40 #include "QtInitializeTestFonts.h" 42 41 #include "testplugin.h" … … 441 440 m_eventSender = new EventSender(m_page); 442 441 m_textInputController = new TextInputController(m_page); 443 m_plainTextController = new PlainTextController(m_page);444 442 m_gcController = new GCController(m_page); 445 443 … … 752 750 frame->addToJavaScriptWindowObject(QLatin1String("textInputController"), m_textInputController); 753 751 frame->addToJavaScriptWindowObject(QLatin1String("GCController"), m_gcController); 754 frame->addToJavaScriptWindowObject(QLatin1String("plainText"), m_plainTextController);755 752 DumpRenderTreeSupportQt::injectInternalsObject(frame); 756 753 } -
trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
r107171 r110032 61 61 class TextInputController; 62 62 class GCController; 63 class PlainTextController;64 63 65 64 namespace WebCore { … … 154 153 TextInputController *m_textInputController; 155 154 GCController* m_gcController; 156 PlainTextController* m_plainTextController;157 155 NetworkAccessManager* m_networkAccessManager; 158 156 -
trunk/Tools/GNUmakefile.am
r108985 r110032 136 136 Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp \ 137 137 Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp \ 138 Tools/DumpRenderTree/gtk/PlainTextController.cpp \139 Tools/DumpRenderTree/gtk/PlainTextController.h \140 138 Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.cpp \ 141 139 Tools/DumpRenderTree/gtk/SelfScrollingWebKitWebView.h \
Note: See TracChangeset
for help on using the changeset viewer.