⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 271415 in webkit


Ignore:
Timestamp:
Jan 12, 2021, 2:07:59 PM (6 years ago)
Author:
don.olmstead@sony.com
Message:

Non-unified build fixes mid January 2021 edition
https://bugs.webkit.org/show_bug.cgi?id=220560

Unreviewed non-unified build fixes.

Source/JavaScriptCore:

  • API/JSLockRef.cpp:
  • runtime/JSCJSValue.cpp:
  • runtime/JSGlobalObjectFunctions.cpp:

Source/WebCore:

  • accessibility/AccessibilityObject.cpp:
  • bindings/js/JSHTMLAllCollectionCustom.cpp:
  • dom/DocumentStorageAccess.cpp:
  • layout/inlineformatting/InlineContentBreaker.cpp:
  • layout/inlineformatting/InlineFormattingContextQuirks.cpp:
  • page/Quirks.h:
  • platform/graphics/displaylists/DisplayListRecorder.cpp:

Source/WebKit:

  • UIProcess/SpeechRecognitionPermissionManager.cpp:

(WebKit::SpeechRecognitionPermissionManager::~SpeechRecognitionPermissionManager):
(WebKit::SpeechRecognitionPermissionManager::request):
(WebKit::SpeechRecognitionPermissionManager::startProcessingRequest):
(WebKit::SpeechRecognitionPermissionManager::continueProcessingRequest):
(WebKit::SpeechRecognitionPermissionManager::completeCurrentRequest):
(WebKit::SpeechRecognitionPermissionManager::requestSpeechRecognitionServiceAccess):
(WebKit::SpeechRecognitionPermissionManager::requestMicrophoneAccess):
(WebKit::SpeechRecognitionPermissionManager::requestUserPermission):

Location:
trunk/Source
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/API/JSLockRef.cpp

    r270659 r271415  
    2727#include "JSLockRefPrivate.h"
    2828
     29#include "APICast.h"
    2930#include "JSLock.h"
    3031
  • trunk/Source/JavaScriptCore/ChangeLog

    r271373 r271415  
     12021-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
    1122021-01-11  Devin Rousso  <drousso@apple.com>
    213
  • trunk/Source/JavaScriptCore/runtime/JSCJSValue.cpp

    r271168 r271415  
    3131#include "JSCInlines.h"
    3232#include "NumberObject.h"
     33#include "ParseInt.h"
    3334#include "TypeError.h"
    3435
  • trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

    r271343 r271415  
    3535#include "JSModuleLoader.h"
    3636#include "JSPromise.h"
     37#include "JSSet.h"
    3738#include "Lexer.h"
    3839#include "LiteralParser.h"
  • trunk/Source/WebCore/ChangeLog

    r271414 r271415  
     12021-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
    1162021-01-12  Wenson Hsieh  <wenson_hsieh@apple.com>
    217
  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r270834 r271415  
    3030#include "AccessibilityObject.h"
    3131
     32#include "AXLogger.h"
    3233#include "AXObjectCache.h"
    3334#include "AccessibilityRenderObject.h"
  • trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp

    r271137 r271415  
    3232#include "JSDOMConvertNullable.h"
    3333#include "JSDOMConvertUnion.h"
     34#include "JSElement.h"
     35#include "JSHTMLCollection.h"
    3436
    3537namespace WebCore {
  • trunk/Source/WebCore/dom/DocumentStorageAccess.cpp

    r271074 r271415  
    3939#include "NetworkStorageSession.h"
    4040#include "Page.h"
     41#include "Quirks.h"
    4142#include "RegistrableDomain.h"
    4243#include "SecurityOrigin.h"
  • trunk/Source/WebCore/layout/inlineformatting/InlineContentBreaker.cpp

    r270878 r271415  
    3333#include "InlineItem.h"
    3434#include "InlineTextItem.h"
     35#include "LayoutContainerBox.h"
    3536#include "TextUtil.h"
    3637
  • trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextQuirks.cpp

    r271359 r271415  
    2828
    2929#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
     30
     31#include "LayoutBoxGeometry.h"
    3032
    3133namespace WebCore {
  • trunk/Source/WebCore/page/Quirks.h

    r271074 r271415  
    3939class LayoutUnit;
    4040class PlatformMouseEvent;
     41
     42#if ENABLE(RESOURCE_LOAD_STATISTICS)
     43class RegistrableDomain;
    4144enum class StorageAccessWasGranted : bool;
     45#endif
    4246
    4347class Quirks {
  • trunk/Source/WebCore/platform/graphics/displaylists/DisplayListRecorder.cpp

    r271295 r271415  
    3333#include "ImageBuffer.h"
    3434#include "Logging.h"
     35#include "MediaPlayer.h"
    3536#include <wtf/MathExtras.h>
    3637#include <wtf/text/TextStream.h>
  • trunk/Source/WebKit/ChangeLog

    r271414 r271415  
     12021-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
    1182021-01-12  Wenson Hsieh  <wenson_hsieh@apple.com>
    219
  • trunk/Source/WebKit/UIProcess/SpeechRecognitionPermissionManager.cpp

    r271381 r271415  
    7373{
    7474    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 });
    7676}
    7777   
    78 void SpeechRecognitionPermissionManager::request(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(Optional<SpeechRecognitionError>&&)>&& completiontHandler)
     78void SpeechRecognitionPermissionManager::request(const String& lang, const WebCore::ClientOrigin& origin, CompletionHandler<void(Optional<WebCore::SpeechRecognitionError>&&)>&& completiontHandler)
    7979{
    8080    m_requests.append(SpeechRecognitionPermissionRequest::create(lang, origin, WTFMove(completiontHandler)));
     
    9595#if PLATFORM(COOCA)
    9696    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 });
    9898        return;
    9999    }
     
    108108        m_microphoneCheck = computeMicrophoneAccess();
    109109        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 });
    111111            return;
    112112        }
     
    114114        m_speechRecognitionServiceCheck = computeSpeechRecognitionServiceAccess();
    115115        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 });
    117117            return;
    118118        }
     
    120120#if HAVE(SPEECHRECOGNIZER)
    121121        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 });
    123123            return;
    124124        }
     
    136136
    137137    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 });
    139139        return;
    140140    }
     
    164164
    165165    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" });
    167167        return;
    168168    }
     
    171171}
    172172
    173 void SpeechRecognitionPermissionManager::completeCurrentRequest(Optional<SpeechRecognitionError>&& error)
     173void SpeechRecognitionPermissionManager::completeCurrentRequest(Optional<WebCore::SpeechRecognitionError>&& error)
    174174{
    175175    ASSERT(!m_requests.isEmpty());
     
    191191        m_speechRecognitionServiceCheck = authorized ? CheckResult::Granted : CheckResult::Denied;
    192192        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 });
    194194            return;
    195195        }
     
    211211        m_microphoneCheck = authorized ? CheckResult::Granted : CheckResult::Denied;
    212212        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 });
    214214            return;
    215215        }
     
    233233        m_userPermissionCheck = granted ? CheckResult::Granted : CheckResult::Denied;
    234234        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 });
    236236            return;
    237237        }
Note: See TracChangeset for help on using the changeset viewer.