From 2366cac6c66ce637903152f5fc58cd98b5686950 Mon Sep 17 00:00:00 2001 From: "aroben@apple.com" Date: Tue, 31 Jan 2012 15:09:33 +0000 Subject: [PATCH] Only call -typingAttributes on WebViews, not WebHTMLViews Looks like this case was just missed in r105908. Fixes REGRESSION (r105908): WebKit1.InspectorBarTest is crashing Reviewed by Antti Koivisto. * TestWebKitAPI/Tests/mac/InspectorBar.mm: (TestWebKitAPI::TEST): Call -typingAttributes on the WebView, just like we do 2 lines earlier. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106359 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 14 ++++++++++++++ Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index d7a9097..133a262 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,17 @@ +2012-01-31 Adam Roben + + Only call -typingAttributes on WebViews, not WebHTMLViews + + Looks like this case was just missed in r105908. + + Fixes REGRESSION (r105908): WebKit1.InspectorBarTest is crashing + + Reviewed by Antti Koivisto. + + * TestWebKitAPI/Tests/mac/InspectorBar.mm: + (TestWebKitAPI::TEST): Call -typingAttributes on the WebView, just like we do 2 lines + earlier. + 2012-01-31 Jocelyn Turcotte [Qt] MiniBrowser: Show touch mocking indicators only when Ctrl is held down. diff --git a/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm b/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm index bf489a2..0a51e2f 100644 --- a/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm +++ b/Tools/TestWebKitAPI/Tests/mac/InspectorBar.mm @@ -66,7 +66,7 @@ TEST(WebKit1, InspectorBarTest) EXPECT_TRUE([webView.get() respondsToSelector:@selector(typingAttributes)]); NSDictionary *attributes = [(id)webView.get() typingAttributes]; [(id)[[[webView.get() mainFrame] frameView] documentView] doCommandBySelector:@selector(bold:)]; - EXPECT_FALSE([attributes isEqual:[(id)[[[webView.get() mainFrame] frameView] documentView] typingAttributes]]); + EXPECT_FALSE([attributes isEqual:[(id)webView.get() typingAttributes]]); [webView.get() selectAll:nil]; NSAttributedString *attrString = [(NSView *)[[[webView.get() mainFrame] frameView] documentView] attributedSubstringFromRange:NSMakeRange(0, 5)]; -- 2.7.4