content/renderer/render_view_browsertest_mac.mm - Issue 11103025: Revert 161256 - Fix the crash that was happening on the buildbot (but not trybots, for a strange re…

Side by Side Diff: content/renderer/render_view_browsertest_mac.mm

Issue 11103025: Revert 161256 - Fix the crash that was happening on the buildbot (but not trybots, for a strange re… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/string_util.h"	5 #include "base/string_util.h"

6 #include "base/string16.h"	6 #include "base/string16.h"

7 #include "content/public/browser/native_web_keyboard_event.h"	7 #include "content/public/browser/native_web_keyboard_event.h"

8 #include "content/public/test/render_view_test.h"	8 #include "content/public/test/render_view_test.h"

9 #include "content/renderer/render_view_impl.h"	9 #include "content/renderer/render_view_impl.h"

	10 #include "content/shell/shell_main_delegate.h"

10 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

11	12

12 #include <Cocoa/Cocoa.h>	13 #include <Cocoa/Cocoa.h>

13 #include <Carbon/Carbon.h> // for the kVK_* constants.	14 #include <Carbon/Carbon.h> // for the kVK_* constants.

14	15

15 using content::NativeWebKeyboardEvent;	16 using content::NativeWebKeyboardEvent;

16 using content::RenderViewTest;	17 using content::RenderViewTest;

17	18

18 NSEvent* CmdDeadKeyEvent(NSEventType type, unsigned short code) {	19 NSEvent* CmdDeadKeyEvent(NSEventType type, unsigned short code) {

19 UniChar uniChar = 0;	20 UniChar uniChar = 0;

(...skipping 17 matching lines...) Expand all Loading...
37 context:nil	38 context:nil

38 characters:s	39 characters:s

39 charactersIgnoringModifiers:s	40 charactersIgnoringModifiers:s

40 isARepeat:NO	41 isARepeat:NO

41 keyCode:code];	42 keyCode:code];

42 }	43 }

43	44

44 // Test that cmd-up/down scrolls the page exactly if it is not intercepted by	45 // Test that cmd-up/down scrolls the page exactly if it is not intercepted by

45 // javascript.	46 // javascript.

46 TEST_F(RenderViewTest, MacTestCmdUp) {	47 TEST_F(RenderViewTest, MacTestCmdUp) {

	48 content::ShellMainDelegate::InitializeResourceBundle();

47 // Some preprocessor trickery so that we can have literal html in our source,	49 // Some preprocessor trickery so that we can have literal html in our source,

48 // makes it easier to copy html to and from an html file for testing (the	50 // makes it easier to copy html to and from an html file for testing (the

49 // preprocessor will remove the newlines at the line ends, turning this into	51 // preprocessor will remove the newlines at the line ends, turning this into

50 // a single long line).	52 // a single long line).

51 #define HTML(s) #s	53 #define HTML(s) #s

52 const char* kRawHtml = HTML(	54 const char* kRawHtml = HTML(

53 <html>	55 <html>

54 <head><title></title>	56 <head><title></title>

55 <script type='text/javascript' language='javascript'>	57 <script type='text/javascript' language='javascript'>

56 function OnKeyEvent(ev) {	58 function OnKeyEvent(ev) {

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
140 const char* kArrowUpNoScroll =	142 const char* kArrowUpNoScroll =

141 "38,false,false,true,false\np1\n\np2";	143 "38,false,false,true,false\np1\n\np2";

142 view->OnSetEditCommandsForNextKeyEvent(	144 view->OnSetEditCommandsForNextKeyEvent(

143 EditCommands(1, EditCommand("moveToBeginningOfDocument", "")));	145 EditCommands(1, EditCommand("moveToBeginningOfDocument", "")));

144 SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));	146 SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown));

145 ProcessPendingMessages();	147 ProcessPendingMessages();

146 output = GetMainFrame()->contentAsText(kMaxOutputCharacters);	148 output = GetMainFrame()->contentAsText(kMaxOutputCharacters);

147 EXPECT_EQ(kArrowUpNoScroll, UTF16ToASCII(output));	149 EXPECT_EQ(kArrowUpNoScroll, UTF16ToASCII(output));

148 }	150 }

149	151

OLD	NEW

« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | content/renderer/render_widget_browsertest.cc » ('j') | no next file with comments »