diff options
Diffstat (limited to 'WebKitTools/DumpRenderTree/mac')
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm | 36 | ||||
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportTiger.pm (renamed from WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm) | 0 | ||||
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapTiger.c (renamed from WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c) | 0 | ||||
| -rw-r--r-- | WebKitTools/DumpRenderTree/mac/PerlSupport/Makefile | 19 |
4 files changed, 7 insertions, 48 deletions
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm index be3eb09..e3f2141 100644 --- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm +++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm @@ -583,42 +583,6 @@ void LayoutTestController::execCommand(JSStringRef name, JSStringRef value) [[mainFrame webView] _executeCoreCommandByName:nameNS value:valueNS]; } -bool LayoutTestController::findString(JSContextRef context, JSStringRef target, JSObjectRef optionsArray) -{ - WebFindOptions options = 0; - - JSRetainPtr<JSStringRef> lengthPropertyName(Adopt, JSStringCreateWithUTF8CString("length")); - JSValueRef lengthValue = JSObjectGetProperty(context, optionsArray, lengthPropertyName.get(), 0); - if (!JSValueIsNumber(context, lengthValue)) - return false; - - RetainPtr<CFStringRef> targetCFString(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, target)); - - size_t length = static_cast<size_t>(JSValueToNumber(context, lengthValue, 0)); - for (size_t i = 0; i < length; ++i) { - JSValueRef value = JSObjectGetPropertyAtIndex(context, optionsArray, i, 0); - if (!JSValueIsString(context, value)) - continue; - - JSRetainPtr<JSStringRef> optionName(Adopt, JSValueToStringCopy(context, value, 0)); - - if (JSStringIsEqualToUTF8CString(optionName.get(), "CaseInsensitive")) - options |= WebFindOptionsCaseInsensitive; - else if (JSStringIsEqualToUTF8CString(optionName.get(), "AtWordStarts")) - options |= WebFindOptionsAtWordStarts; - else if (JSStringIsEqualToUTF8CString(optionName.get(), "TreatMedialCapitalAsWordStart")) - options |= WebFindOptionsTreatMedialCapitalAsWordStart; - else if (JSStringIsEqualToUTF8CString(optionName.get(), "Backwards")) - options |= WebFindOptionsBackwards; - else if (JSStringIsEqualToUTF8CString(optionName.get(), "WrapAround")) - options |= WebFindOptionsWrapAround; - else if (JSStringIsEqualToUTF8CString(optionName.get(), "StartInSelection")) - options |= WebFindOptionsStartInSelection; - } - - return [[mainFrame webView] findString:(NSString *)targetCFString.get() options:options]; -} - void LayoutTestController::setCacheModel(int cacheModel) { [[WebPreferences standardPreferences] setCacheModel:cacheModel]; diff --git a/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm b/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportTiger.pm index 7b4ea34..7b4ea34 100644 --- a/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm +++ b/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportTiger.pm diff --git a/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c b/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapTiger.c index f734989..f734989 100644 --- a/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c +++ b/WebKitTools/DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapTiger.c diff --git a/WebKitTools/DumpRenderTree/mac/PerlSupport/Makefile b/WebKitTools/DumpRenderTree/mac/PerlSupport/Makefile index 16a9e51..56b2ed2 100644 --- a/WebKitTools/DumpRenderTree/mac/PerlSupport/Makefile +++ b/WebKitTools/DumpRenderTree/mac/PerlSupport/Makefile @@ -31,15 +31,10 @@ DYLIB=$(OUTPUT_DIR)/DumpRenderTreeSupport.dylib DUMPRENDERTREE=$(OUTPUT_DIR)/DumpRenderTree PERL=/usr/bin/perl -OSX_VERSION = $(shell sw_vers -productVersion | cut -d. -f 2) -ifeq "$(OSX_VERSION)" "4" -GENERATE_WRAPPER = NO -endif -ifeq "$(OSX_VERSION)" "7" -GENERATE_WRAPPER = NO -endif +OSX_VERSION=$(shell sw_vers -productVersion | cut -d. -f 2) + +ifneq "$(OSX_VERSION)" "4" -ifneq "$(GENERATE_WRAPPER)" "NO" SWIG=/usr/bin/swig @@ -55,12 +50,12 @@ else all: $(DYLIB) $(PERL_MODULE) -$(WRAPPER): DumpRenderTreeSupport_wrapPregenerated.c $(DUMPRENDERTREE) +$(WRAPPER): DumpRenderTreeSupport_wrapTiger.c $(DUMPRENDERTREE) mkdir -p $(WRAPPER_DIR) - cp DumpRenderTreeSupport_wrapPregenerated.c $(WRAPPER) + cp DumpRenderTreeSupport_wrapTiger.c $(WRAPPER) -$(PERL_MODULE): DumpRenderTreeSupportPregenerated.pm $(DUMPRENDERTREE) - cp DumpRenderTreeSupportPregenerated.pm $(PERL_MODULE) +$(PERL_MODULE): DumpRenderTreeSupportTiger.pm $(DUMPRENDERTREE) + cp DumpRenderTreeSupportTiger.pm $(PERL_MODULE) endif |