content/browser/browser_plugin/browser_plugin_host_browsertest.cc - Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura.

Side by Side Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 131443007: aura: Remove old GL paths from RenderWidgetHostViewAura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: dcheck Created 6 years, 10 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 | « chrome/browser/apps/web_view_browsertest.cc ('k') | content/browser/renderer_host/input/touch_input_browsertest.cc » ('j') | content/renderer/gpu/compositor_output_surface.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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/command_line.h"	5 #include "base/command_line.h"

6 #include "base/memory/singleton.h"	6 #include "base/memory/singleton.h"

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

8 #include "base/strings/string_split.h"	8 #include "base/strings/string_split.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 877 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
888 const SkBitmap& expected_bitmap,	888 const SkBitmap& expected_bitmap,

889 bool *result,	889 bool *result,

890 bool succeed,	890 bool succeed,

891 const SkBitmap& bitmap) {	891 const SkBitmap& bitmap) {

892 *result = succeed;	892 *result = succeed;

893 if (succeed)	893 if (succeed)

894 CompareSkBitmaps(expected_bitmap, bitmap);	894 CompareSkBitmaps(expected_bitmap, bitmap);

895 callback.Run();	895 callback.Run();

896 }	896 }

897	897

898 // http://crbug.com/171744	898 // Mac: http://crbug.com/171744

899 #if defined(OS_MACOSX)	899 // Under ubercomp, GetBackingStore is not possible in the guest renderer.

	900 #if defined(OS_MACOSX) \|\| defined(USE_AURA)

900 #define MAYBE_GetBackingStore DISABLED_GetBackingStore	901 #define MAYBE_GetBackingStore DISABLED_GetBackingStore

901 #else	902 #else

902 #define MAYBE_GetBackingStore GetBackingStore	903 #define MAYBE_GetBackingStore GetBackingStore

903 #endif	904 #endif

904 IN_PROC_BROWSER_TEST_F(BrowserPluginThreadedCompositorPixelTest,	905 IN_PROC_BROWSER_TEST_F(BrowserPluginThreadedCompositorPixelTest,

905 MAYBE_GetBackingStore) {	906 MAYBE_GetBackingStore) {

906 const char kEmbedderURL[] = "/browser_plugin_embedder.html";	907 const char kEmbedderURL[] = "/browser_plugin_embedder.html";

907 const char kHTMLForGuest[] =	908 const char kHTMLForGuest[] =

908 "data:text/html,<html><style>body { background-color: red; }</style>"	909 "data:text/html,<html><style>body { background-color: red; }</style>"

909 "<body></body></html>";	910 "<body></body></html>";

(...skipping 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1034 scoped_ptr<base::Value> value =	1035 scoped_ptr<base::Value> value =

1035 content::ExecuteScriptAndGetValue(	1036 content::ExecuteScriptAndGetValue(

1036 guest_rvh, "document.getElementById('input1').value");	1037 guest_rvh, "document.getElementById('input1').value");

1037 std::string actual_value;	1038 std::string actual_value;

1038 ASSERT_TRUE(value->GetAsString(&actual_value));	1039 ASSERT_TRUE(value->GetAsString(&actual_value));

1039 EXPECT_EQ(base::UTF16ToUTF8(expected_value), actual_value);	1040 EXPECT_EQ(base::UTF16ToUTF8(expected_value), actual_value);

1040 }	1041 }

1041 }	1042 }

1042	1043

1043 } // namespace content	1044 } // namespace content

OLD	NEW