[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 11:50:22 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 36d49d8b21023c498097db99345c607b5daec536
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 9 15:55:36 2010 +0000
Stub out EventSender for WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=43703
WebKitTools:
Reviewed by Anders Carlsson.
* WebKitTestRunner/DerivedSources.make:
* WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
Add ability to pass javascript arguments to the wrapped object.
* WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl: Added.
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp: Added.
(WTR::EventSendingController::create):
(WTR::EventSendingController::EventSendingController):
(WTR::EventSendingController::~EventSendingController):
(WTR::EventSendingController::wrapperClass):
(WTR::setExceptionForString):
(WTR::EventSendingController::mouseDown):
(WTR::EventSendingController::mouseUp):
(WTR::EventSendingController::mouseMoveTo):
(WTR::EventSendingController::keyDown):
(WTR::EventSendingController::contextClick):
(WTR::EventSendingController::leapForward):
(WTR::EventSendingController::textZoomIn):
(WTR::EventSendingController::textZoomOut):
(WTR::EventSendingController::zoomPageIn):
(WTR::EventSendingController::zoomPageOut):
(WTR::EventSendingController::makeWindowObject):
* WebKitTestRunner/InjectedBundle/EventSendingController.h: Added.
* WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
(WTR::InjectedBundle::reset):
* WebKitTestRunner/InjectedBundle/InjectedBundle.h:
(WTR::InjectedBundle::eventSendingController):
* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::didClearWindowForFrame):
Add stubbed out EventSenderController.
* WebKitTestRunner/InjectedBundle/GCController.h:
Remove incorrect comment.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
* WebKitTestRunner/win/InjectedBundle.vcproj:
Add new files.
LayoutTests:
Reviewed by Anders Carlsson
* platform/mac-wk2/Skipped: Update.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64985 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6a060f1..42626d0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-09 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson
+
+ Stub out EventSender for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=43703
+
+ * platform/mac-wk2/Skipped: Update.
+
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index a84a6ec..7c1c412 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -118,33 +118,11 @@ editing/style/style-boundary-005.html
# WebKitTestRunner needs an implementation of eventSender
# <https://bugs.webkit.org/show_bug.cgi?id=42194>
-fast/selectors/unqualified-hover-strict.html
-fast/replaced/image-map-2.html
-fast/forms/focus-selection-input.html
-fast/forms/focus-selection-textarea.html
-fast/events/5056619.html
-fast/events/dragging-mouse-moves.html
-fast/events/selectstart-during-autoscroll.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-limitingConeAngle-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtX-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtY-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtZ-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-specularExponent-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-x-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-y-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-dom-z-attr.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-limitingConeAngle-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtX-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtY-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtZ-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-specularExponent-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-x-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-y-prop.html
-svg/dynamic-updates/SVGFESpotLightElement-svgdom-z-prop.html
compositing/iframes/layout-on-compositing-change.html
editing/deleting/5390681-2.html
editing/deleting/5729680.html
editing/deleting/forward-delete-key.html
+editing/deleting/skip-virama-001.html
editing/deleting/smart-delete-001.html
editing/deleting/smart-delete-002.html
editing/deleting/smart-delete-003.html
@@ -166,6 +144,7 @@ editing/pasteboard/drag-drop-url-text.html
editing/pasteboard/drag-image-in-about-blank-frame.html
editing/pasteboard/drag-image-to-contenteditable-in-iframe.html
editing/pasteboard/drop-inputtext-acquires-style.html
+editing/pasteboard/emacs-cntl-y-001.html
editing/pasteboard/file-input-files-access.html
editing/pasteboard/files-during-page-drags.html
editing/pasteboard/get-data-text-plain-drop.html
@@ -205,6 +184,7 @@ editing/selection/click-outside-editable-div.html
editing/selection/click-start-of-line.html
editing/selection/contains-boundaries.html
editing/selection/crash-on-drag-with-mutation-events.html
+editing/selection/delete-word-granularity-text-control.html
editing/selection/doubleclick-beside-cr-span.html
editing/selection/doubleclick-crash.html
editing/selection/doubleclick-whitespace-crash.html
@@ -235,10 +215,12 @@ editing/selection/select-all-iframe.html
editing/selection/select-from-textfield-outwards.html
editing/selection/selection-actions.html
editing/selection/shift-click.html
+editing/selection/shrink-selection-after-shift-pagedown.html
editing/selection/triple-click-in-pre.html
editing/selection/user-drag-element-and-user-select-none.html
editing/selection/word-granularity.html
editing/spelling/context-menu-suggestions.html
+editing/undo/undo-deleteWord.html
editing/undo/undo-smart-delete-reversed-selection.html
editing/undo/undo-smart-delete-word.html
fast/block/float/float-in-float-hit-testing.html
@@ -247,6 +229,7 @@ fast/css-generated-content/hover-style-change.html
fast/css-generated-content/positioned-background-hit-test-crash.html
fast/css-generated-content/spellingToolTip-assert.html
fast/css/affected-by-hover-after-style-change.html
+fast/css/first-letter-first-line-hover.html
fast/css/first-letter-hover.html
fast/css/hover-affects-child.html
fast/css/hover-subselector.html
@@ -272,6 +255,7 @@ fast/dom/Window/window-xy-properties.html
fast/dynamic/hover-style-recalc-crash.html
fast/dynamic/hovered-detach.html
fast/dynamic/layer-hit-test-crash.html
+fast/events/5056619.html
fast/events/access-key-self-destruct.html
fast/events/anchor-empty-focus.html
fast/events/anchor-image-scrolled-x-y.html
@@ -297,10 +281,12 @@ fast/events/dblclick-addEventListener.html
fast/events/drag-and-drop-dataTransfer-types-nocrash.html
fast/events/drag-and-drop-fire-drag-dragover.html
fast/events/drag-and-drop.html
+fast/events/drag-file-crash.html
fast/events/drag-in-frames.html
fast/events/drag-outside-window.html
fast/events/drag-parent-node.html
fast/events/drag-to-navigate.html
+fast/events/dragging-mouse-moves.html
fast/events/event-input-contentEditable.html
fast/events/event-sender-mouse-moved.html
fast/events/event-view-toString.html
@@ -326,12 +312,14 @@ fast/events/mouse-drag-from-frame-to-other-frame.html
fast/events/mouse-drag-from-frame.html
fast/events/mouseclick-target-and-positioning.html
fast/events/mousedown-in-subframe-scrollbar.html
+fast/events/mousedown_in_scrollbar.html
fast/events/mousemove-after-drag-over-scrollbar.html
fast/events/mouseout-dead-node.html
fast/events/mouseout-dead-subframe.html
fast/events/mouseover-mouseout.html
fast/events/mouseover-mouseout2.html
fast/events/mouseup-from-button2.html
+fast/events/mouseup-outside-button.html
fast/events/mouseup-outside-document.html
fast/events/multiline-link-arrow-navigation.html
fast/events/node-event-anchor-lock.html
@@ -358,12 +346,14 @@ fast/events/right-click-focus.html
fast/events/scroll-to-anchor-in-overflow-hidden.html
fast/events/scrollbar-double-click.html
fast/events/select-onchange-crash.html
+fast/events/selectstart-during-autoscroll.html
fast/events/shadow-boundary-crossing.html
fast/events/space-scroll-event.html
fast/events/special-key-events-in-input-text.html
fast/events/standalone-image-drag-to-editable.html
fast/events/tab-focus-hidden.html
fast/events/tab-imagemap.html
+fast/events/tab-is-focusable-assert.html
fast/events/tabindex-focus-chain.html
fast/events/updateLayoutForHitTest.html
fast/events/window-events-bubble.html
@@ -381,11 +371,14 @@ fast/forms/drag-out-of-textarea.html
fast/forms/empty-textarea-toggle-disabled.html
fast/forms/enter-clicks-buttons.html
fast/forms/focus-control-to-page.html
+fast/forms/focus-selection-input.html
+fast/forms/focus-selection-textarea.html
fast/forms/get-file-upload.html
fast/forms/implicit-submission.html
fast/forms/input-appearance-preventDefault.html
fast/forms/input-file-re-render.html
fast/forms/input-live-pseudo-selectors.html
+fast/forms/input-number-crash.html
fast/forms/input-number-events.html
fast/forms/input-number-keyoperation.html
fast/forms/input-radio-checked-tab.html
@@ -395,6 +388,7 @@ fast/forms/input-text-click-inside.html
fast/forms/input-text-click-outside.html
fast/forms/input-text-double-click.html
fast/forms/input-text-drag-down.html
+fast/forms/input-text-enter.html
fast/forms/input-text-option-delete.html
fast/forms/input-text-scroll-left-on-blur.html
fast/forms/input-text-self-emptying-click.html
@@ -413,9 +407,9 @@ fast/forms/onselect-textarea.html
fast/forms/onselect-textfield.html
fast/forms/option-mouseevents.html
fast/forms/password-doubleclick-selection.html
-fast/forms/radio_checked_name.html
fast/forms/radio-check-click-and-drag.html
fast/forms/radio-nested-labels.html
+fast/forms/radio_checked_name.html
fast/forms/restore-selection-after-layout.html
fast/forms/search-abs-pos-cancel-button.html
fast/forms/search-cancel-button-events.html
@@ -461,6 +455,7 @@ fast/images/drag-svg-as-image.html
fast/images/image-map-zoom.html
fast/images/imagemap-case.html
fast/inline-block/14498-positionForCoordinates.html
+fast/inline/dirtyLinesForInline.html
fast/inline/relative-positioned-overflow.html
fast/layers/resize-layer-deletion-crash.html
fast/lists/drag-into-marker.html
@@ -468,13 +463,17 @@ fast/loader/document-with-fragment-url-1.html
fast/loader/document-with-fragment-url-2.html
fast/loader/document-with-fragment-url-3.html
fast/loader/document-with-fragment-url-4.html
+fast/loader/early-load-cancel.html
fast/loader/policy-delegate-action-hit-test-zoomed.html
fast/loader/repeat-same-document-navigation.html
fast/overflow/hit-test-overflow-controls.html
fast/overflow/overflow-text-hit-testing.html
fast/parser/tabindex-parsing.html
+fast/replaced/image-map-2.html
fast/replaced/image-map-bug16782.html
fast/replaced/image-map.html
+fast/selectors/unqualified-hover-quirks.html
+fast/selectors/unqualified-hover-strict.html
fast/table/click-near-anonymous-table.html
fast/text/atsui-pointtooffset-calls-cg.html
fast/text/atsui-rtl-override-selection.html
@@ -506,6 +505,7 @@ http/tests/security/dataTransfer-set-data-file-url.html
http/tests/security/drag-over-remote-content-iframe.html
http/tests/security/listener/xss-window-onclick-addEventListener.html
http/tests/security/listener/xss-window-onclick-shortcut.html
+media/controls-right-click-on-timebar.html
media/media-fullscreen-inline.html
platform/mac/editing/deleting/backward-delete.html
platform/mac/editing/pasteboard/dataTransfer-set-data-file-url.html
@@ -518,6 +518,7 @@ platform/mac/fast/overflow/overflow-scrollbar-hit-test.html
plugins/createScriptableObject-before-start.html
plugins/destroy-during-npp-new.html
plugins/resize-from-plugin.html
+scrollbars/overflow-custom-scrollbar-crash.html
scrollbars/scrollbar-iframe-click-does-not-blur-content.html
scrollbars/scrollbar-middleclick-nopaste.html
scrollbars/scrollbar-miss-mousemove-disabled.html
@@ -533,6 +534,7 @@ svg/custom/clip-path-id-changes.svg
svg/custom/clip-path-units-changes.svg
svg/custom/deep-dynamic-updates.svg
svg/custom/foreignObject-crash-on-hover.xml
+svg/custom/gradient-attr-update.svg
svg/custom/hit-test-path-stroke.svg
svg/custom/hit-test-path.svg
svg/custom/hit-test-unclosed-subpaths.svg
@@ -549,6 +551,7 @@ svg/custom/js-update-pattern-child.svg
svg/custom/js-update-pattern.svg
svg/custom/js-update-polygon-changes.svg
svg/custom/js-update-polygon-removal.svg
+svg/custom/js-update-stop-linked-gradient.svg
svg/custom/js-update-stop.svg
svg/custom/js-update-style.svg
svg/custom/linking-a-03-b-all.svg
@@ -564,6 +567,7 @@ svg/custom/marker-child-changes.svg
svg/custom/marker-strokeWidth-changes.svg
svg/custom/marker-viewBox-changes.svg
svg/custom/mask-changes.svg
+svg/custom/mask-child-changes.svg
svg/custom/pointer-events-image.svg
svg/custom/pointer-events-path.svg
svg/custom/pointer-events-text.svg
@@ -627,6 +631,22 @@ svg/dynamic-updates/SVGFEOffsetElement-dom-in-attr.html
svg/dynamic-updates/SVGFEOffsetElement-svgdom-dx-prop.html
svg/dynamic-updates/SVGFEOffsetElement-svgdom-dy-prop.html
svg/dynamic-updates/SVGFEOffsetElement-svgdom-in-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-limitingConeAngle-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtX-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtY-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-pointsAtZ-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-specularExponent-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-x-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-y-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-dom-z-attr.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-limitingConeAngle-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtX-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtY-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-pointsAtZ-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-specularExponent-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-x-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-y-prop.html
+svg/dynamic-updates/SVGFESpotLightElement-svgdom-z-prop.html
svg/dynamic-updates/SVGFilterElement-dom-filterRes-attr.html
svg/dynamic-updates/SVGFilterElement-dom-filterUnits-attr.html
svg/dynamic-updates/SVGFilterElement-dom-height-attr.html
@@ -759,6 +779,7 @@ svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html
svg/dynamic-updates/SVGTextElement-svgdom-transform-prop.html
svg/dynamic-updates/SVGTRefElement-dom-href-attr.html
svg/filters/filter-width-update.svg
+svg/text/foreignObject-repaint.xml
svg/text/select-textLength-spacing-squeeze-1.svg
svg/text/select-textLength-spacing-squeeze-2.svg
svg/text/select-textLength-spacing-squeeze-3.svg
@@ -964,8 +985,8 @@ fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html
fast/canvas/webgl/index-validation-verifies-too-many-indices.html
fast/canvas/webgl/index-validation-with-resized-buffer.html
fast/canvas/webgl/index-validation.html
-fast/canvas/webgl/invalid-UTF-16.html
fast/canvas/webgl/invalid-passed-params.html
+fast/canvas/webgl/invalid-UTF-16.html
fast/canvas/webgl/null-object-behaviour.html
fast/canvas/webgl/null-uniform-location.html
fast/canvas/webgl/point-size.html
@@ -990,6 +1011,7 @@ fast/canvas/webgl/uniform-location.html
fast/canvas/webgl/viewport-unchanged-upon-resize.html
fast/canvas/webgl/webgl-array-invalid-ranges.html
fast/dom/Window/timer-resume-on-navigation-back.html
+fast/events/onunload-back-to-page-cache.html
fast/events/pageshow-pagehide-on-back-cached-with-frames.html
fast/events/pageshow-pagehide-on-back-cached.html
fast/events/tab-focus-anchor.html
@@ -1967,12 +1989,13 @@ http/tests/xmlhttprequest/re-login.html
# WebKit2 needs showModalDialog
fast/harness/show-modal-dialog.html
-# WebKit2 needs to support synchronous creation of about:blank/data:url frames'
-fast/dom/Window/BarInfo-after-frame-removed.html
-fast/dom/Window/window-collection-length-no-crash.html
+# WebKit2 needs to support synchronous creation of about:blank/data:url frames
editing/selection/DOMSelection-crossing-document.html
fast/dom/Document/document-write-doctype.html
+fast/dom/HTMLDocument/hasFocus.html
fast/dom/prototype-inheritance-2.html
+fast/dom/Window/BarInfo-after-frame-removed.html
+fast/dom/Window/window-collection-length-no-crash.html
fast/encoding/char-encoding-mac.html
fast/encoding/char-encoding.html
fast/encoding/invalid-xml.html
@@ -1986,18 +2009,18 @@ fast/loader/meta-refresh-vs-open.html
http/tests/security/cross-frame-access-get-override.html
http/tests/security/cross-frame-access-history-get-override.html
http/tests/security/cross-frame-access-location-get-override.html
+http/tests/security/frameNavigation/context-for-location-assign.html
+http/tests/security/frameNavigation/context-for-location-href.html
+http/tests/security/frameNavigation/context-for-location.html
+http/tests/security/frameNavigation/context-for-window-open.html
http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame-2-level.html
http/tests/security/javascriptURL/xss-ALLOWED-to-javascript-url-sub-frame.html
-storage/domstorage/events/basic-body-attribute.html
media/adopt-node-crash.html
+storage/domstorage/events/basic-body-attribute.html
storage/domstorage/events/basic-setattribute.html
storage/domstorage/events/basic.html
storage/domstorage/events/case-sensitive.html
storage/domstorage/events/documentURI.html
-http/tests/security/frameNavigation/context-for-location.html
-http/tests/security/frameNavigation/context-for-location-assign.html
-http/tests/security/frameNavigation/context-for-location-href.html
-http/tests/security/frameNavigation/context-for-window-open.html
# WebKit2 doesn't have a missing plug-in delegate
plugins/clicking-missing-plugin-fires-delegate.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a4250c2..06cd019 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,48 @@
+2010-08-09 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Stub out EventSender for WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=43703
+
+ * WebKitTestRunner/DerivedSources.make:
+ * WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
+ Add ability to pass javascript arguments to the wrapped object.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl: Added.
+ * WebKitTestRunner/InjectedBundle/EventSendingController.cpp: Added.
+ (WTR::EventSendingController::create):
+ (WTR::EventSendingController::EventSendingController):
+ (WTR::EventSendingController::~EventSendingController):
+ (WTR::EventSendingController::wrapperClass):
+ (WTR::setExceptionForString):
+ (WTR::EventSendingController::mouseDown):
+ (WTR::EventSendingController::mouseUp):
+ (WTR::EventSendingController::mouseMoveTo):
+ (WTR::EventSendingController::keyDown):
+ (WTR::EventSendingController::contextClick):
+ (WTR::EventSendingController::leapForward):
+ (WTR::EventSendingController::textZoomIn):
+ (WTR::EventSendingController::textZoomOut):
+ (WTR::EventSendingController::zoomPageIn):
+ (WTR::EventSendingController::zoomPageOut):
+ (WTR::EventSendingController::makeWindowObject):
+ * WebKitTestRunner/InjectedBundle/EventSendingController.h: Added.
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::reset):
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.h:
+ (WTR::InjectedBundle::eventSendingController):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::didClearWindowForFrame):
+ Add stubbed out EventSenderController.
+
+ * WebKitTestRunner/InjectedBundle/GCController.h:
+ Remove incorrect comment.
+
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/win/InjectedBundle.vcproj:
+ Add new files.
+
2010-08-08 Kent Tamura <tkent at chromium.org>
Unreviewed, trivial fix.
diff --git a/WebKitTools/WebKitTestRunner/DerivedSources.make b/WebKitTools/WebKitTestRunner/DerivedSources.make
index 1aa3c86..c308a8a 100644
--- a/WebKitTools/WebKitTestRunner/DerivedSources.make
+++ b/WebKitTools/WebKitTestRunner/DerivedSources.make
@@ -26,8 +26,9 @@ VPATH = \
#
INTERFACES = \
- LayoutTestController \
+ EventSendingController \
GCController \
+ LayoutTestController \
#
SCRIPTS = \
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm
index fa47143..0de2fd0 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm
@@ -245,30 +245,31 @@ JSValueRef ${className}::@{[$function->signature->name]}(JSContextRef context, J
${implementationClassName}* impl = to${implementationClassName}(context, thisObject);
if (!impl)
return JSValueMakeUndefined(context);
+
EOF
- my @parameters = ();
- my @specifiedParameters = @{$function->parameters};
+ my $functionCall;
+ if ($function->signature->extendedAttributes->{"CustomArgumentHandling"}) {
+ $functionCall = "impl->" . $function->signature->name . "(context, argumentCount, arguments, exception)";
+ } else {
+ my @parameters = ();
+ my @specifiedParameters = @{$function->parameters};
- push(@contents, "\n") if scalar @specifiedParameters;
+ $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
- $self->_includeHeaders(\%contentsIncludes, $function->signature->type, $function->signature);
+ foreach my $i (0..$#specifiedParameters) {
+ my $parameter = $specifiedParameters[$i];
- foreach my $i (0..$#specifiedParameters) {
- my $parameter = $specifiedParameters[$i];
+ $self->_includeHeaders(\%contentsIncludes, $idlType, $parameter);
- $self->_includeHeaders(\%contentsIncludes, $idlType, $parameter);
+ push(@contents, " " . $self->_platformTypeVariableDeclaration($parameter, $parameter->name, "arguments[$i]", "argumentCount > $i") . "\n");
+
+ push(@parameters, $self->_parameterExpression($parameter));
+ }
- push(@contents, " " . $self->_platformTypeVariableDeclaration($parameter, $parameter->name, "arguments[$i]", "argumentCount > $i") . "\n");
-
- push(@parameters, $self->_parameterExpression($parameter));
+ $functionCall = "impl->" . $function->signature->name . "(" . join(", ", @parameters) . ")";
}
-
- my $isVoidReturn = $function->signature->type eq "void";
- my $functionName = "impl->" . $function->signature->name;
- my $functionCall = $functionName . "(" . join(", ", @parameters) . ")";
-
- push(@contents, "\n") unless scalar @specifiedParameters == 1;
- push(@contents, " ${functionCall};\n\n") if $isVoidReturn;
+
+ push(@contents, " ${functionCall};\n\n") if $function->signature->type eq "void";
push(@contents, " return " . $self->_returnExpression($function->signature, $functionCall) . ";\n}\n");
}
}
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl
new file mode 100644
index 0000000..55b1552
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module WTR {
+
+ interface EventSendingController {
+ [CustomArgumentHandling] void mouseDown();
+ [CustomArgumentHandling] void mouseUp();
+ [CustomArgumentHandling] void mouseMoveTo();
+ [CustomArgumentHandling] void keyDown();
+ [CustomArgumentHandling] void contextClick(); // CustomArgumentHandling only to throw exception while not implemented.
+ [CustomArgumentHandling] void leapForward(/*in unsigned long delay*/); // CustomArgumentHandling only to throw exception while not implemented.
+
+ // Zoom functions.
+ [CustomArgumentHandling] void textZoomIn(); // CustomArgumentHandling only to throw exception while not implemented.
+ [CustomArgumentHandling] void textZoomOut(); // CustomArgumentHandling only to throw exception while not implemented.
+ [CustomArgumentHandling] void zoomPageIn(); // CustomArgumentHandling only to throw exception while not implemented.
+ [CustomArgumentHandling] void zoomPageOut(); // CustomArgumentHandling only to throw exception while not implemented.
+ };
+
+}
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
new file mode 100644
index 0000000..25d9a7c
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "EventSendingController.h"
+
+#include "InjectedBundle.h"
+#include "JSEventSendingController.h"
+#include <WebKit2/WKBundlePrivate.h>
+
+namespace WTR {
+
+PassRefPtr<EventSendingController> EventSendingController::create()
+{
+ return adoptRef(new EventSendingController);
+}
+
+EventSendingController::EventSendingController()
+{
+}
+
+EventSendingController::~EventSendingController()
+{
+}
+
+JSClassRef EventSendingController::wrapperClass()
+{
+ return JSEventSendingController::eventSendingControllerClass();
+}
+
+static void setExceptionForString(JSContextRef context, JSValueRef* exception, const char* string)
+{
+ JSRetainPtr<JSStringRef> exceptionString(Adopt, JSStringCreateWithUTF8CString(string));
+ *exception = JSValueMakeString(context, exceptionString.get());
+}
+
+void EventSendingController::mouseDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.mouseDown is not yet supported.");
+}
+
+void EventSendingController::mouseUp(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.mouseUp is not yet supported.");
+}
+
+void EventSendingController::mouseMoveTo(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.mouseMoveTo is not yet supported.");
+}
+
+void EventSendingController::keyDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.keyDown is not yet supported.");
+}
+
+void EventSendingController::contextClick(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.contextClick is not yet supported.");
+}
+
+void EventSendingController::leapForward(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.leapForward is not yet supported.");
+}
+
+void EventSendingController::textZoomIn(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.textZoomIn is not yet supported.");
+}
+
+void EventSendingController::textZoomOut(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.textZoomOut is not yet supported.");
+}
+
+void EventSendingController::zoomPageIn(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.zoomPageIn is not yet supported.");
+}
+
+void EventSendingController::zoomPageOut(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ setExceptionForString(context, exception, "EventSender.zoomPageOut is not yet supported.");
+}
+
+// Object Creation
+
+void EventSendingController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
+{
+ setProperty(context, windowObject, "eventSender", this, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
+}
+
+} // namespace WTR
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.h
new file mode 100644
index 0000000..17eefd7
--- /dev/null
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef EventSendingController_h
+#define EventSendingController_h
+
+#include "JSWrappable.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WTR {
+
+class EventSendingController : public JSWrappable {
+public:
+ static PassRefPtr<EventSendingController> create();
+ virtual ~EventSendingController();
+
+ void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
+
+ // JSWrappable
+ virtual JSClassRef wrapperClass();
+
+ void mouseDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void mouseUp(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void mouseMoveTo(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void keyDown(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void contextClick(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void leapForward(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+
+ void textZoomIn(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void textZoomOut(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void zoomPageIn(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+ void zoomPageOut(JSContextRef context, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception);
+
+private:
+ EventSendingController();
+};
+
+} // namespace WTR
+
+#endif // EventSendingController_h
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/GCController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/GCController.h
index 654fe0e..760fbb1 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/GCController.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/GCController.h
@@ -36,12 +36,11 @@ public:
static PassRefPtr<GCController> create();
virtual ~GCController();
+ void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
+
// JSWrappable
virtual JSClassRef wrapperClass();
- void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
-
- // The basics.
void collect();
void collectOnAlternateThread(bool waitUntilDone);
size_t getJSObjectCount();
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
index a97d1e9..02dfeb1 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp
@@ -133,10 +133,14 @@ void InjectedBundle::didReceiveMessage(WKStringRef messageName, WKTypeRef messag
void InjectedBundle::reset()
{
m_outputStream.str("");
+
m_layoutTestController = LayoutTestController::create();
m_gcController = GCController::create();
+ m_eventSendingController = EventSendingController::create();
+
WKBundleSetShouldTrackVisitedLinks(m_bundle, false);
WKBundleRemoveAllVisitedLinks(m_bundle);
+
m_mainPage->reset();
}
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
index e97a0f0..ba021b1 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h
@@ -26,6 +26,7 @@
#ifndef InjectedBundle_h
#define InjectedBundle_h
+#include "EventSendingController.h"
#include "GCController.h"
#include "LayoutTestController.h"
#include <WebKit2/WKBase.h>
@@ -51,6 +52,7 @@ public:
LayoutTestController* layoutTestController() { return m_layoutTestController.get(); }
GCController* gcController() { return m_gcController.get(); }
+ EventSendingController* eventSendingController() { return m_eventSendingController.get(); }
InjectedBundlePage* page() { return m_mainPage.get(); }
size_t pageCount() { return !!m_mainPage + m_otherPages.size(); }
@@ -79,6 +81,7 @@ private:
RefPtr<LayoutTestController> m_layoutTestController;
RefPtr<GCController> m_gcController;
+ RefPtr<EventSendingController> m_eventSendingController;
std::ostringstream m_outputStream;
};
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index 5c66336..b862305 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -394,6 +394,7 @@ void InjectedBundlePage::didClearWindowForFrame(WKBundleFrameRef frame, JSGlobal
JSValueRef exception = 0;
InjectedBundle::shared().layoutTestController()->makeWindowObject(context, window, &exception);
InjectedBundle::shared().gcController()->makeWindowObject(context, window, &exception);
+ InjectedBundle::shared().eventSendingController()->makeWindowObject(context, window, &exception);
}
void InjectedBundlePage::didCancelClientRedirectForFrame(WKBundleFrameRef frame)
diff --git a/WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj b/WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
index 5f8ac0e..6f78289 100644
--- a/WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
+++ b/WebKitTools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj
@@ -45,6 +45,8 @@
BC7934AC1190658C005EA8E2 /* WebKit2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC7934AB1190658C005EA8E2 /* WebKit2.framework */; };
BC7934E811906846005EA8E2 /* PlatformWebViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */; };
BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8C795B11D2785D004535A1 /* TestControllerMac.mm */; };
+ BC8FD8CA120E527F00F3E71A /* EventSendingController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8FD8C9120E527F00F3E71A /* EventSendingController.cpp */; };
+ BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8FD8D0120E545B00F3E71A /* JSEventSendingController.cpp */; };
BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952C0C11F3B965003398B4 /* JSWrapper.cpp */; };
BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */; };
BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */; };
@@ -108,6 +110,11 @@
BC7934DD119066EC005EA8E2 /* PlatformWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWebView.h; sourceTree = "<group>"; };
BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformWebViewMac.mm; sourceTree = "<group>"; };
BC8C795B11D2785D004535A1 /* TestControllerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestControllerMac.mm; sourceTree = "<group>"; };
+ BC8FD8C8120E527F00F3E71A /* EventSendingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSendingController.h; sourceTree = "<group>"; };
+ BC8FD8C9120E527F00F3E71A /* EventSendingController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventSendingController.cpp; sourceTree = "<group>"; };
+ BC8FD8CB120E52B000F3E71A /* EventSendingController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = EventSendingController.idl; sourceTree = "<group>"; };
+ BC8FD8D0120E545B00F3E71A /* JSEventSendingController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSEventSendingController.cpp; path = DerivedSources/WebKitTestRunner/JSEventSendingController.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
+ BC8FD8D1120E545B00F3E71A /* JSEventSendingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JSEventSendingController.h; path = DerivedSources/WebKitTestRunner/JSEventSendingController.h; sourceTree = BUILT_PRODUCTS_DIR; };
BC952C0B11F3B965003398B4 /* JSWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWrapper.h; sourceTree = "<group>"; };
BC952C0C11F3B965003398B4 /* JSWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWrapper.cpp; sourceTree = "<group>"; };
BC952C0E11F3B97B003398B4 /* JSWrappable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWrappable.h; sourceTree = "<group>"; };
@@ -212,6 +219,8 @@
BC14E4E0120E02F900826C0C /* Controllers */ = {
isa = PBXGroup;
children = (
+ BC8FD8C9120E527F00F3E71A /* EventSendingController.cpp */,
+ BC8FD8C8120E527F00F3E71A /* EventSendingController.h */,
BC14E4D9120E02D000826C0C /* GCController.cpp */,
BC14E4D8120E02D000826C0C /* GCController.h */,
BCC9981711D3F51E0017BCA2 /* LayoutTestController.cpp */,
@@ -285,6 +294,7 @@
BC952C0E11F3B97B003398B4 /* JSWrappable.h */,
BC952C0C11F3B965003398B4 /* JSWrapper.cpp */,
BC952C0B11F3B965003398B4 /* JSWrapper.h */,
+ BC8FD8CB120E52B000F3E71A /* EventSendingController.idl */,
BC14E4E1120E032000826C0C /* GCController.idl */,
BC952ED211F3C29F003398B4 /* LayoutTestController.idl */,
);
@@ -294,6 +304,8 @@
BC952D3A11F3BF1F003398B4 /* Derived Sources */ = {
isa = PBXGroup;
children = (
+ BC8FD8D0120E545B00F3E71A /* JSEventSendingController.cpp */,
+ BC8FD8D1120E545B00F3E71A /* JSEventSendingController.h */,
BC14E4E8120E03D800826C0C /* JSGCController.cpp */,
BC14E4E9120E03D800826C0C /* JSGCController.h */,
BC952F1D11F3C652003398B4 /* JSLayoutTestController.cpp */,
@@ -433,6 +445,8 @@
BC952F1F11F3C652003398B4 /* JSLayoutTestController.cpp in Sources */,
BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */,
BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */,
+ BC8FD8CA120E527F00F3E71A /* EventSendingController.cpp in Sources */,
+ BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKitTools/WebKitTestRunner/win/InjectedBundle.vcproj b/WebKitTools/WebKitTestRunner/win/InjectedBundle.vcproj
index ddfcf37..71dcf95 100644
--- a/WebKitTools/WebKitTestRunner/win/InjectedBundle.vcproj
+++ b/WebKitTools/WebKitTestRunner/win/InjectedBundle.vcproj
@@ -288,6 +288,14 @@
Name="Derived Sources"
>
<File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSEventSendingController.cpp"
+ >
+ </File>
+ <File
+ RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSEventSendingController.h"
+ >
+ </File>
+ <File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSGCController.cpp"
>
</File>
@@ -329,6 +337,14 @@
>
</File>
<File
+ RelativePath="..\InjectedBundle\EventSendingController.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\InjectedBundle\EventSendingController.h"
+ >
+ </File>
+ <File
RelativePath="..\InjectedBundle\GCController.cpp"
>
</File>
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list