Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

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
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2318 matching lines...) Expand 10 before | Expand all | Expand 10 after
2329 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource); 2329 request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
2330 blink::WebURLResponse redirect_response; 2330 blink::WebURLResponse redirect_response;
2331 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response); 2331 frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
2332 extra_data = static_cast<RequestExtraData*>(request.extraData()); 2332 extra_data = static_cast<RequestExtraData*>(request.extraData());
2333 ASSERT_TRUE(extra_data); 2333 ASSERT_TRUE(extra_data);
2334 EXPECT_EQ(extra_data->service_worker_provider_id(), 2334 EXPECT_EQ(extra_data->service_worker_provider_id(),
2335 provider->provider_id()); 2335 provider->provider_id());
2336 } 2336 }
2337 2337
2338 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) { 2338 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
2339 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode()); 2339 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2340 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2340 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2341 2341
2342 view()->OnSetAccessibilityMode(AccessibilityModeTreeOnly); 2342 frame()->OnSetAccessibilityMode(AccessibilityModeTreeOnly);
2343 ASSERT_EQ(AccessibilityModeTreeOnly, view()->accessibility_mode()); 2343 ASSERT_EQ(AccessibilityModeTreeOnly, frame()->accessibility_mode());
2344 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2344 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2345 ASSERT_EQ(RendererAccessibilityTypeComplete, 2345 ASSERT_EQ(RendererAccessibilityTypeComplete,
2346 view()->renderer_accessibility()->GetType()); 2346 frame()->renderer_accessibility()->GetType());
2347 2347
2348 view()->OnSetAccessibilityMode(AccessibilityModeOff); 2348 frame()->OnSetAccessibilityMode(AccessibilityModeOff);
2349 ASSERT_EQ(AccessibilityModeOff, view()->accessibility_mode()); 2349 ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
2350 ASSERT_EQ((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2350 ASSERT_EQ((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2351 2351
2352 view()->OnSetAccessibilityMode(AccessibilityModeComplete); 2352 frame()->OnSetAccessibilityMode(AccessibilityModeComplete);
2353 ASSERT_EQ(AccessibilityModeComplete, view()->accessibility_mode()); 2353 ASSERT_EQ(AccessibilityModeComplete, frame()->accessibility_mode());
2354 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2354 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2355 ASSERT_EQ(RendererAccessibilityTypeComplete, 2355 ASSERT_EQ(RendererAccessibilityTypeComplete,
2356 view()->renderer_accessibility()->GetType()); 2356 frame()->renderer_accessibility()->GetType());
2357 2357
2358 view()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly); 2358 frame()->OnSetAccessibilityMode(AccessibilityModeEditableTextOnly);
2359 ASSERT_EQ(AccessibilityModeEditableTextOnly, view()->accessibility_mode()); 2359 ASSERT_EQ(AccessibilityModeEditableTextOnly, frame()->accessibility_mode());
2360 ASSERT_NE((RendererAccessibility*) NULL, view()->renderer_accessibility()); 2360 ASSERT_NE((RendererAccessibility*) NULL, frame()->renderer_accessibility());
2361 ASSERT_EQ(RendererAccessibilityTypeFocusOnly, 2361 ASSERT_EQ(RendererAccessibilityTypeFocusOnly,
2362 view()->renderer_accessibility()->GetType()); 2362 frame()->renderer_accessibility()->GetType());
2363 } 2363 }
2364 2364
2365 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) { 2365 TEST_F(RenderViewImplTest, ScreenMetricsEmulation) {
2366 LoadHTML("<body style='min-height:1000px;'></body>"); 2366 LoadHTML("<body style='min-height:1000px;'></body>");
2367 2367
2368 blink::WebDeviceEmulationParams params; 2368 blink::WebDeviceEmulationParams params;
2369 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)"); 2369 base::string16 get_width = base::ASCIIToUTF16("Number(window.innerWidth)");
2370 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)"); 2370 base::string16 get_height = base::ASCIIToUTF16("Number(window.innerHeight)");
2371 int width, height; 2371 int width, height;
2372 2372
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
2432 ProcessPendingMessages(); 2432 ProcessPendingMessages();
2433 base::Time after_navigation = 2433 base::Time after_navigation =
2434 base::Time::Now() + base::TimeDelta::FromDays(1); 2434 base::Time::Now() + base::TimeDelta::FromDays(1);
2435 2435
2436 base::Time late_nav_reported_start = 2436 base::Time late_nav_reported_start =
2437 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart()); 2437 base::Time::FromDoubleT(GetMainFrame()->performance().navigationStart());
2438 EXPECT_LE(late_nav_reported_start, after_navigation); 2438 EXPECT_LE(late_nav_reported_start, after_navigation);
2439 } 2439 }
2440 2440
2441 } // namespace content 2441 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698