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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 315693002: Use WebViewClient instead of BlinkPlatform for screen lock. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: review comments Created 6 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 #include "core/rendering/FastTextAutosizer.h" 78 #include "core/rendering/FastTextAutosizer.h"
79 #include "core/rendering/RenderView.h" 79 #include "core/rendering/RenderView.h"
80 #include "core/rendering/RenderWidget.h" 80 #include "core/rendering/RenderWidget.h"
81 #include "core/rendering/TextAutosizer.h" 81 #include "core/rendering/TextAutosizer.h"
82 #include "core/rendering/compositing/RenderLayerCompositor.h" 82 #include "core/rendering/compositing/RenderLayerCompositor.h"
83 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" 83 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h"
84 #include "modules/encryptedmedia/MediaKeysController.h" 84 #include "modules/encryptedmedia/MediaKeysController.h"
85 #include "modules/geolocation/GeolocationController.h" 85 #include "modules/geolocation/GeolocationController.h"
86 #include "modules/indexeddb/InspectorIndexedDBAgent.h" 86 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
87 #include "modules/push_messaging/PushController.h" 87 #include "modules/push_messaging/PushController.h"
88 #include "modules/screen_orientation/ScreenOrientationController.h"
88 #include "platform/ContextMenu.h" 89 #include "platform/ContextMenu.h"
89 #include "platform/ContextMenuItem.h" 90 #include "platform/ContextMenuItem.h"
90 #include "platform/Cursor.h" 91 #include "platform/Cursor.h"
91 #include "platform/KeyboardCodes.h" 92 #include "platform/KeyboardCodes.h"
92 #include "platform/NotImplemented.h" 93 #include "platform/NotImplemented.h"
93 #include "platform/OverscrollTheme.h" 94 #include "platform/OverscrollTheme.h"
94 #include "platform/PlatformGestureEvent.h" 95 #include "platform/PlatformGestureEvent.h"
95 #include "platform/PlatformKeyboardEvent.h" 96 #include "platform/PlatformKeyboardEvent.h"
96 #include "platform/PlatformMouseEvent.h" 97 #include "platform/PlatformMouseEvent.h"
97 #include "platform/PlatformWheelEvent.h" 98 #include "platform/PlatformWheelEvent.h"
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); 428 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create());
428 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this )); 429 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this ));
429 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create()); 430 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create());
430 431
431 m_page->makeOrdinary(); 432 m_page->makeOrdinary();
432 433
433 if (m_client) { 434 if (m_client) {
434 providePushControllerTo(*m_page, m_client->webPushClient()); 435 providePushControllerTo(*m_page, m_client->webPushClient());
435 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor); 436 setDeviceScaleFactor(m_client->screenInfo().deviceScaleFactor);
436 setVisibilityState(m_client->visibilityState(), true); 437 setVisibilityState(m_client->visibilityState(), true);
438 if (RuntimeEnabledFeatures::screenOrientationEnabled())
439 ScreenOrientationController::provideTo(*m_page, m_client->webScreenO rientationClient());
437 } 440 }
438 441
439 m_inspectorSettingsMap = adoptPtr(new SettingsMap); 442 m_inspectorSettingsMap = adoptPtr(new SettingsMap);
440 } 443 }
441 444
442 WebViewImpl::~WebViewImpl() 445 WebViewImpl::~WebViewImpl()
443 { 446 {
444 ASSERT(!m_page); 447 ASSERT(!m_page);
445 } 448 }
446 449
(...skipping 3604 matching lines...) Expand 10 before | Expand all | Expand 10 after
4051 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4054 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4052 4055
4053 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4056 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4054 return false; 4057 return false;
4055 4058
4056 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4059 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4057 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4060 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4058 } 4061 }
4059 4062
4060 } // namespace blink 4063 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698