content/renderer/render_view_browsertest.cc - Issue 273423004: Migrate accessibility from RenderView to RenderFrame.

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 273423004: Migrate accessibility from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 5 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/basictypes.h"	5 #include "base/basictypes.h"

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

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/memory/shared_memory.h"	8 #include "base/memory/shared_memory.h"

9 #include "base/strings/string_util.h"	9 #include "base/strings/string_util.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

(...skipping 2315 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2326 request.setTargetType(blink::WebURLRequest::TargetIsSubresource);	2326 request.setTargetType(blink::WebURLRequest::TargetIsSubresource);

2327 blink::WebURLResponse redirect_response;	2327 blink::WebURLResponse redirect_response;

2328 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);	2328 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);

2329 extra_data = static_cast<RequestExtraData*>(request.extraData());	2329 extra_data = static_cast<RequestExtraData*>(request.extraData());

2330 ASSERT_TRUE(extra_data);	2330 ASSERT_TRUE(extra_data);

2331 EXPECT_EQ(extra_data->service_worker_provider_id(),	2331 EXPECT_EQ(extra_data->service_worker_provider_id(),

2332 provider->provider_id());	2332 provider->provider_id());

2333 }	2333 }

2334	2334

2335 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {	2335 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {

2336 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode());	2336 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());

2337 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility());	2337 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());

2338	2338

2339 view()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);	2339 frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);

2340 ASSERT_EQ(AccessibilityModeTreeOnly, view()->accessibility_mode());	2340 ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());

2341 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());	2341 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

2342 ASSERT_EQ(RendererAccessibilityTypeComplete,	2342 ASSERT_EQ(RendererAccessibilityTypeComplete,

2343 view()->renderer_accessibility()->GetType());	2343 frame()->renderer_accessibility()->GetType());

2344	2344

2345 view()->OnSetAccessibilityMode(AccessibilityModeOff);	2345 frame()->OnSetAccessibilityMode(AccessibilityModeOff);

2346 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode());	2346 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());

2347 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility());	2347 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());

2348	2348

2349 view()->OnSetAccessibilityMode(AccessibilityModeComplete);	2349 frame()->OnSetAccessibilityMode(AccessibilityModeComplete);

2350 ASSERT_EQ(AccessibilityModeComplete, view()->accessibility_mode());	2350 ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());

2351 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());	2351 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

2352 ASSERT_EQ(RendererAccessibilityTypeComplete,	2352 ASSERT_EQ(RendererAccessibilityTypeComplete,

2353 view()->renderer_accessibility()->GetType());	2353 frame()->renderer_accessibility()->GetType());

2354	2354

2355 view()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);	2355 frame()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);

2356 ASSERT_EQ(AccessibilityModeEditableTextOnly, view()->accessibility_mode());	2356 ASSERT_EQ(AccessibilityModeEditableTextOnly, frame()->accessibility_mode());

2357 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility());	2357 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());

2358 ASSERT_EQ(RendererAccessibilityTypeFocusOnly,	2358 ASSERT_EQ(RendererAccessibilityTypeFocusOnly,

2359 view()->renderer_accessibility()->GetType());	2359 frame()->renderer_accessibility()->GetType());

2360 }	2360 }

2361	2361

2362 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {	2362 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {

2363 LoadHTML("<body style='min-height:1000px;'></body>");	2363 LoadHTML("<body style='min-height:1000px;'></body>");

2364	2364

2365 blink::WebDeviceEmulationParams params;	2365 blink::WebDeviceEmulationParams params;

2366 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");	2366 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");

2367 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");	2367 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");

2368 int width, height;	2368 int width, height;

2369	2369

(...skipping 13 matching lines...) Expand all Loading...
2383 EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_height, &height));	2383 EXPECT_TRUE(ExecuteJavaScriptAndReturnIntValue(get_height, &height));

2384 EXPECT_EQ(params.viewSize.height, height);	2384 EXPECT_EQ(params.viewSize.height, height);

2385	2385

2386 view()->DisableScreenMetricsEmulation();	2386 view()->DisableScreenMetricsEmulation();

2387	2387

2388 view()->EnableScreenMetricsEmulation(params);	2388 view()->EnableScreenMetricsEmulation(params);

2389 // Don't disable here to test that emulation is being shutdown properly.	2389 // Don't disable here to test that emulation is being shutdown properly.

2390 }	2390 }

2391	2391

2392 } // namespace content	2392 } // namespace content

OLD	NEW