diff options
Diffstat (limited to 'third_party/WebKit/WebKitTools')
7 files changed, 18 insertions, 53 deletions
diff --git a/third_party/WebKit/WebKitTools/ChangeLog b/third_party/WebKit/WebKitTools/ChangeLog index 9b99b71..988de3f 100644 --- a/third_party/WebKit/WebKitTools/ChangeLog +++ b/third_party/WebKit/WebKitTools/ChangeLog @@ -1,3 +1,21 @@ +2008-12-11 Cameron Zwarich <zwarich@apple.com> + + Rubber-stamped by Mark Rowe. + + Roll out r39212 due to assertion failures during layout tests, multiple + layout test failures, memory leaks, and obvious incorrectness. + + * DumpRenderTree/LayoutTestController.cpp: + (LayoutTestController::staticFunctions): + * DumpRenderTree/LayoutTestController.h: + * DumpRenderTree/mac/DumpRenderTree.mm: + (resetWebViewToConsistentStateBeforeTesting): + * DumpRenderTree/mac/LayoutTestControllerMac.mm: + * DumpRenderTree/win/DumpRenderTree.cpp: + (resetWebViewToConsistentStateBeforeTesting): + * DumpRenderTree/win/LayoutTestControllerWin.cpp: + (LayoutTestController::pauseTransitionAtTimeOnElementWithId): + 2008-12-10 Glenn Wilson <gwilson@google.com> Reviewed by Adam Roben. diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.cpp index bf819f2..cd55130 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.cpp +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.cpp @@ -348,22 +348,6 @@ static JSValueRef isCommandEnabledCallback(JSContextRef context, JSObjectRef fun return JSValueMakeBoolean(context, controller->isCommandEnabled(name.get())); } -static JSValueRef overridePreferenceCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) -{ - if (argumentCount < 2) - return JSValueMakeUndefined(context); - - JSRetainPtr<JSStringRef> key(Adopt, JSValueToStringCopy(context, arguments[0], exception)); - ASSERT(!*exception); - JSRetainPtr<JSStringRef> value(Adopt, JSValueToStringCopy(context, arguments[1], exception)); - ASSERT(!*exception); - - LayoutTestController* controller = reinterpret_cast<LayoutTestController*>(JSObjectGetPrivate(thisObject)); - controller->overridePreference(key.get(), value.get()); - - return JSValueMakeUndefined(context); -} - static JSValueRef keepWebHistoryCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) { // Has mac implementation @@ -818,7 +802,6 @@ JSStaticFunction* LayoutTestController::staticFunctions() { "isCommandEnabled", isCommandEnabledCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "keepWebHistory", keepWebHistoryCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "notifyDone", notifyDoneCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, - { "overridePreference", overridePreferenceCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "pathToLocalResource", pathToLocalResourceCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "queueBackNavigation", queueBackNavigationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, { "queueForwardNavigation", queueForwardNavigationCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete }, diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.h b/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.h index c37736a..0d0fd5a 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.h +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/LayoutTestController.h @@ -73,7 +73,6 @@ public: void setUserStyleSheetLocation(JSStringRef path); void setPersistentUserStyleSheetLocation(JSStringRef path); void clearPersistentUserStyleSheet(); - void overridePreference(JSStringRef key, JSStringRef flag); int windowCount(); bool elementDoesAutoCompleteForElementWithId(JSStringRef id); diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/third_party/WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm index c67b46c..afb2b0d 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm @@ -978,7 +978,6 @@ static void resetWebViewToConsistentStateBeforeTesting() [webView _clearMainFrameName]; WebPreferences *preferences = [webView preferences]; - [preferences resetToDefaults]; [preferences setPrivateBrowsingEnabled:NO]; [preferences setAuthorAndUserStylesEnabled:YES]; [preferences setJavaScriptCanOpenWindowsAutomatically:YES]; diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/third_party/WebKit/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm index 965a4ad..c475cdc 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm @@ -267,17 +267,6 @@ void LayoutTestController::setUserStyleSheetLocation(JSStringRef path) [[WebPreferences standardPreferences] setUserStyleSheetLocation:url]; } -void LayoutTestController::overridePreference(JSStringRef key, JSStringRef flag) -{ - RetainPtr<CFStringRef> keyCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, key)); - NSString *keyNS = (NSString *)keyCF.get(); - - RetainPtr<CFStringRef> flagCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, flag)); - NSString *flagNS = (NSString *)flagCF.get(); - - [[WebPreferences standardPreferences] overridePreference:keyNS flag:flagNS]; -} - void LayoutTestController::setPersistentUserStyleSheetLocation(JSStringRef jsURL) { RetainPtr<CFStringRef> urlString(AdoptCF, JSStringCopyCFString(0, jsURL)); diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp b/third_party/WebKit/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp index 605783d..c844991 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp @@ -656,7 +656,6 @@ static void resetWebViewToConsistentStateBeforeTesting() COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences); if (prefsPrivate) { - prefsPrivate->resetToDefaults(); prefsPrivate->setAuthorAndUserStylesEnabled(TRUE); prefsPrivate->setDeveloperExtrasEnabled(FALSE); } diff --git a/third_party/WebKit/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp b/third_party/WebKit/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp index 98af68e..45d4a2d 100644 --- a/third_party/WebKit/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp +++ b/third_party/WebKit/WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp @@ -41,7 +41,6 @@ #include <JavaScriptCore/Assertions.h> #include <JavaScriptCore/JavaScriptCore.h> #include <JavaScriptCore/JSRetainPtr.h> -#include <JavaScriptCore/JSStringRefBSTR.h> #include <WebKit/WebKit.h> #include <string> #include <CoreFoundation/CoreFoundation.h> @@ -659,24 +658,3 @@ bool LayoutTestController::pauseTransitionAtTimeOnElementWithId(JSStringRef prop { return false; // FIXME: Implement this on Windows } - -void LayoutTestController::overridePreference(JSStringRef key, JSStringRef flag) -{ - COMPtr<IWebView> webView; - if (FAILED(frame->webView(&webView))) - return; - - COMPtr<IWebPreferences> preferences; - if (FAILED(webView->preferences(&preferences))) - return; - - COMPtr<IWebPreferencesPrivate> prefsPrivate(Query, preferences); - if (!prefsPrivate) - return; - - BSTR keyBSTR = JSStringCopyBSTR(key); - BSTR flagBSTR = JSStringCopyBSTR(flag); - prefsPrivate->overridePreference(keyBSTR, flagBSTR); - SysFreeString(keyBSTR); - SysFreeString(flagBSTR); -} |