diff options
Diffstat (limited to 'chromium/ui')
28 files changed, 72 insertions, 52 deletions
diff --git a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_bn.xtb b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_bn.xtb index e34e49d76fe..32630f2641e 100644 --- a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_bn.xtb +++ b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_bn.xtb @@ -26,7 +26,7 @@ <translation id="3812541808639806898">বৈকল্পিক পাঠ্য প্রদর্শক ছবি</translation> <translation id="381767806621926835">কোনো "longdesc" বা "aria-describedat" অ্যাট্রিবিউটগুলির সাথে যেকোনো কিছুর উপর ডান-ক্লিক করুন৷</translation> <translation id="4023902424053835668">তীর চিহ্নগুলি ব্যবহার করে ওয়েব পৃষ্ঠাগুলির পাঠ্য ব্রাউজ করুন৷</translation> -<translation id="4388820049312272371">একটি দ্রুত ফ্ল্যাশের সাথে কার্সারের অবস্থান হাইলাইট করুন৷</translation> +<translation id="4388820049312272371">একটি দ্রুত ফ্ল্যাশের সাথে কার্সারের লোকেশন হাইলাইট করুন৷</translation> <translation id="4394049700291259645">অক্ষম</translation> <translation id="4769065380738716500">চিত্রগুলিকে তাদের বিকল্প পাঠ্যের দ্বারা প্রতিস্থাপিত করা হয়েছে৷</translation> <translation id="4896660567607030658">কোনো প্রতিক্রিয়া নেই, শুধুমাত্র কার্সার প্রদর্শন করুন৷</translation> @@ -34,7 +34,7 @@ <translation id="4954450790315188152">যখন ক্যারেট ব্রাউজিং সক্ষম করা থাকবে:</translation> <translation id="5041932793799765940">রঙের সমন্বয়</translation> <translation id="5094574508723441140">বর্ধিত কনট্রাস্ট</translation> -<translation id="5173942593318174089">কোনো অ্যানিমেশনের সাথে কার্সারের অবস্থান হাইলাইট করুন৷</translation> +<translation id="5173942593318174089">কোনো অ্যানিমেশনের সাথে কার্সারের লোকেশন হাইলাইট করুন৷</translation> <translation id="5287723860611749454"><p>দস্তাবেজটি বরাবর সরাতে নির্দেশক তীরচিহ্নগুলি ব্যবহার করুন৷ </p><p>সেই অবস্থানে কার্সার সরাতে যেকোনো স্থানে ক্লিক করুন৷ </p> <p> পাঠ্য নির্বাচন করতে <span class='key'>Shift</span> + তীরচিহ্নগুলি টিপুন৷</translation> <translation id="5331422999063554397">ইনভার্টেড রঙ</translation> <translation id="5555153510860501336">উচ্চ কনট্রাস্ট অক্ষম রয়েছে</translation> diff --git a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_mr.xtb b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_mr.xtb index a15ee0b6b70..6fa25569fc4 100644 --- a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_mr.xtb +++ b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_mr.xtb @@ -2,11 +2,11 @@ <!DOCTYPE translationbundle> <translationbundle lang="mr"> <translation id="1287053896835709737">काळ्यावर पिवळे</translation> -<translation id="1408730541890277710">त्यांच्या वैकल्पिक मजकूरासह प्रतिमा बदला.</translation> +<translation id="1408730541890277710">त्यांच्या वैकल्पिक मजकूरासह इमेज बदला.</translation> <translation id="145360476452865422">अॅनिमेशन धोरण:</translation> <translation id="1555130319947370107">निळा</translation> <translation id="1588438908519853928">सामान्य</translation> -<translation id="1591070050619849194">सर्व प्रतिमा अॅनिमेशन अक्षम करा</translation> +<translation id="1591070050619849194">सर्व इमेज अॅनिमेशन अक्षम करा</translation> <translation id="1703735871906654364">कॅरेट ब्राउझिंग</translation> <translation id="1791496371305830581">सर्व अॅनिमेटेड प्रतिमांना अनुमती द्या.</translation> <translation id="1996252509865389616">सक्षम करायचे?</translation> @@ -23,16 +23,16 @@ <translation id="3410969471888629217">साइट सानुकूलने विसरा</translation> <translation id="3435896845095436175">सक्षम करा</translation> <translation id="3622586652998721735">डीफॉल्ट योजना म्हणून सेट करा</translation> -<translation id="3812541808639806898">प्रतिमा Alt मजकूर दर्शक</translation> +<translation id="3812541808639806898">इमेज Alt मजकूर दर्शक</translation> <translation id="381767806621926835">त्याच्या मोठ्या वर्णनावर प्रवेश करण्यासाठी "longdesc" किंवा "aria-describedat" विशेषतेसह कशावरही उजवीकडे-क्लिक करा.</translation> <translation id="4023902424053835668">बाण की चा वापर करून वेबपृष्ठांचा मजकूर ब्राऊझ करा.</translation> <translation id="4388820049312272371">द्रुत फ्लॅशने कर्सर स्थिती हायलाइट करा.</translation> <translation id="4394049700291259645">अक्षम करा</translation> -<translation id="4769065380738716500">प्रतिमा त्यांच्या alt मजकूराद्वारे पुनर्स्थित केल्या गेल्या आहेत.</translation> +<translation id="4769065380738716500">इमेज त्यांच्या alt मजकूराद्वारे पुनर्स्थित केल्या गेल्या आहेत.</translation> <translation id="4896660567607030658">अभिप्राय नाही, फक्त कर्सर दर्शवा</translation> <translation id="4937901943818762779">अॅनिमेटेड प्रतिमांना, केवळ एकदाच अनुमती द्या.</translation> <translation id="4954450790315188152">कॅरेट ब्राउझिंग सक्षम केले असते तेव्हा:</translation> -<translation id="5041932793799765940">रंग समायोजन</translation> +<translation id="5041932793799765940">रंग अॅडजस्टमेंट</translation> <translation id="5094574508723441140">वाढविलेली तीव्रता</translation> <translation id="5173942593318174089">अॅनिमेशनसह कर्सर स्थिती हायलाइट करा.</translation> <translation id="5287723860611749454"><p>संपूर्ण दस्तऐवजामधून हलविण्यासाठी बाण की चा वापर करा. </p><p>त्या स्थानावर कर्सर हलविण्यासाठी कुठेही क्लिक करा. </p> <p> मजकूर निवडण्यासाठी <span class='key'>Shift</span> + बाण दाबा.</p></translation> diff --git a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_sw.xtb b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_sw.xtb index 1a394f503d4..29780e4ec83 100644 --- a/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_sw.xtb +++ b/chromium/ui/accessibility/extensions/strings/accessibility_extensions_strings_sw.xtb @@ -22,7 +22,7 @@ <translation id="3252573918265662711">Usanidi</translation> <translation id="3410969471888629217">Sahau ugeuzaji wa tovuti ili zikufae</translation> <translation id="3435896845095436175">Washa</translation> -<translation id="3622586652998721735">Weka uwe mpango chaguo-msingi</translation> +<translation id="3622586652998721735">Weka uwe mpango chaguo msingi</translation> <translation id="3812541808639806898">Kitazamaji cha Maandishi ya Alt ya Picha</translation> <translation id="381767806621926835">Bofya kulia kwenye kitu chochote kilicho na kipengele cha "longdesc" au "aria-describedat" ili kufikia maelezo yake marefu.</translation> <translation id="4023902424053835668">Vinjari maandishi ya kurasa za wavuti ukitumia vitufe vya vishale.</translation> diff --git a/chromium/ui/android/delegated_frame_host_android.cc b/chromium/ui/android/delegated_frame_host_android.cc index cea1307c5eb..31e31c71f9c 100644 --- a/chromium/ui/android/delegated_frame_host_android.cc +++ b/chromium/ui/android/delegated_frame_host_android.cc @@ -120,21 +120,23 @@ void DelegatedFrameHostAndroid::CopyFromCompositingSurface( return; } - WindowAndroidCompositor* compositor = - view_->GetWindowAndroid()->GetCompositor(); - compositor->IncrementReadbackRequestCount(); + scoped_refptr<cc::Layer> readback_layer = + CreateSurfaceLayer(surface_info_.id(), surface_info_.size_in_pixels(), + !has_transparent_background_); + readback_layer->SetHideLayerAndSubtree(true); + view_->GetWindowAndroid()->GetCompositor()->AttachLayerForReadback( + readback_layer); std::unique_ptr<viz::CopyOutputRequest> request = std::make_unique<viz::CopyOutputRequest>( viz::CopyOutputRequest::ResultFormat::RGBA_BITMAP, base::BindOnce( [](base::OnceCallback<void(const SkBitmap&)> callback, - base::WeakPtr<WindowAndroidCompositor> compositor_weak_ptr, + scoped_refptr<cc::Layer> readback_layer, std::unique_ptr<viz::CopyOutputResult> result) { - if (compositor_weak_ptr) - compositor_weak_ptr->DecrementReadbackRequestCount(); + readback_layer->RemoveFromParent(); std::move(callback).Run(result->AsSkBitmap()); }, - std::move(callback), compositor->GetWeakPtr())); + std::move(callback), std::move(readback_layer))); if (src_subrect.IsEmpty()) { request->set_area(gfx::Rect(surface_info_.size_in_pixels())); diff --git a/chromium/ui/android/delegated_frame_host_android_unittest.cc b/chromium/ui/android/delegated_frame_host_android_unittest.cc index fc0c6c4b95d..9ba18560e82 100644 --- a/chromium/ui/android/delegated_frame_host_android_unittest.cc +++ b/chromium/ui/android/delegated_frame_host_android_unittest.cc @@ -37,9 +37,7 @@ class MockDelegatedFrameHostAndroidClient class MockWindowAndroidCompositor : public WindowAndroidCompositor { public: - MOCK_METHOD0(GetWeakPtr, base::WeakPtr<ui::WindowAndroidCompositor>()); - MOCK_METHOD0(IncrementReadbackRequestCount, void()); - MOCK_METHOD0(DecrementReadbackRequestCount, void()); + MOCK_METHOD1(AttachLayerForReadback, void(scoped_refptr<cc::Layer>)); MOCK_METHOD1(DoRequestCopyOfOutputOnRootLayer, void(viz::CopyOutputRequest*)); MOCK_METHOD0(SetNeedsAnimate, void()); MOCK_METHOD0(GetResourceManager, ResourceManager&()); diff --git a/chromium/ui/android/window_android_compositor.h b/chromium/ui/android/window_android_compositor.h index 740e69e8486..7446d2a4932 100644 --- a/chromium/ui/android/window_android_compositor.h +++ b/chromium/ui/android/window_android_compositor.h @@ -7,12 +7,15 @@ #include <memory> -#include "base/memory/weak_ptr.h" #include "components/viz/common/frame_sinks/copy_output_request.h" #include "components/viz/common/surfaces/frame_sink_id.h" #include "ui/android/ui_android_export.h" #include "ui/compositor/compositor_lock.h" +namespace cc { +class Layer; +} + namespace ui { class ResourceManager; @@ -22,9 +25,7 @@ class UI_ANDROID_EXPORT WindowAndroidCompositor { public: virtual ~WindowAndroidCompositor() {} - virtual base::WeakPtr<WindowAndroidCompositor> GetWeakPtr() = 0; - virtual void IncrementReadbackRequestCount() = 0; - virtual void DecrementReadbackRequestCount() = 0; + virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) = 0; virtual void RequestCopyOfOutputOnRootLayer( std::unique_ptr<viz::CopyOutputRequest> request) = 0; virtual void SetNeedsAnimate() = 0; diff --git a/chromium/ui/base/material_design/material_design_controller.cc b/chromium/ui/base/material_design/material_design_controller.cc index 5abb641690c..d5522971fc4 100644 --- a/chromium/ui/base/material_design/material_design_controller.cc +++ b/chromium/ui/base/material_design/material_design_controller.cc @@ -37,7 +37,7 @@ namespace { // Whether to use MATERIAL_TOUCH_OPTIMIZED when a touch device is detected. // Enabled by default on ChromeOS. const base::Feature kTouchOptimizedUi = {"TouchOptimizedUi", - base::FEATURE_ENABLED_BY_DEFAULT}; + base::FEATURE_DISABLED_BY_DEFAULT}; MaterialDesignController::Mode GetDefaultTouchDeviceMode() { return base::FeatureList::IsEnabled(kTouchOptimizedUi) diff --git a/chromium/ui/display/display_switches.cc b/chromium/ui/display/display_switches.cc index 880fba64afe..72da86a7ee2 100644 --- a/chromium/ui/display/display_switches.cc +++ b/chromium/ui/display/display_switches.cc @@ -76,13 +76,7 @@ const base::Feature kUseMonitorColorSpace{"UseMonitorColorSpace", // TODO(malaykeshav): Remove this in M68 when the feature has been in stable for // atleast one milestone. constexpr base::Feature kEnableDisplayZoomSetting{ - "EnableDisplayZoomSetting", -#if defined(OS_CHROMEOS) - base::FEATURE_ENABLED_BY_DEFAULT -#else - base::FEATURE_DISABLED_BY_DEFAULT -#endif -}; + "EnableDisplayZoomSetting", base::FEATURE_DISABLED_BY_DEFAULT}; bool IsDisplayZoomSettingEnabled() { return base::FeatureList::IsEnabled(kEnableDisplayZoomSetting); diff --git a/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator.cc b/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator.cc index d0a82568e4a..186f4cc7cb7 100644 --- a/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator.cc +++ b/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator.cc @@ -32,8 +32,10 @@ scoped_refptr<ScanoutBuffer> GetBufferForPageFlipTest( } } + const std::vector<uint64_t> + modifiers; // TODO(dcastagna): use the right modifiers. scoped_refptr<ScanoutBuffer> scanout_buffer = - buffer_generator->Create(drm_device, format, size); + buffer_generator->Create(drm_device, format, modifiers, size); if (scanout_buffer) reusable_buffers->push_back(scanout_buffer); diff --git a/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc b/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc index 3b3642b8d88..31fc4af5cbf 100644 --- a/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc +++ b/chromium/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc @@ -134,7 +134,7 @@ void DrmOverlayValidatorTest::AddPlane(const ui::OverlayCheck_Params& params) { scoped_refptr<ui::DrmDevice> drm = window_->GetController()->GetAllocationDrmDevice(); scoped_refptr<ui::ScanoutBuffer> scanout_buffer = buffer_generator_->Create( - drm, ui::GetFourCCFormatFromBufferFormat(params.format), + drm, ui::GetFourCCFormatFromBufferFormat(params.format), {}, params.buffer_size); ui::OverlayPlane plane(std::move(scanout_buffer), params.plane_z_order, params.transform, params.display_rect, diff --git a/chromium/ui/ozone/platform/drm/gpu/drm_thread.cc b/chromium/ui/ozone/platform/drm/gpu/drm_thread.cc index 6e187761ea9..d53e4acf1be 100644 --- a/chromium/ui/ozone/platform/drm/gpu/drm_thread.cc +++ b/chromium/ui/ozone/platform/drm/gpu/drm_thread.cc @@ -41,10 +41,15 @@ class GbmBufferGenerator : public ScanoutBufferGenerator { // ScanoutBufferGenerator: scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) override { scoped_refptr<GbmDevice> gbm(static_cast<GbmDevice*>(drm.get())); - // TODO(dcastagna): Use GBM_BO_USE_MAP modifier once minigbm exposes it. - return GbmBuffer::CreateBuffer(gbm, format, size, GBM_BO_USE_SCANOUT); + if (modifiers.size() > 0) { + return GbmBuffer::CreateBufferWithModifiers( + gbm, format, size, GBM_BO_USE_SCANOUT, modifiers); + } else { + return GbmBuffer::CreateBuffer(gbm, format, size, GBM_BO_USE_SCANOUT); + } } protected: diff --git a/chromium/ui/ozone/platform/drm/gpu/drm_window_unittest.cc b/chromium/ui/ozone/platform/drm/gpu/drm_window_unittest.cc index 40a207ec1c3..0fa311fbfe4 100644 --- a/chromium/ui/ozone/platform/drm/gpu/drm_window_unittest.cc +++ b/chromium/ui/ozone/platform/drm/gpu/drm_window_unittest.cc @@ -175,7 +175,7 @@ TEST_F(DrmWindowTest, CheckCallbackOnFailedSwap) { ui::MockDumbBufferGenerator buffer_generator; ui::DrmWindow* window = screen_manager_->GetWindow(kDefaultWidgetHandle); ui::OverlayPlane plane( - buffer_generator.Create(drm_, DRM_FORMAT_XRGB8888, window_size), + buffer_generator.Create(drm_, DRM_FORMAT_XRGB8888, {}, window_size), base::kInvalidPlatformFile); drm_->set_page_flip_expectation(false); diff --git a/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.cc b/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.cc index d6d0cf7efd1..0276dea0317 100644 --- a/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.cc +++ b/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.cc @@ -16,6 +16,7 @@ MockDumbBufferGenerator::~MockDumbBufferGenerator() {} scoped_refptr<ScanoutBuffer> MockDumbBufferGenerator::Create( const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) { scoped_refptr<DrmBuffer> buffer(new DrmBuffer(drm)); SkImageInfo info = SkImageInfo::MakeN32Premul(size.width(), size.height()); diff --git a/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h b/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h index ecba7c761e9..f29f7e20ede 100644 --- a/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h +++ b/chromium/ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h @@ -19,6 +19,7 @@ class MockDumbBufferGenerator : public ScanoutBufferGenerator { // ScanoutBufferGenerator: scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) override; private: diff --git a/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.cc b/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.cc index 08cd50acd63..c934a1db040 100644 --- a/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.cc +++ b/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.cc @@ -16,8 +16,11 @@ MockScanoutBufferGenerator::~MockScanoutBufferGenerator() {} scoped_refptr<ScanoutBuffer> MockScanoutBufferGenerator::Create( const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) { - return CreateWithModifier(drm, format, DRM_FORMAT_MOD_NONE, size); + return CreateWithModifier( + drm, format, modifiers.empty() ? DRM_FORMAT_MOD_NONE : modifiers.front(), + size); } scoped_refptr<ScanoutBuffer> MockScanoutBufferGenerator::CreateWithModifier( diff --git a/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.h b/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.h index 2cb3161abaf..c904501b58b 100644 --- a/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.h +++ b/chromium/ui/ozone/platform/drm/gpu/mock_scanout_buffer_generator.h @@ -19,6 +19,7 @@ class MockScanoutBufferGenerator : public ScanoutBufferGenerator { // ScanoutBufferGenerator: scoped_refptr<ScanoutBuffer> Create(const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) override; scoped_refptr<ScanoutBuffer> CreateWithModifier( diff --git a/chromium/ui/ozone/platform/drm/gpu/scanout_buffer.h b/chromium/ui/ozone/platform/drm/gpu/scanout_buffer.h index b6b588562df..3d4f2c37f4b 100644 --- a/chromium/ui/ozone/platform/drm/gpu/scanout_buffer.h +++ b/chromium/ui/ozone/platform/drm/gpu/scanout_buffer.h @@ -61,6 +61,7 @@ class ScanoutBufferGenerator { virtual scoped_refptr<ScanoutBuffer> Create( const scoped_refptr<DrmDevice>& drm, uint32_t format, + const std::vector<uint64_t>& modifiers, const gfx::Size& size) = 0; }; diff --git a/chromium/ui/ozone/platform/drm/gpu/screen_manager.cc b/chromium/ui/ozone/platform/drm/gpu/screen_manager.cc index e8e477733e4..68cfa2a9735 100644 --- a/chromium/ui/ozone/platform/drm/gpu/screen_manager.cc +++ b/chromium/ui/ozone/platform/drm/gpu/screen_manager.cc @@ -351,7 +351,7 @@ OverlayPlane ScreenManager::GetModesetBuffer( gfx::BufferFormat format = display::DisplaySnapshot::PrimaryFormat(); uint32_t fourcc_format = ui::GetFourCCFormatForOpaqueFramebuffer(format); - + const auto& modifiers = controller->GetFormatModifiers(fourcc_format); if (window) { const OverlayPlane* primary = window->GetLastModesetBuffer(); const DrmDevice* drm = controller->GetAllocationDrmDevice().get(); @@ -361,7 +361,6 @@ OverlayPlane ScreenManager::GetModesetBuffer( // modifier either and we can reuse the buffer. Otherwise, check // to see if the controller supports the buffers format // modifier. - const auto& modifiers = controller->GetFormatModifiers(fourcc_format); if (modifiers.empty()) return *primary; for (const uint64_t modifier : modifiers) { @@ -373,7 +372,7 @@ OverlayPlane ScreenManager::GetModesetBuffer( scoped_refptr<DrmDevice> drm = controller->GetAllocationDrmDevice(); scoped_refptr<ScanoutBuffer> buffer = - buffer_generator_->Create(drm, fourcc_format, bounds.size()); + buffer_generator_->Create(drm, fourcc_format, modifiers, bounds.size()); if (!buffer) { LOG(ERROR) << "Failed to create scanout buffer"; return OverlayPlane(nullptr, 0, gfx::OVERLAY_TRANSFORM_INVALID, gfx::Rect(), diff --git a/chromium/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc b/chromium/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc index a50a0ac275a..24c7bdd0fec 100644 --- a/chromium/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc +++ b/chromium/ui/ozone/platform/drm/gpu/screen_manager_unittest.cc @@ -498,8 +498,9 @@ TEST_F(ScreenManagerTest, EnableControllerWhenWindowHasBuffer) { new ui::DrmWindow(1, device_manager_.get(), screen_manager_.get())); window->Initialize(buffer_generator_.get()); window->SetBounds(GetPrimaryBounds()); + scoped_refptr<ui::ScanoutBuffer> buffer = buffer_generator_->Create( - drm_, DRM_FORMAT_XRGB8888, GetPrimaryBounds().size()); + drm_, DRM_FORMAT_XRGB8888, {}, GetPrimaryBounds().size()); window->SchedulePageFlip( std::vector<ui::OverlayPlane>( 1, ui::OverlayPlane(buffer, base::kInvalidPlatformFile)), diff --git a/chromium/ui/strings/translations/ui_strings_fa.xtb b/chromium/ui/strings/translations/ui_strings_fa.xtb index a1973a57996..0033ecf5b90 100644 --- a/chromium/ui/strings/translations/ui_strings_fa.xtb +++ b/chromium/ui/strings/translations/ui_strings_fa.xtb @@ -101,7 +101,7 @@ <translation id="6022924867608035986">پاک کردن نوشتار کادر جستجو</translation> <translation id="6040143037577758943">بستن</translation> <translation id="6119846243427417423">فعالسازی</translation> -<translation id="6129953537138746214">فضا</translation> +<translation id="6129953537138746214">فاصله</translation> <translation id="6135826906199951471">حذف</translation> <translation id="6142413573757616983"><ph name="QUANTITY" /> بایت/ثانیه</translation> <translation id="6156262341071374681">بزرگ کردن برای مشاهده همه برنامهها</translation> diff --git a/chromium/ui/strings/translations/ui_strings_mr.xtb b/chromium/ui/strings/translations/ui_strings_mr.xtb index 88b069f7341..deb9ca502c5 100644 --- a/chromium/ui/strings/translations/ui_strings_mr.xtb +++ b/chromium/ui/strings/translations/ui_strings_mr.xtb @@ -40,7 +40,7 @@ <translation id="2497284189126895209">सर्व फाइल</translation> <translation id="2522350507219695259">कॅलिब्रेशन पूर्ण झाले</translation> <translation id="252373100621549798">अज्ञात प्रदर्शन</translation> -<translation id="2583543531130364912">आपली टचस्क्रीन कॅलिब्रेट करा</translation> +<translation id="2583543531130364912">तुमची टचस्क्रीन कॅलिब्रेट करा</translation> <translation id="2666092431469916601">शीर्ष</translation> <translation id="2743387203779672305">क्लिपबोर्डवर कॉपी करा</translation> <translation id="2803313416453193357">फोल्डर उघडा</translation> diff --git a/chromium/ui/strings/translations/ui_strings_pt-BR.xtb b/chromium/ui/strings/translations/ui_strings_pt-BR.xtb index 81faabeb213..c0a02b87213 100644 --- a/chromium/ui/strings/translations/ui_strings_pt-BR.xtb +++ b/chromium/ui/strings/translations/ui_strings_pt-BR.xtb @@ -86,7 +86,7 @@ <translation id="5266161281976477809">Triângulo de divulgação</translation> <translation id="528468243742722775">End</translation> <translation id="5329858601952122676">&Excluir</translation> -<translation id="5463830097259460683">Emoticons e símbolos</translation> +<translation id="5463830097259460683">Emojis e símbolos</translation> <translation id="5476505524087279545">desmarcar</translation> <translation id="5574202486608032840">Sistema <ph name="IDS_SHORT_PRODUCT_OS_NAME" /></translation> <translation id="5583640892426849032">Backspace</translation> @@ -138,7 +138,7 @@ <translation id="7389409599945284130">- <ph name="MESSAGE" /></translation> <translation id="7410957453383678442">{MINUTES,plural, =1{Um minuto restante}one{# minutos restantes}other{# minutos restantes}}</translation> <translation id="7460907917090416791"><ph name="QUANTITY" /> TB</translation> -<translation id="7507604095951736240">Emoticons</translation> +<translation id="7507604095951736240">Emojis</translation> <translation id="7658239707568436148">Cancelar</translation> <translation id="7781829728241885113">Ontem</translation> <translation id="7814458197256864873">Co&piar</translation> diff --git a/chromium/ui/views/animation/ink_drop_host_view.cc b/chromium/ui/views/animation/ink_drop_host_view.cc index 8a60f37c9fb..922600f1375 100644 --- a/chromium/ui/views/animation/ink_drop_host_view.cc +++ b/chromium/ui/views/animation/ink_drop_host_view.cc @@ -297,9 +297,12 @@ InkDrop* InkDropHostView::GetInkDrop() { } void InkDropHostView::InstallInkDropMask(ui::Layer* ink_drop_layer) { +// Layer masks don't work on Windows. See crbug.com/713359 +#if !defined(OS_WIN) ink_drop_mask_ = CreateInkDropMask(); if (ink_drop_mask_) ink_drop_layer->SetMaskLayer(ink_drop_mask_->layer()); +#endif } void InkDropHostView::ResetInkDropMask() { diff --git a/chromium/ui/views/controls/native/native_view_host_aura.cc b/chromium/ui/views/controls/native/native_view_host_aura.cc index 420b005a433..28033ad99d5 100644 --- a/chromium/ui/views/controls/native/native_view_host_aura.cc +++ b/chromium/ui/views/controls/native/native_view_host_aura.cc @@ -149,12 +149,17 @@ void NativeViewHostAura::RemovedFromWidget() { } bool NativeViewHostAura::SetCornerRadius(int corner_radius) { +#if defined(OS_WIN) + // Layer masks don't work on Windows. See crbug.com/713359 + return false; +#else mask_ = views::Painter::CreatePaintedLayer( views::Painter::CreateSolidRoundRectPainter(SK_ColorBLACK, corner_radius)); mask_->layer()->SetFillsBoundsOpaquely(false); InstallMask(); return true; +#endif } void NativeViewHostAura::InstallClip(int x, int y, int w, int h) { diff --git a/chromium/ui/views/controls/textfield/textfield.cc b/chromium/ui/views/controls/textfield/textfield.cc index 6cd683a7ee9..82cdf5b8669 100644 --- a/chromium/ui/views/controls/textfield/textfield.cc +++ b/chromium/ui/views/controls/textfield/textfield.cc @@ -1749,8 +1749,8 @@ gfx::RenderText* Textfield::GetRenderText() const { return model_->render_text(); } -gfx::Point Textfield::GetLastClickLocation() const { - return selection_controller_.last_click_location(); +gfx::Point Textfield::GetLastClickRootLocation() const { + return selection_controller_.last_click_root_location(); } base::string16 Textfield::GetSelectionClipboardText() const { diff --git a/chromium/ui/views/controls/textfield/textfield.h b/chromium/ui/views/controls/textfield/textfield.h index 9c4b28d689f..8f26353fa19 100644 --- a/chromium/ui/views/controls/textfield/textfield.h +++ b/chromium/ui/views/controls/textfield/textfield.h @@ -366,7 +366,8 @@ class VIEWS_EXPORT Textfield : public View, // Returns the TextfieldModel's text/cursor/selection rendering model. gfx::RenderText* GetRenderText() const; - gfx::Point GetLastClickLocation() const; + // Returns the last click root location (relative to the root window). + gfx::Point GetLastClickRootLocation() const; // Get the text from the selection clipboard. virtual base::string16 GetSelectionClipboardText() const; diff --git a/chromium/ui/views/selection_controller.cc b/chromium/ui/views/selection_controller.cc index b4a3a403932..61d83ff3750 100644 --- a/chromium/ui/views/selection_controller.cc +++ b/chromium/ui/views/selection_controller.cc @@ -165,7 +165,7 @@ void SelectionController::TrackMouseClicks(const ui::MouseEvent& event) { if (!last_click_time_.is_null() && time_delta.InMilliseconds() <= GetDoubleClickInterval() && !View::ExceededDragThreshold(event.root_location() - - last_click_location_)) { + last_click_root_location_)) { // Upon clicking after a triple click, the count should go back to // double click and alternate between double and triple. This assignment // maps 0 to 1, 1 to 2, 2 to 1. @@ -174,7 +174,7 @@ void SelectionController::TrackMouseClicks(const ui::MouseEvent& event) { aggregated_clicks_ = 0; } last_click_time_ = event.time_stamp(); - last_click_location_ = event.root_location(); + last_click_root_location_ = event.root_location(); } } diff --git a/chromium/ui/views/selection_controller.h b/chromium/ui/views/selection_controller.h index cb929fdd621..46ec0607d11 100644 --- a/chromium/ui/views/selection_controller.h +++ b/chromium/ui/views/selection_controller.h @@ -49,8 +49,10 @@ class VIEWS_EXPORT SelectionController { void OnMouseReleased(const ui::MouseEvent& event); void OnMouseCaptureLost(); - // Returns the latest click location. - const gfx::Point& last_click_location() const { return last_click_location_; } + // Returns the latest click location in root coordinates. + const gfx::Point& last_click_root_location() const { + return last_click_root_location_; + } // Sets whether the SelectionController should update or paste the // selection clipboard on middle-click. Default is false. @@ -86,7 +88,7 @@ class VIEWS_EXPORT SelectionController { // State variables used to track the last click time and location. base::TimeTicks last_click_time_; - gfx::Point last_click_location_; + gfx::Point last_click_root_location_; // Used to track double and triple clicks. Can take the values 0, 1 and 2 // which specify a single, double and triple click respectively. Alternates |