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 <stddef.h> | 5 #include <stddef.h> |
6 #include <stdint.h> | 6 #include <stdint.h> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2645 blink::WebRect rect(20, 10, 200, 100); | 2645 blink::WebRect rect(20, 10, 200, 100); |
2646 view()->convertViewportToWindow(&rect); | 2646 view()->convertViewportToWindow(&rect); |
2647 EXPECT_EQ(10, rect.x); | 2647 EXPECT_EQ(10, rect.x); |
2648 EXPECT_EQ(5, rect.y); | 2648 EXPECT_EQ(5, rect.y); |
2649 EXPECT_EQ(100, rect.width); | 2649 EXPECT_EQ(100, rect.width); |
2650 EXPECT_EQ(50, rect.height); | 2650 EXPECT_EQ(50, rect.height); |
2651 } | 2651 } |
2652 } | 2652 } |
2653 | 2653 |
2654 #if defined(OS_MACOSX) || defined(USE_AURA) | 2654 #if defined(OS_MACOSX) || defined(USE_AURA) |
2655 TEST_F(RenderViewImplScaleFactorTest, GetCompositionCharacterBoundsTest) { | 2655 TEST_F(RenderViewImplScaleFactorTest, |
| 2656 DISABLED_GetCompositionCharacterBoundsTest) { // http://crbug.com/582016 |
2656 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 2657 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
2657 switches::kEnableUseZoomForDSF); | 2658 switches::kEnableUseZoomForDSF); |
2658 DoSetUp(); | 2659 DoSetUp(); |
2659 SetDeviceScaleFactor(1.f); | 2660 SetDeviceScaleFactor(1.f); |
2660 #if defined(OS_WIN) | 2661 #if defined(OS_WIN) |
2661 // http://crbug.com/508747 | 2662 // http://crbug.com/508747 |
2662 if (base::win::GetVersion() >= base::win::VERSION_WIN10) | 2663 if (base::win::GetVersion() >= base::win::VERSION_WIN10) |
2663 return; | 2664 return; |
2664 #endif | 2665 #endif |
2665 | 2666 |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2749 FROM_HERE, | 2750 FROM_HERE, |
2750 base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this))); | 2751 base::Bind(&DevToolsAgentTest::CloseWhilePaused, base::Unretained(this))); |
2751 ExecuteJavaScriptForTests("debugger;"); | 2752 ExecuteJavaScriptForTests("debugger;"); |
2752 | 2753 |
2753 // CloseWhilePaused should resume execution and continue here. | 2754 // CloseWhilePaused should resume execution and continue here. |
2754 EXPECT_FALSE(IsPaused()); | 2755 EXPECT_FALSE(IsPaused()); |
2755 Detach(); | 2756 Detach(); |
2756 } | 2757 } |
2757 | 2758 |
2758 } // namespace content | 2759 } // namespace content |
OLD | NEW |