Changeset 271415 in webkit
- Timestamp:
- Jan 12, 2021, 2:07:59 PM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 14 edited
-
JavaScriptCore/API/JSLockRef.cpp (modified) (1 diff)
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/runtime/JSCJSValue.cpp (modified) (1 diff)
-
JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (modified) (1 diff)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
-
WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp (modified) (1 diff)
-
WebCore/dom/DocumentStorageAccess.cpp (modified) (1 diff)
-
WebCore/layout/inlineformatting/InlineContentBreaker.cpp (modified) (1 diff)
-
WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp (modified) (1 diff)
-
WebCore/page/Quirks.h (modified) (1 diff)
-
WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp (modified) (1 diff)
-
WebKit/ChangeLog (modified) (1 diff)
-
WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/JSLockRef.cpp
r270659 r271415 27 27 #include "JSLockRefPrivate.h" 28 28 29 #include "APICast.h" 29 30 #include "JSLock.h" 30 31 -
trunk/Source/JavaScriptCore/ChangeLog
r271373 r271415 1 2021-01-12 Don Olmstead <don.olmstead@sony.com> 2 3 Non-unified build fixes mid January 2021 edition 4 https://bugs.webkit.org/show_bug.cgi?id=220560 5 6 Unreviewed non-unified build fixes. 7 8 * API/JSLockRef.cpp: 9 * runtime/JSCJSValue.cpp: 10 * runtime/JSGlobalObjectFunctions.cpp: 11 1 12 2021-01-11 Devin Rousso <drousso@apple.com> 2 13 -
trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp
r271168 r271415 31 31 #include "JSCInlines.h" 32 32 #include "NumberObject.h" 33 #include "ParseInt.h" 33 34 #include "TypeError.h" 34 35 -
trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp
r271343 r271415 35 35 #include "JSModuleLoader.h" 36 36 #include "JSPromise.h" 37 #include "JSSet.h" 37 38 #include "Lexer.h" 38 39 #include "LiteralParser.h" -
trunk/Source/WebCore/ChangeLog
r271414 r271415 1 2021-01-12 Don Olmstead <don.olmstead@sony.com> 2 3 Non-unified build fixes mid January 2021 edition 4 https://bugs.webkit.org/show_bug.cgi?id=220560 5 6 Unreviewed non-unified build fixes. 7 8 * accessibility/AccessibilityObject.cpp: 9 * bindings/js/JSHTMLAllCollectionCustom.cpp: 10 * dom/DocumentStorageAccess.cpp: 11 * layout/inlineformatting/InlineContentBreaker.cpp: 12 * layout/inlineformatting/InlineFormattingContextQuirks.cpp: 13 * page/Quirks.h: 14 * platform/graphics/displaylists/DisplayListRecorder.cpp: 15 1 16 2021-01-12 Wenson Hsieh <wenson_hsieh@apple.com> 2 17 -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r270834 r271415 30 30 #include "AccessibilityObject.h" 31 31 32 #include "AXLogger.h" 32 33 #include "AXObjectCache.h" 33 34 #include "AccessibilityRenderObject.h" -
trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
r271137 r271415 32 32 #include "JSDOMConvertNullable.h" 33 33 #include "JSDOMConvertUnion.h" 34 #include "JSElement.h" 35 #include "JSHTMLCollection.h" 34 36 35 37 namespace WebCore { -
trunk/Source/WebCore/dom/DocumentStorageAccess.cpp
r271074 r271415 39 39 #include "NetworkStorageSession.h" 40 40 #include "Page.h" 41 #include "Quirks.h" 41 42 #include "RegistrableDomain.h" 42 43 #include "SecurityOrigin.h" -
trunk/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp
r270878 r271415 33 33 #include "InlineItem.h" 34 34 #include "InlineTextItem.h" 35 #include "LayoutContainerBox.h" 35 36 #include "TextUtil.h" 36 37 -
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp
r271359 r271415 28 28 29 29 #if ENABLE(LAYOUT_FORMATTING_CONTEXT) 30 31 #include "LayoutBoxGeometry.h" 30 32 31 33 namespace WebCore { -
trunk/Source/WebCore/page/Quirks.h
r271074 r271415 39 39 class LayoutUnit; 40 40 class PlatformMouseEvent; 41 42 #if ENABLE(RESOURCE_LOAD_STATISTICS) 43 class RegistrableDomain; 41 44 enum class StorageAccessWasGranted : bool; 45 #endif 42 46 43 47 class Quirks { -
trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp
r271295 r271415 33 33 #include "ImageBuffer.h" 34 34 #include "Logging.h" 35 #include "MediaPlayer.h" 35 36 #include <wtf/MathExtras.h> 36 37 #include <wtf/text/TextStream.h> -
trunk/Source/WebKit/ChangeLog
r271414 r271415 1 2021-01-12 Don Olmstead <don.olmstead@sony.com> 2 3 Non-unified build fixes mid January 2021 edition 4 https://bugs.webkit.org/show_bug.cgi?id=220560 5 6 Unreviewed non-unified build fixes. 7 8 * UIProcess/SpeechRecognitionPermissionManager.cpp: 9 (WebKit::SpeechRecognitionPermissionManager::~SpeechRecognitionPermissionManager): 10 (WebKit::SpeechRecognitionPermissionManager::request): 11 (WebKit::SpeechRecognitionPermissionManager::startProcessingRequest): 12 (WebKit::SpeechRecognitionPermissionManager::continueProcessingRequest): 13 (WebKit::SpeechRecognitionPermissionManager::completeCurrentRequest): 14 (WebKit::SpeechRecognitionPermissionManager::requestSpeechRecognitionServiceAccess): 15 (WebKit::SpeechRecognitionPermissionManager::requestMicrophoneAccess): 16 (WebKit::SpeechRecognitionPermissionManager::requestUserPermission): 17 1 18 2021-01-12 Wenson Hsieh <wenson_hsieh@apple.com> 2 19 -
trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp
r271381 r271415 73 73 { 74 74 for (auto& request : m_requests) 75 request->complete( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "Permission manager has exited"_s });75 request->complete(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Permission manager has exited"_s }); 76 76 } 77 77 78 void SpeechRecognitionPermissionManager::request(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(Optional< SpeechRecognitionError>&&)>&& completiontHandler)78 void SpeechRecognitionPermissionManager::request(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(Optional<WebCore::SpeechRecognitionError>&&)>&& completiontHandler) 79 79 { 80 80 m_requests.append(SpeechRecognitionPermissionRequest::create(lang, origin, WTFMove(completiontHandler))); … … 95 95 #if PLATFORM(COOCA) 96 96 if (!checkSandboxRequirementForType(MediaPermissionType::Audio)) { 97 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "Sandbox check has failed"_s });97 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Sandbox check has failed"_s }); 98 98 return; 99 99 } … … 108 108 m_microphoneCheck = computeMicrophoneAccess(); 109 109 if (m_microphoneCheck == CheckResult::Denied) { 110 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "Microphone permission check has failed"_s });110 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Microphone permission check has failed"_s }); 111 111 return; 112 112 } … … 114 114 m_speechRecognitionServiceCheck = computeSpeechRecognitionServiceAccess(); 115 115 if (m_speechRecognitionServiceCheck == CheckResult::Denied) { 116 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service permission check has failed"_s });116 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service permission check has failed"_s }); 117 117 return; 118 118 } … … 120 120 #if HAVE(SPEECHRECOGNIZER) 121 121 if (!checkSpeechRecognitionServiceAvailability(m_requests.first()->lang())) { 122 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service is not available"_s });122 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service is not available"_s }); 123 123 return; 124 124 } … … 136 136 137 137 if (m_userPermissionCheck == CheckResult::Denied) { 138 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "User permission check has failed"_s });138 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "User permission check has failed"_s }); 139 139 return; 140 140 } … … 164 164 165 165 if (!m_page.isViewVisible()) { 166 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "Page is not visible to user" });166 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Page is not visible to user" }); 167 167 return; 168 168 } … … 171 171 } 172 172 173 void SpeechRecognitionPermissionManager::completeCurrentRequest(Optional< SpeechRecognitionError>&& error)173 void SpeechRecognitionPermissionManager::completeCurrentRequest(Optional<WebCore::SpeechRecognitionError>&& error) 174 174 { 175 175 ASSERT(!m_requests.isEmpty()); … … 191 191 m_speechRecognitionServiceCheck = authorized ? CheckResult::Granted : CheckResult::Denied; 192 192 if (m_speechRecognitionServiceCheck == CheckResult::Denied) { 193 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service permission check has failed"_s });193 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::ServiceNotAllowed, "Speech recognition service permission check has failed"_s }); 194 194 return; 195 195 } … … 211 211 m_microphoneCheck = authorized ? CheckResult::Granted : CheckResult::Denied; 212 212 if (m_microphoneCheck == CheckResult::Denied) { 213 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "Microphone permission check has failed"_s });213 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "Microphone permission check has failed"_s }); 214 214 return; 215 215 } … … 233 233 m_userPermissionCheck = granted ? CheckResult::Granted : CheckResult::Denied; 234 234 if (m_userPermissionCheck == CheckResult::Denied) { 235 completeCurrentRequest( SpeechRecognitionError {SpeechRecognitionErrorType::NotAllowed, "User permission check has failed"_s });235 completeCurrentRequest(WebCore::SpeechRecognitionError { WebCore::SpeechRecognitionErrorType::NotAllowed, "User permission check has failed"_s }); 236 236 return; 237 237 }
Note:
See TracChangeset
for help on using the changeset viewer.