Rename JSDOMWrapper.impl to JSDOMWrapper.wrapped

author youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)

committer youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)
author youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)
committer youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index 961a359aec27561d19a8c7699deb1ceaa19ca736..f802f9a83c1f2d8ca810b1a5f3580cecb404430e 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,783 @@
+2015-11-02  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Rename JSDOMWrapper.impl to JSDOMWrapper.wrapped
+        https://bugs.webkit.org/show_bug.cgi?id=150613
+
+        Reviewed by Darin Adler.
+
+        Renaming impl to wrapped in classes and binding generated classes.
+        No change in behavior.
+
+        * Modules/plugins/QuickTimePluginReplacement.mm:
+        (WebCore::JSQuickTimePluginReplacement::timedMetaData):
+        (WebCore::JSQuickTimePluginReplacement::accessLog):
+        (WebCore::JSQuickTimePluginReplacement::errorLog):
+        * bindings/js/JSAttrCustom.cpp:
+        (WebCore::JSAttr::visitAdditionalChildren):
+        * bindings/js/JSAudioBufferSourceNodeCustom.cpp:
+        (WebCore::JSAudioBufferSourceNode::setBuffer):
+        * bindings/js/JSAudioTrackCustom.cpp:
+        (WebCore::JSAudioTrack::visitAdditionalChildren):
+        (WebCore::JSAudioTrack::setKind):
+        (WebCore::JSAudioTrack::setLanguage):
+        * bindings/js/JSAudioTrackListCustom.cpp:
+        (WebCore::JSAudioTrackList::visitAdditionalChildren):
+        * bindings/js/JSBiquadFilterNodeCustom.cpp:
+        (WebCore::JSBiquadFilterNode::setType):
+        * bindings/js/JSCSSRuleCustom.cpp:
+        (WebCore::JSCSSRule::visitAdditionalChildren):
+        * bindings/js/JSCSSRuleListCustom.cpp:
+        (WebCore::JSCSSRuleListOwner::isReachableFromOpaqueRoots):
+        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+        (WebCore::JSCSSStyleDeclaration::visitAdditionalChildren):
+        (WebCore::getPropertyValueFallback):
+        (WebCore::cssPropertyGetterPixelOrPosPrefix):
+        (WebCore::cssPropertyGetter):
+        (WebCore::JSCSSStyleDeclaration::putDelegate):
+        (WebCore::JSCSSStyleDeclaration::getPropertyCSSValue):
+        (WebCore::JSCSSStyleDeclaration::getOwnPropertyNames):
+        * bindings/js/JSCSSValueCustom.cpp:
+        (WebCore::JSCSSValueOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSCSSValueOwner::finalize):
+        * bindings/js/JSCanvasRenderingContext2DCustom.cpp:
+        (WebCore::toHTMLCanvasStyle):
+        (WebCore::JSCanvasRenderingContext2D::strokeStyle):
+        (WebCore::JSCanvasRenderingContext2D::setStrokeStyle):
+        (WebCore::JSCanvasRenderingContext2D::fillStyle):
+        (WebCore::JSCanvasRenderingContext2D::setFillStyle):
+        (WebCore::JSCanvasRenderingContext2D::webkitLineDash):
+        (WebCore::JSCanvasRenderingContext2D::setWebkitLineDash):
+        * bindings/js/JSCanvasRenderingContextCustom.cpp:
+        (WebCore::JSCanvasRenderingContext::visitAdditionalChildren):
+        * bindings/js/JSCharacterDataCustom.cpp:
+        (WebCore::JSCharacterData::before):
+        (WebCore::JSCharacterData::after):
+        (WebCore::JSCharacterData::replaceWith):
+        * bindings/js/JSCommandLineAPIHostCustom.cpp:
+        (WebCore::JSCommandLineAPIHost::inspectedObject):
+        (WebCore::JSCommandLineAPIHost::getEventListeners):
+        (WebCore::JSCommandLineAPIHost::inspect):
+        (WebCore::JSCommandLineAPIHost::databaseId):
+        (WebCore::JSCommandLineAPIHost::storageId):
+        * bindings/js/JSCryptoCustom.cpp:
+        (WebCore::JSCrypto::getRandomValues):
+        * bindings/js/JSCryptoKeyCustom.cpp:
+        (WebCore::JSCryptoKey::algorithm):
+        * bindings/js/JSCryptoKeyPairCustom.cpp:
+        (WebCore::JSCryptoKeyPair::visitAdditionalChildren):
+        * bindings/js/JSCustomEventCustom.cpp:
+        (WebCore::JSCustomEvent::detail):
+        * bindings/js/JSCustomXPathNSResolver.cpp:
+        (WebCore::JSCustomXPathNSResolver::lookupNamespaceURI):
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::reportException):
+        (WebCore::activeDOMWindow):
+        (WebCore::firstDOMWindow):
+        * bindings/js/JSDOMFormDataCustom.cpp:
+        (WebCore::toHTMLFormElementOrNull):
+        (WebCore::JSDOMFormData::append):
+        * bindings/js/JSDOMMimeTypeArrayCustom.cpp:
+        (WebCore::JSDOMMimeTypeArray::nameGetter):
+        * bindings/js/JSDOMNamedFlowCollectionCustom.cpp:
+        (WebCore::JSDOMNamedFlowCollection::nameGetter):
+        * bindings/js/JSDOMPluginArrayCustom.cpp:
+        (WebCore::JSDOMPluginArray::nameGetter):
+        * bindings/js/JSDOMPluginCustom.cpp:
+        (WebCore::JSDOMPlugin::nameGetter):
+        * bindings/js/JSDOMStringListCustom.cpp:
+        (WebCore::JSDOMStringList::toWrapped):
+        * bindings/js/JSDOMStringMapCustom.cpp:
+        (WebCore::JSDOMStringMap::getOwnPropertySlotDelegate):
+        (WebCore::JSDOMStringMap::getOwnPropertyNames):
+        (WebCore::JSDOMStringMap::deleteProperty):
+        (WebCore::JSDOMStringMap::putDelegate):
+        * bindings/js/JSDOMTokenListCustom.cpp:
+        (WebCore::JSDOMTokenList::toggle):
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::shouldAllowAccessFrom):
+        (WebCore::JSDOMWindowBase::JSDOMWindowBase):
+        (WebCore::JSDOMWindowBase::updateDocument):
+        (WebCore::JSDOMWindowBase::scriptExecutionContext):
+        (WebCore::JSDOMWindowBase::printErrorMessage):
+        (WebCore::JSDOMWindowBase::supportsProfiling):
+        (WebCore::JSDOMWindowBase::supportsRichSourceInfo):
+        (WebCore::JSDOMWindowBase::shouldInterruptScript):
+        (WebCore::JSDOMWindowBase::shouldInterruptScriptBeforeTimeout):
+        (WebCore::JSDOMWindowBase::javaScriptRuntimeFlags):
+        (WebCore::JSDOMWindowBase::moduleLoaderResolve):
+        (WebCore::JSDOMWindowBase::moduleLoaderFetch):
+        (WebCore::JSDOMWindowBase::moduleLoaderEvaluate):
+        * bindings/js/JSDOMWindowBase.h:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::visitAdditionalChildren):
+        (WebCore::childFrameGetter):
+        (WebCore::namedItemGetter):
+        (WebCore::jsDOMWindowWebKit):
+        (WebCore::jsDOMWindowIndexedDB):
+        (WebCore::JSDOMWindow::getOwnPropertySlot):
+        (WebCore::JSDOMWindow::getOwnPropertySlotByIndex):
+        (WebCore::JSDOMWindow::put):
+        (WebCore::JSDOMWindow::putByIndex):
+        (WebCore::JSDOMWindow::deleteProperty):
+        (WebCore::JSDOMWindow::deletePropertyByIndex):
+        (WebCore::JSDOMWindow::getEnumerableLength):
+        (WebCore::JSDOMWindow::getStructurePropertyNames):
+        (WebCore::JSDOMWindow::getGenericPropertyNames):
+        (WebCore::JSDOMWindow::getPropertyNames):
+        (WebCore::JSDOMWindow::getOwnPropertyNames):
+        (WebCore::JSDOMWindow::defineOwnProperty):
+        (WebCore::JSDOMWindow::setLocation):
+        (WebCore::JSDOMWindow::open):
+        (WebCore::JSDOMWindow::showModalDialog):
+        (WebCore::JSDOMWindow::postMessage):
+        (WebCore::JSDOMWindow::setTimeout):
+        (WebCore::JSDOMWindow::setInterval):
+        (WebCore::JSDOMWindow::addEventListener):
+        (WebCore::JSDOMWindow::removeEventListener):
+        (WebCore::JSDOMWindow::toWrapped):
+        * bindings/js/JSDOMWindowShell.cpp:
+        (WebCore::JSDOMWindowShell::setWindow):
+        (WebCore::JSDOMWindowShell::wrapped):
+        * bindings/js/JSDOMWindowShell.h:
+        * bindings/js/JSDOMWrapper.h:
+        (WebCore::JSDOMWrapper::wrapped):
+        (WebCore::JSDOMWrapper::JSDOMWrapper):
+        * bindings/js/JSDataCueCustom.cpp:
+        (WebCore::JSDataCue::value):
+        (WebCore::JSDataCue::setValue):
+        * bindings/js/JSDataTransferCustom.cpp:
+        (WebCore::JSDataTransfer::types):
+        * bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp:
+        (WebCore::JSDedicatedWorkerGlobalScope::postMessage):
+        * bindings/js/JSDeviceMotionEventCustom.cpp:
+        (WebCore::JSDeviceMotionEvent::acceleration):
+        (WebCore::JSDeviceMotionEvent::accelerationIncludingGravity):
+        (WebCore::JSDeviceMotionEvent::rotationRate):
+        (WebCore::JSDeviceMotionEvent::interval):
+        (WebCore::JSDeviceMotionEvent::initDeviceMotionEvent):
+        * bindings/js/JSDeviceOrientationEventCustom.cpp:
+        (WebCore::JSDeviceOrientationEvent::alpha):
+        (WebCore::JSDeviceOrientationEvent::beta):
+        (WebCore::JSDeviceOrientationEvent::gamma):
+        (WebCore::JSDeviceOrientationEvent::webkitCompassHeading):
+        (WebCore::JSDeviceOrientationEvent::webkitCompassAccuracy):
+        (WebCore::JSDeviceOrientationEvent::absolute):
+        (WebCore::JSDeviceOrientationEvent::initDeviceOrientationEvent):
+        * bindings/js/JSDocumentCustom.cpp:
+        (WebCore::JSDocument::prepend):
+        (WebCore::JSDocument::append):
+        * bindings/js/JSDocumentFragmentCustom.cpp:
+        (WebCore::JSDocumentFragment::prepend):
+        (WebCore::JSDocumentFragment::append):
+        * bindings/js/JSDocumentTypeCustom.cpp:
+        (WebCore::JSDocumentType::before):
+        (WebCore::JSDocumentType::after):
+        (WebCore::JSDocumentType::replaceWith):
+        * bindings/js/JSElementCustom.cpp:
+        (WebCore::JSElement::before):
+        (WebCore::JSElement::after):
+        (WebCore::JSElement::replaceWith):
+        (WebCore::JSElement::prepend):
+        (WebCore::JSElement::append):
+        * bindings/js/JSEventCustom.cpp:
+        (WebCore::JSEvent::clipboardData):
+        * bindings/js/JSEventListener.cpp:
+        (WebCore::JSEventListener::handleEvent):
+        * bindings/js/JSEventTargetCustom.cpp:
+        * bindings/js/JSFileReaderCustom.cpp:
+        (WebCore::JSFileReader::result):
+        * bindings/js/JSGeolocationCustom.cpp:
+        (WebCore::JSGeolocation::getCurrentPosition):
+        (WebCore::JSGeolocation::watchPosition):
+        * bindings/js/JSHTMLAllCollectionCustom.cpp:
+        (WebCore::namedItems):
+        (WebCore::callHTMLAllCollection):
+        (WebCore::JSHTMLAllCollection::item):
+        * bindings/js/JSHTMLCanvasElementCustom.cpp:
+        (WebCore::JSHTMLCanvasElement::getContext):
+        (WebCore::JSHTMLCanvasElement::probablySupportsContext):
+        (WebCore::JSHTMLCanvasElement::toDataURL):
+        * bindings/js/JSHTMLCollectionCustom.cpp:
+        (WebCore::JSHTMLCollection::nameGetter):
+        * bindings/js/JSHTMLDocumentCustom.cpp:
+        (WebCore::JSHTMLDocument::nameGetter):
+        (WebCore::JSHTMLDocument::all):
+        (WebCore::findCallingDocument):
+        (WebCore::JSHTMLDocument::open):
+        (WebCore::documentWrite):
+        * bindings/js/JSHTMLElementCustom.cpp:
+        (WebCore::JSHTMLElement::pushEventHandlerScope):
+        * bindings/js/JSHTMLFormControlsCollectionCustom.cpp:
+        (WebCore::namedItems):
+        * bindings/js/JSHTMLFormElementCustom.cpp:
+        (WebCore::JSHTMLFormElement::nameGetter):
+        * bindings/js/JSHTMLFrameElementCustom.cpp:
+        (WebCore::JSHTMLFrameElement::setLocation):
+        * bindings/js/JSHTMLFrameSetElementCustom.cpp:
+        (WebCore::JSHTMLFrameSetElement::nameGetter):
+        * bindings/js/JSHTMLInputElementCustom.cpp:
+        (WebCore::JSHTMLInputElement::selectionStart):
+        (WebCore::JSHTMLInputElement::setSelectionStart):
+        (WebCore::JSHTMLInputElement::selectionEnd):
+        (WebCore::JSHTMLInputElement::setSelectionEnd):
+        (WebCore::JSHTMLInputElement::selectionDirection):
+        (WebCore::JSHTMLInputElement::setSelectionDirection):
+        (WebCore::JSHTMLInputElement::setSelectionRange):
+        * bindings/js/JSHTMLMediaElementCustom.cpp:
+        (WebCore::JSHTMLMediaElement::setController):
+        * bindings/js/JSHTMLOptionsCollectionCustom.cpp:
+        (WebCore::JSHTMLOptionsCollection::nameGetter):
+        (WebCore::JSHTMLOptionsCollection::setLength):
+        (WebCore::JSHTMLOptionsCollection::indexSetter):
+        (WebCore::JSHTMLOptionsCollection::remove):
+        * bindings/js/JSHTMLSelectElementCustom.cpp:
+        (WebCore::JSHTMLSelectElement::remove):
+        (WebCore::JSHTMLSelectElement::indexSetter):
+        * bindings/js/JSHTMLTemplateElementCustom.cpp:
+        (WebCore::JSHTMLTemplateElement::content):
+        * bindings/js/JSHistoryCustom.cpp:
+        (WebCore::JSHistory::getOwnPropertySlotDelegate):
+        (WebCore::JSHistory::putDelegate):
+        (WebCore::JSHistory::deleteProperty):
+        (WebCore::JSHistory::deletePropertyByIndex):
+        (WebCore::JSHistory::getOwnPropertyNames):
+        (WebCore::JSHistory::state):
+        (WebCore::JSHistory::pushState):
+        (WebCore::JSHistory::replaceState):
+        * bindings/js/JSIDBDatabaseCustom.cpp:
+        (WebCore::JSIDBDatabase::createObjectStore):
+        * bindings/js/JSIDBObjectStoreCustom.cpp:
+        (WebCore::JSIDBObjectStore::createIndex):
+        * bindings/js/JSInspectorFrontendHostCustom.cpp:
+        (WebCore::JSInspectorFrontendHost::showContextMenu):
+        * bindings/js/JSLocationCustom.cpp:
+        (WebCore::JSLocation::getOwnPropertySlotDelegate):
+        (WebCore::JSLocation::putDelegate):
+        (WebCore::JSLocation::deleteProperty):
+        (WebCore::JSLocation::deletePropertyByIndex):
+        (WebCore::JSLocation::getOwnPropertyNames):
+        (WebCore::JSLocation::toStringFunction):
+        * bindings/js/JSMediaSourceStatesCustom.cpp:
+        (WebCore::JSMediaSourceStates::width):
+        (WebCore::JSMediaSourceStates::height):
+        (WebCore::JSMediaSourceStates::frameRate):
+        (WebCore::JSMediaSourceStates::aspectRatio):
+        (WebCore::JSMediaSourceStates::facingMode):
+        (WebCore::JSMediaSourceStates::volume):
+        * bindings/js/JSMessageChannelCustom.cpp:
+        (WebCore::JSMessageChannel::visitAdditionalChildren):
+        * bindings/js/JSMessageEventCustom.cpp:
+        (WebCore::JSMessageEvent::data):
+        (WebCore::handleInitMessageEvent):
+        * bindings/js/JSMessagePortCustom.cpp:
+        (WebCore::JSMessagePort::visitAdditionalChildren):
+        (WebCore::JSMessagePort::postMessage):
+        * bindings/js/JSMockContentFilterSettingsCustom.cpp:
+        (WebCore::JSMockContentFilterSettings::decisionPoint):
+        (WebCore::JSMockContentFilterSettings::setDecisionPoint):
+        (WebCore::JSMockContentFilterSettings::decision):
+        (WebCore::JSMockContentFilterSettings::setDecision):
+        (WebCore::JSMockContentFilterSettings::unblockRequestDecision):
+        (WebCore::JSMockContentFilterSettings::setUnblockRequestDecision):
+        * bindings/js/JSMutationObserverCustom.cpp:
+        (WebCore::JSMutationObserverOwner::isReachableFromOpaqueRoots):
+        * bindings/js/JSNamedNodeMapCustom.cpp:
+        (WebCore::JSNamedNodeMap::nameGetter):
+        * bindings/js/JSNavigatorCustom.cpp:
+        (WebCore::JSNavigator::webkitGetUserMedia):
+        * bindings/js/JSNodeCustom.cpp:
+        (WebCore::JSNodeOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSNode::insertBefore):
+        (WebCore::JSNode::replaceChild):
+        (WebCore::JSNode::removeChild):
+        (WebCore::JSNode::appendChild):
+        (WebCore::JSNode::visitAdditionalChildren):
+        * bindings/js/JSNodeIteratorCustom.cpp:
+        (WebCore::JSNodeIterator::visitAdditionalChildren):
+        * bindings/js/JSNodeListCustom.cpp:
+        (WebCore::JSNodeListOwner::isReachableFromOpaqueRoots):
+        * bindings/js/JSNodeOrString.cpp:
+        (WebCore::toNodeOrStringVector):
+        * bindings/js/JSOscillatorNodeCustom.cpp:
+        (WebCore::JSOscillatorNode::setType):
+        * bindings/js/JSPannerNodeCustom.cpp:
+        (WebCore::JSPannerNode::setPanningModel):
+        (WebCore::JSPannerNode::setDistanceModel):
+        * bindings/js/JSPluginElementFunctions.cpp:
+        (WebCore::pluginScriptObjectFromPluginViewBase):
+        (WebCore::pluginScriptObject):
+        (WebCore::pluginElementGetCallData):
+        * bindings/js/JSPopStateEventCustom.cpp:
+        (WebCore::JSPopStateEvent::state):
+        * bindings/js/JSRTCStatsResponseCustom.cpp:
+        (WebCore::JSRTCStatsResponse::nameGetter):
+        * bindings/js/JSSQLResultSetRowListCustom.cpp:
+        (WebCore::JSSQLResultSetRowList::item):
+        * bindings/js/JSSQLTransactionCustom.cpp:
+        (WebCore::JSSQLTransaction::executeSql):
+        * bindings/js/JSSVGLengthCustom.cpp:
+        (WebCore::JSSVGLength::value):
+        (WebCore::JSSVGLength::setValue):
+        (WebCore::JSSVGLength::convertToSpecifiedUnits):
+        * bindings/js/JSStorageCustom.cpp:
+        (WebCore::JSStorage::nameGetter):
+        (WebCore::JSStorage::deleteProperty):
+        (WebCore::JSStorage::getOwnPropertyNames):
+        (WebCore::JSStorage::putDelegate):
+        * bindings/js/JSStyleSheetCustom.cpp:
+        (WebCore::JSStyleSheet::visitAdditionalChildren):
+        * bindings/js/JSStyleSheetListCustom.cpp:
+        (WebCore::JSStyleSheetList::nameGetter):
+        * bindings/js/JSSubtleCryptoCustom.cpp:
+        (WebCore::JSSubtleCrypto::encrypt):
+        (WebCore::JSSubtleCrypto::decrypt):
+        (WebCore::JSSubtleCrypto::sign):
+        (WebCore::JSSubtleCrypto::verify):
+        (WebCore::JSSubtleCrypto::wrapKey):
+        (WebCore::JSSubtleCrypto::unwrapKey):
+        * bindings/js/JSTextTrackCueCustom.cpp:
+        (WebCore::JSTextTrackCueOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSTextTrackCue::visitAdditionalChildren):
+        * bindings/js/JSTextTrackCustom.cpp:
+        (WebCore::JSTextTrack::visitAdditionalChildren):
+        (WebCore::JSTextTrack::setKind):
+        (WebCore::JSTextTrack::setLanguage):
+        * bindings/js/JSTextTrackListCustom.cpp:
+        (WebCore::JSTextTrackList::visitAdditionalChildren):
+        * bindings/js/JSTrackCustom.cpp:
+        (WebCore::toTrack):
+        * bindings/js/JSTrackEventCustom.cpp:
+        (WebCore::JSTrackEvent::track):
+        * bindings/js/JSTreeWalkerCustom.cpp:
+        (WebCore::JSTreeWalker::visitAdditionalChildren):
+        * bindings/js/JSUserMessageHandlersNamespaceCustom.cpp:
+        (WebCore::JSUserMessageHandlersNamespace::getOwnPropertySlotDelegate):
+        * bindings/js/JSVideoTrackCustom.cpp:
+        (WebCore::JSVideoTrack::visitAdditionalChildren):
+        (WebCore::JSVideoTrack::setKind):
+        (WebCore::JSVideoTrack::setLanguage):
+        * bindings/js/JSVideoTrackListCustom.cpp:
+        (WebCore::JSVideoTrackList::visitAdditionalChildren):
+        * bindings/js/JSWebGL2RenderingContextCustom.cpp:
+        (WebCore::JSWebGL2RenderingContext::visitAdditionalChildren):
+        (WebCore::JSWebGL2RenderingContext::getIndexedParameter):
+        * bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
+        (WebCore::getObjectParameter):
+        (WebCore::JSWebGLRenderingContextBase::visitAdditionalChildren):
+        (WebCore::JSWebGLRenderingContextBase::getAttachedShaders):
+        (WebCore::JSWebGLRenderingContextBase::getExtension):
+        (WebCore::JSWebGLRenderingContextBase::getFramebufferAttachmentParameter):
+        (WebCore::JSWebGLRenderingContextBase::getParameter):
+        (WebCore::JSWebGLRenderingContextBase::getProgramParameter):
+        (WebCore::JSWebGLRenderingContextBase::getShaderParameter):
+        (WebCore::JSWebGLRenderingContextBase::getSupportedExtensions):
+        (WebCore::JSWebGLRenderingContextBase::getUniform):
+        (WebCore::JSWebGLRenderingContextBase::uniform1fv):
+        (WebCore::JSWebGLRenderingContextBase::uniform1iv):
+        (WebCore::JSWebGLRenderingContextBase::uniform2fv):
+        (WebCore::JSWebGLRenderingContextBase::uniform2iv):
+        (WebCore::JSWebGLRenderingContextBase::uniform3fv):
+        (WebCore::JSWebGLRenderingContextBase::uniform3iv):
+        (WebCore::JSWebGLRenderingContextBase::uniform4fv):
+        (WebCore::JSWebGLRenderingContextBase::uniform4iv):
+        (WebCore::JSWebGLRenderingContextBase::uniformMatrix2fv):
+        (WebCore::JSWebGLRenderingContextBase::uniformMatrix3fv):
+        (WebCore::JSWebGLRenderingContextBase::uniformMatrix4fv):
+        (WebCore::JSWebGLRenderingContextBase::vertexAttrib1fv):
+        (WebCore::JSWebGLRenderingContextBase::vertexAttrib2fv):
+        (WebCore::JSWebGLRenderingContextBase::vertexAttrib3fv):
+        (WebCore::JSWebGLRenderingContextBase::vertexAttrib4fv):
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        (WebCore::JSWebGLRenderingContext::visitAdditionalChildren):
+        * bindings/js/JSWorkerCustom.cpp:
+        (WebCore::JSWorker::postMessage):
+        (WebCore::constructJSWorker):
+        * bindings/js/JSWorkerGlobalScopeBase.cpp:
+        (WebCore::JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase):
+        (WebCore::JSWorkerGlobalScopeBase::scriptExecutionContext):
+        * bindings/js/JSWorkerGlobalScopeBase.h:
+        (WebCore::JSWorkerGlobalScopeBase::wrapped):
+        * bindings/js/JSWorkerGlobalScopeCustom.cpp:
+        (WebCore::JSWorkerGlobalScope::visitAdditionalChildren):
+        (WebCore::JSWorkerGlobalScope::importScripts):
+        (WebCore::JSWorkerGlobalScope::setTimeout):
+        (WebCore::JSWorkerGlobalScope::setInterval):
+        * bindings/js/JSXMLHttpRequestCustom.cpp:
+        (WebCore::JSXMLHttpRequest::visitAdditionalChildren):
+        (WebCore::JSXMLHttpRequest::open):
+        (WebCore::JSXMLHttpRequest::send):
+        (WebCore::JSXMLHttpRequest::responseText):
+        (WebCore::JSXMLHttpRequest::response):
+        * bindings/js/JSXPathResultCustom.cpp:
+        (WebCore::JSXPathResult::visitAdditionalChildren):
+        * bindings/js/JSXSLTProcessorCustom.cpp:
+        (WebCore::JSXSLTProcessor::setParameter):
+        (WebCore::JSXSLTProcessor::getParameter):
+        (WebCore::JSXSLTProcessor::removeParameter):
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScriptCachedFrameData.cpp:
+        (WebCore::ScriptCachedFrameData::restore):
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::clearWindowShell):
+        (WebCore::ScriptController::collectIsolatedContexts):
+        * bindings/js/ScriptState.cpp:
+        (WebCore::domWindowFromExecState):
+        * bindings/objc/DOM.mm:
+        (+[DOMNode _nodeFromJSWrapper:]):
+        * bindings/objc/DOMUtility.mm:
+        (JSC::createDOMWrapper):
+        * bindings/objc/WebScriptObject.mm:
+        (-[WebScriptObject _isSafeScript]):
+        (+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]):
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateGetOwnPropertySlotBody):
+        (GenerateHeader):
+        (GetIndexedGetterExpression):
+        (GenerateImplementation):
+        (NativeToJSValue):
+        * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+        (WebCore::jsTestActiveDOMObjectExcitingAttr):
+        (WebCore::jsTestActiveDOMObjectConstructor):
+        (WebCore::jsTestActiveDOMObjectPrototypeFunctionExcitingFunction):
+        (WebCore::jsTestActiveDOMObjectPrototypeFunctionPostMessage):
+        (WebCore::JSTestActiveDOMObjectOwner::finalize):
+        (WebCore::JSTestActiveDOMObject::toWrapped):
+        * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
+        (WebCore::JSTestCustomConstructorWithNoInterfaceObjectOwner::finalize):
+        (WebCore::JSTestCustomConstructorWithNoInterfaceObject::toWrapped):
+        * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+        (WebCore::jsTestCustomNamedGetterPrototypeFunctionAnotherFunction):
+        (WebCore::JSTestCustomNamedGetterOwner::finalize):
+        (WebCore::JSTestCustomNamedGetter::toWrapped):
+        * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
+        (WebCore::jsTestEventConstructorAttr1):
+        (WebCore::jsTestEventConstructorAttr2):
+        (WebCore::JSTestEventConstructorOwner::finalize):
+        (WebCore::JSTestEventConstructor::toWrapped):
+        * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+        (WebCore::JSTestEventTarget::getOwnPropertySlot):
+        (WebCore::JSTestEventTarget::getOwnPropertySlotByIndex):
+        (WebCore::JSTestEventTarget::getOwnPropertyNames):
+        (WebCore::jsTestEventTargetPrototypeFunctionItem):
+        (WebCore::jsTestEventTargetPrototypeFunctionAddEventListener):
+        (WebCore::jsTestEventTargetPrototypeFunctionRemoveEventListener):
+        (WebCore::jsTestEventTargetPrototypeFunctionDispatchEvent):
+        (WebCore::JSTestEventTarget::visitChildren):
+        (WebCore::JSTestEventTargetOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSTestEventTargetOwner::finalize):
+        (WebCore::JSTestEventTarget::toWrapped):
+        * bindings/scripts/test/JS/JSTestException.cpp:
+        (WebCore::jsTestExceptionName):
+        (WebCore::JSTestExceptionOwner::finalize):
+        (WebCore::JSTestException::toWrapped):
+        * bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
+        (WebCore::JSTestGenerateIsReachableOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSTestGenerateIsReachableOwner::finalize):
+        (WebCore::JSTestGenerateIsReachable::toWrapped):
+        * bindings/scripts/test/JS/JSTestInterface.cpp:
+        (WebCore::jsTestInterfaceImplementsStr1):
+        (WebCore::jsTestInterfaceImplementsStr2):
+        (WebCore::jsTestInterfaceImplementsNode):
+        (WebCore::jsTestInterfaceSupplementalStr1):
+        (WebCore::jsTestInterfaceSupplementalStr2):
+        (WebCore::jsTestInterfaceSupplementalNode):
+        (WebCore::setJSTestInterfaceImplementsStr2):
+        (WebCore::setJSTestInterfaceImplementsNode):
+        (WebCore::setJSTestInterfaceSupplementalStr2):
+        (WebCore::setJSTestInterfaceSupplementalNode):
+        (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod1):
+        (WebCore::jsTestInterfacePrototypeFunctionImplementsMethod2):
+        (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod1):
+        (WebCore::jsTestInterfacePrototypeFunctionSupplementalMethod2):
+        (WebCore::JSTestInterfaceOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSTestInterfaceOwner::finalize):
+        (WebCore::JSTestInterface::toWrapped):
+        * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+        (WebCore::jsTestMediaQueryListListenerPrototypeFunctionMethod):
+        (WebCore::JSTestMediaQueryListListenerOwner::finalize):
+        (WebCore::JSTestMediaQueryListListener::toWrapped):
+        * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+        (WebCore::JSTestNamedConstructorOwner::isReachableFromOpaqueRoots):
+        (WebCore::JSTestNamedConstructorOwner::finalize):
+        (WebCore::JSTestNamedConstructor::toWrapped):
+        * bindings/scripts/test/JS/JSTestNode.cpp:
+        (WebCore::jsTestNodeName):
+        (WebCore::setJSTestNodeName):
+        (WebCore::JSTestNode::visitChildren):
+        * bindings/scripts/test/JS/JSTestNode.h:
+        * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
+        (WebCore::jsTestNondeterministicNondeterministicReadonlyAttr):
+        (WebCore::jsTestNondeterministicNondeterministicWriteableAttr):
+        (WebCore::jsTestNondeterministicNondeterministicExceptionAttr):
+        (WebCore::jsTestNondeterministicNondeterministicGetterExceptionAttr):
+        (WebCore::jsTestNondeterministicNondeterministicSetterExceptionAttr):
+        (WebCore::setJSTestNondeterministicNondeterministicWriteableAttr):
+        (WebCore::setJSTestNondeterministicNondeterministicExceptionAttr):
+        (WebCore::setJSTestNondeterministicNondeterministicGetterExceptionAttr):
+        (WebCore::setJSTestNondeterministicNondeterministicSetterExceptionAttr):
+        (WebCore::jsTestNondeterministicPrototypeFunctionNondeterministicZeroArgFunction):
+        (WebCore::JSTestNondeterministicOwner::finalize):
+        (WebCore::JSTestNondeterministic::toWrapped):
+        * bindings/scripts/test/JS/JSTestObj.cpp:
+        (WebCore::jsTestObjReadOnlyLongAttr):
+        (WebCore::jsTestObjReadOnlyStringAttr):
+        (WebCore::jsTestObjReadOnlyTestObjAttr):
+        (WebCore::jsTestObjTestSubObjEnabledBySettingConstructor):
+        (WebCore::jsTestObjEnumAttr):
+        (WebCore::jsTestObjByteAttr):
+        (WebCore::jsTestObjOctetAttr):
+        (WebCore::jsTestObjShortAttr):
+        (WebCore::jsTestObjUnsignedShortAttr):
+        (WebCore::jsTestObjLongAttr):
+        (WebCore::jsTestObjLongLongAttr):
+        (WebCore::jsTestObjUnsignedLongLongAttr):
+        (WebCore::jsTestObjStringAttr):
+        (WebCore::jsTestObjTestObjAttr):
+        (WebCore::jsTestObjXMLObjAttr):
+        (WebCore::jsTestObjCreate):
+        (WebCore::jsTestObjReflectedStringAttr):
+        (WebCore::jsTestObjReflectedIntegralAttr):
+        (WebCore::jsTestObjReflectedUnsignedIntegralAttr):
+        (WebCore::jsTestObjReflectedBooleanAttr):
+        (WebCore::jsTestObjReflectedURLAttr):
+        (WebCore::jsTestObjReflectedCustomIntegralAttr):
+        (WebCore::jsTestObjReflectedCustomBooleanAttr):
+        (WebCore::jsTestObjReflectedCustomURLAttr):
+        (WebCore::jsTestObjTypedArrayAttr):
+        (WebCore::jsTestObjAttrWithGetterException):
+        (WebCore::jsTestObjAttrWithSetterException):
+        (WebCore::jsTestObjStringAttrWithGetterException):
+        (WebCore::jsTestObjStringAttrWithSetterException):
+        (WebCore::jsTestObjStrictTypeCheckingAttribute):
+        (WebCore::jsTestObjOnfoo):
+        (WebCore::jsTestObjWithScriptStateAttribute):
+        (WebCore::jsTestObjWithCallWithAndSetterCallWithAttribute):
+        (WebCore::jsTestObjWithScriptExecutionContextAttribute):
+        (WebCore::jsTestObjWithScriptStateAttributeRaises):
+        (WebCore::jsTestObjWithScriptExecutionContextAttributeRaises):
+        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttribute):
+        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
+        (WebCore::jsTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
+        (WebCore::jsTestObjWithScriptArgumentsAndCallStackAttribute):
+        (WebCore::jsTestObjConditionalAttr1):
+        (WebCore::jsTestObjConditionalAttr2):
+        (WebCore::jsTestObjConditionalAttr3):
+        (WebCore::jsTestObjCachedAttribute1):
+        (WebCore::jsTestObjCachedAttribute2):
+        (WebCore::jsTestObjAnyAttribute):
+        (WebCore::jsTestObjContentDocument):
+        (WebCore::jsTestObjMutablePoint):
+        (WebCore::jsTestObjImmutablePoint):
+        (WebCore::jsTestObjStrawberry):
+        (WebCore::jsTestObjStrictFloat):
+        (WebCore::jsTestObjDescription):
+        (WebCore::jsTestObjId):
+        (WebCore::jsTestObjHash):
+        (WebCore::jsTestObjReplaceableAttribute):
+        (WebCore::jsTestObjNullableDoubleAttribute):
+        (WebCore::jsTestObjNullableLongAttribute):
+        (WebCore::jsTestObjNullableBooleanAttribute):
+        (WebCore::jsTestObjNullableStringAttribute):
+        (WebCore::jsTestObjNullableLongSettableAttribute):
+        (WebCore::jsTestObjNullableStringValue):
+        (WebCore::jsTestObjAttribute):
+        (WebCore::jsTestObjAttributeWithReservedEnumType):
+        (WebCore::jsTestObjPutForwardsAttribute):
+        (WebCore::jsTestObjPutForwardsNullableAttribute):
+        (WebCore::setJSTestObjEnumAttr):
+        (WebCore::setJSTestObjByteAttr):
+        (WebCore::setJSTestObjOctetAttr):
+        (WebCore::setJSTestObjShortAttr):
+        (WebCore::setJSTestObjUnsignedShortAttr):
+        (WebCore::setJSTestObjLongAttr):
+        (WebCore::setJSTestObjLongLongAttr):
+        (WebCore::setJSTestObjUnsignedLongLongAttr):
+        (WebCore::setJSTestObjStringAttr):
+        (WebCore::setJSTestObjTestObjAttr):
+        (WebCore::setJSTestObjXMLObjAttr):
+        (WebCore::setJSTestObjCreate):
+        (WebCore::setJSTestObjReflectedStringAttr):
+        (WebCore::setJSTestObjReflectedIntegralAttr):
+        (WebCore::setJSTestObjReflectedUnsignedIntegralAttr):
+        (WebCore::setJSTestObjReflectedBooleanAttr):
+        (WebCore::setJSTestObjReflectedURLAttr):
+        (WebCore::setJSTestObjReflectedCustomIntegralAttr):
+        (WebCore::setJSTestObjReflectedCustomBooleanAttr):
+        (WebCore::setJSTestObjReflectedCustomURLAttr):
+        (WebCore::setJSTestObjTypedArrayAttr):
+        (WebCore::setJSTestObjAttrWithGetterException):
+        (WebCore::setJSTestObjAttrWithSetterException):
+        (WebCore::setJSTestObjStringAttrWithGetterException):
+        (WebCore::setJSTestObjStringAttrWithSetterException):
+        (WebCore::setJSTestObjStrictTypeCheckingAttribute):
+        (WebCore::setJSTestObjOnfoo):
+        (WebCore::setJSTestObjWithScriptStateAttribute):
+        (WebCore::setJSTestObjWithCallWithAndSetterCallWithAttribute):
+        (WebCore::setJSTestObjWithScriptExecutionContextAttribute):
+        (WebCore::setJSTestObjWithScriptStateAttributeRaises):
+        (WebCore::setJSTestObjWithScriptExecutionContextAttributeRaises):
+        (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttribute):
+        (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateAttributeRaises):
+        (WebCore::setJSTestObjWithScriptExecutionContextAndScriptStateWithSpacesAttribute):
+        (WebCore::setJSTestObjWithScriptArgumentsAndCallStackAttribute):
+        (WebCore::setJSTestObjConditionalAttr1):
+        (WebCore::setJSTestObjConditionalAttr2):
+        (WebCore::setJSTestObjConditionalAttr3):
+        (WebCore::setJSTestObjAnyAttribute):
+        (WebCore::setJSTestObjMutablePoint):
+        (WebCore::setJSTestObjImmutablePoint):
+        (WebCore::setJSTestObjStrawberry):
+        (WebCore::setJSTestObjStrictFloat):
+        (WebCore::setJSTestObjId):
+        (WebCore::setJSTestObjNullableLongSettableAttribute):
+        (WebCore::setJSTestObjNullableStringValue):
+        (WebCore::setJSTestObjAttributeWithReservedEnumType):
+        (WebCore::setJSTestObjPutForwardsAttribute):
+        (WebCore::setJSTestObjPutForwardsNullableAttribute):
+        (WebCore::jsTestObjPrototypeFunctionVoidMethod):
+        (WebCore::jsTestObjPrototypeFunctionVoidMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionByteMethod):
+        (WebCore::jsTestObjPrototypeFunctionByteMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionOctetMethod):
+        (WebCore::jsTestObjPrototypeFunctionOctetMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionLongMethod):
+        (WebCore::jsTestObjPrototypeFunctionLongMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionObjMethod):
+        (WebCore::jsTestObjPrototypeFunctionObjMethodWithArgs):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithSequenceArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodReturningSequence):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithEnumArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalEnumArgAndDefaultValue):
+        (WebCore::jsTestObjPrototypeFunctionMethodThatRequiresAllArgsAndThrows):
+        (WebCore::jsTestObjPrototypeFunctionSerializedValue):
+        (WebCore::jsTestObjPrototypeFunctionOptionsObject):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithException):
+        (WebCore::jsTestObjPrototypeFunctionPrivateMethod):
+        (WebCore::jsTestObjPrototypeFunctionAddEventListener):
+        (WebCore::jsTestObjPrototypeFunctionRemoveEventListener):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoid):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptStateObj):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptStateVoidException):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptStateObjException):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContext):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptState):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateObjException):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptExecutionContextAndScriptStateWithSpaces):
+        (WebCore::jsTestObjPrototypeFunctionWithScriptArgumentsAndCallStack):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalArgAndDefaultValue):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonOptionalArgAndTwoOptionalArgs):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalString):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringAndDefaultValue):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsUndefined):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithOptionalStringIsNullString):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackFunctionArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithNonCallbackArgAndCallbackFunctionArg):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithCallbackFunctionAndOptionalArg):
+        (WebCore::jsTestObjPrototypeFunctionConditionalMethod1):
+        (WebCore::jsTestObjPrototypeFunctionConditionalMethod2):
+        (WebCore::jsTestObjPrototypeFunctionConditionalMethod3):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod1):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod2):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod3):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod4):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod5):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod6):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod7):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod8):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod9):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod10):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod11):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethod12):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter1):
+        (WebCore::jsTestObjPrototypeFunctionOverloadedMethodWithOptionalParameter2):
+        (WebCore::jsTestObjPrototypeFunctionClassMethodWithClamp):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithUnsignedLongSequence):
+        (WebCore::jsTestObjPrototypeFunctionStringArrayFunction):
+        (WebCore::jsTestObjPrototypeFunctionDomStringListFunction):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence):
+        (WebCore::jsTestObjPrototypeFunctionMethodWithAndWithoutNullableSequence2):
+        (WebCore::jsTestObjPrototypeFunctionGetSVGDocument):
+        (WebCore::jsTestObjPrototypeFunctionConvert1):
+        (WebCore::jsTestObjPrototypeFunctionConvert2):
+        (WebCore::jsTestObjPrototypeFunctionConvert4):
+        (WebCore::jsTestObjPrototypeFunctionConvert5):
+        (WebCore::jsTestObjPrototypeFunctionMutablePointFunction):
+        (WebCore::jsTestObjPrototypeFunctionImmutablePointFunction):
+        (WebCore::jsTestObjPrototypeFunctionOrange):
+        (WebCore::jsTestObjPrototypeFunctionStrictFunction):
+        (WebCore::jsTestObjPrototypeFunctionStrictFunctionWithSequence):
+        (WebCore::jsTestObjPrototypeFunctionStrictFunctionWithArray):
+        (WebCore::jsTestObjPrototypeFunctionVariadicStringMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicDoubleMethod):
+        (WebCore::jsTestObjPrototypeFunctionVariadicNodeMethod):
+        (WebCore::jsTestObjPrototypeFunctionAny):
+        (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionPromise):
+        (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithFloatArgumentPromise):
+        (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithExceptionPromise):
+        (WebCore::jsTestObjPrototypeFunctionTestPromiseFunctionWithOptionalIntArgumentPromise):
+        (WebCore::JSTestObjOwner::finalize):
+        (WebCore::JSTestObj::toWrapped):
+        * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+        (WebCore::JSTestOverloadedConstructorsOwner::finalize):
+        (WebCore::JSTestOverloadedConstructors::toWrapped):
+        * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+        (WebCore::JSTestOverrideBuiltins::getOwnPropertyNames):
+        (WebCore::jsTestOverrideBuiltinsPrototypeFunctionNamedItem):
+        (WebCore::JSTestOverrideBuiltinsOwner::finalize):
+        (WebCore::JSTestOverrideBuiltins::toWrapped):
+        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+        (WebCore::jsTestSerializedScriptValueInterfaceValue):
+        (WebCore::jsTestSerializedScriptValueInterfaceReadonlyValue):
+        (WebCore::jsTestSerializedScriptValueInterfaceCachedValue):
+        (WebCore::jsTestSerializedScriptValueInterfacePorts):
+        (WebCore::jsTestSerializedScriptValueInterfaceCachedReadonlyValue):
+        (WebCore::setJSTestSerializedScriptValueInterfaceValue):
+        (WebCore::setJSTestSerializedScriptValueInterfaceCachedValue):
+        (WebCore::JSTestSerializedScriptValueInterfaceOwner::finalize):
+        (WebCore::JSTestSerializedScriptValueInterface::toWrapped):
+        * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+        (WebCore::jsTestTypedefsUnsignedLongLongAttr):
+        (WebCore::jsTestTypedefsImmutableSerializedScriptValue):
+        (WebCore::jsTestTypedefsAttrWithGetterException):
+        (WebCore::jsTestTypedefsAttrWithSetterException):
+        (WebCore::jsTestTypedefsStringAttrWithGetterException):
+        (WebCore::jsTestTypedefsStringAttrWithSetterException):
+        (WebCore::setJSTestTypedefsUnsignedLongLongAttr):
+        (WebCore::setJSTestTypedefsImmutableSerializedScriptValue):
+        (WebCore::setJSTestTypedefsAttrWithGetterException):
+        (WebCore::setJSTestTypedefsAttrWithSetterException):
+        (WebCore::setJSTestTypedefsStringAttrWithGetterException):
+        (WebCore::setJSTestTypedefsStringAttrWithSetterException):
+        (WebCore::jsTestTypedefsPrototypeFunctionFunc):
+        (WebCore::jsTestTypedefsPrototypeFunctionSetShadow):
+        (WebCore::jsTestTypedefsPrototypeFunctionMethodWithSequenceArg):
+        (WebCore::jsTestTypedefsPrototypeFunctionNullableArrayArg):
+        (WebCore::jsTestTypedefsPrototypeFunctionFuncWithClamp):
+        (WebCore::jsTestTypedefsPrototypeFunctionImmutablePointFunction):
+        (WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction):
+        (WebCore::jsTestTypedefsPrototypeFunctionStringArrayFunction2):
+        (WebCore::jsTestTypedefsPrototypeFunctionCallWithSequenceThatRequiresInclude):
+        (WebCore::jsTestTypedefsPrototypeFunctionMethodWithException):
+        (WebCore::JSTestTypedefsOwner::finalize):
+        (WebCore::JSTestTypedefs::toWrapped):
+        * bindings/scripts/test/JS/JSattribute.cpp:
+        (WebCore::jsattributeReadonly):
+        (WebCore::JSattributeOwner::finalize):
+        (WebCore::JSattribute::toWrapped):
+        * bindings/scripts/test/JS/JSreadonly.cpp:
+        (WebCore::JSreadonlyOwner::finalize):
+        (WebCore::JSreadonly::toWrapped):
+        * bridge/runtime_method.cpp:
+        (JSC::callRuntimeMethod):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::canAccessInspectedScriptState):
+
  2015-11-02  Youenn Fablet  <youenn.fablet@crf.canon.fr>
  
          IDL functions and attributes should be JSBuiltin by default if interface is marked as JSBuiltinConstructor
diff --git a/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm b/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm

index 16bb18ba5b26e169fbcefac5e46ac6e1238955db..e4532c8a15fd5629d2a18588f97b154a208f0dbc 100644 (file)
--- a/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm
+++ b/Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm
@@ -369,7 +369,7 @@ static JSValue *jsValueWithAVMetadataItemInContext(AVMetadataItemType *item, JSC
  JSC::JSValue JSQuickTimePluginReplacement::timedMetaData(JSC::ExecState& state) const
  {
  #if PLATFORM(IOS)
-    HTMLVideoElement* parent = impl().parentElement();
+    HTMLVideoElement* parent = wrapped().parentElement();
      if (!parent || !parent->player())
          return JSC::jsNull();
  
@@ -394,7 +394,7 @@ JSC::JSValue JSQuickTimePluginReplacement::timedMetaData(JSC::ExecState& state)
  JSC::JSValue JSQuickTimePluginReplacement::accessLog(JSC::ExecState& state) const
  {
  #if PLATFORM(IOS)
-    HTMLVideoElement* parent = impl().parentElement();
+    HTMLVideoElement* parent = wrapped().parentElement();
      if (!parent || !parent->player())
          return JSC::jsNull();
  
@@ -416,7 +416,7 @@ JSC::JSValue JSQuickTimePluginReplacement::accessLog(JSC::ExecState& state) cons
  JSC::JSValue JSQuickTimePluginReplacement::errorLog(JSC::ExecState& state) const
  {
  #if PLATFORM(IOS)
-    HTMLVideoElement* parent = impl().parentElement();
+    HTMLVideoElement* parent = wrapped().parentElement();
      if (!parent || !parent->player())
          return JSC::jsNull();
  
diff --git a/Source/WebCore/bindings/js/JSAttrCustom.cpp b/Source/WebCore/bindings/js/JSAttrCustom.cpp

index 42f12f0ed2d13c4e75e064a336bb73c0ad535d35..d45cf6d2c8a8ee2ad7c37adbde708f4dde4a5b40 100644 (file)
--- a/Source/WebCore/bindings/js/JSAttrCustom.cpp
+++ b/Source/WebCore/bindings/js/JSAttrCustom.cpp
@@ -35,7 +35,7 @@ namespace WebCore {
  
  void JSAttr::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    if (Element* element = impl().ownerElement())
+    if (Element* element = wrapped().ownerElement())
          visitor.addOpaqueRoot(root(element));
  }
  
diff --git a/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp b/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp

index 1c9c328b12125d9bbe392ce31e263816e2f134ed..33f768e3c83453dae97502f53483cd3dd29be87a 100644 (file)
--- a/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp
@@ -47,7 +47,7 @@ void JSAudioBufferSourceNode::setBuffer(ExecState& state, JSValue value)
          return;
      }
      
-    if (!impl().setBuffer(buffer))
+    if (!wrapped().setBuffer(buffer))
          state.vm().throwException(&state, createTypeError(&state, "AudioBuffer unsupported number of channels"));
  }
  
diff --git a/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp b/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp

index 36f31d9d62ecd78fd1aaf191c22b9a550022773d..1531815ac6375d960feb2375f5fc3e157c6a9bfb 100644 (file)
--- a/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp
+++ b/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  void JSAudioTrack::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  void JSAudioTrack::setKind(ExecState& state, JSValue value)
@@ -46,7 +46,7 @@ void JSAudioTrack::setKind(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setKind(string);
+    wrapped().setKind(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
@@ -59,7 +59,7 @@ void JSAudioTrack::setLanguage(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setLanguage(string);
+    wrapped().setLanguage(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
diff --git a/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp b/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp

index 831e425c865d4b857d3ac40a8ee97afbaad25c3a..6fd1a5040250e7d4776c6e98f5462e983b158f06 100644 (file)
--- a/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  void JSAudioTrackList::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(impl().element()));
+    visitor.addOpaqueRoot(root(wrapped().element()));
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp b/Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp

index f6fa86f5c374febbc0b81bffcafc5eedca41b31e..921baef3bde293d8a17c236f264e211b98bc60a1 100644 (file)
--- a/Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp
@@ -42,7 +42,7 @@ void JSBiquadFilterNode::setType(ExecState& state, JSValue value)
  #if ENABLE(LEGACY_WEB_AUDIO)
      if (value.isNumber()) {
          uint32_t type = value.toUInt32(&state);
-        if (!impl().setType(type))
+        if (!wrapped().setType(type))
              state.vm().throwException(&state, createTypeError(&state, "Illegal BiquadFilterNode type"));
          return;
      }
@@ -51,7 +51,7 @@ void JSBiquadFilterNode::setType(ExecState& state, JSValue value)
      if (value.isString()) {
          String type = value.toString(&state)->value(&state);
          if (type == "lowpass" || type == "highpass" || type == "bandpass" || type == "lowshelf" || type == "highshelf" || type == "peaking" || type == "notch" || type == "allpass") {
-            impl().setType(type);
+            wrapped().setType(type);
              return;
          }
      }
diff --git a/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp b/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp

index ff263078831f3c97119c7a099a44d022cf3b9ae2..0d337779693110fca97bca1cc31e69821d81d63b 100644 (file)
--- a/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp
@@ -57,7 +57,7 @@ namespace WebCore {
  
  void JSCSSRule::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, CSSRule* rule)
diff --git a/Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp b/Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp

index 89e9921506ff50e81e0c8b8b839f2e986bda93b4..028444fe3dd918bc0d08050e9dbc2862927a5dbf 100644 (file)
--- a/Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp
@@ -41,9 +41,9 @@ bool JSCSSRuleListOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> ha
      JSCSSRuleList* jsCSSRuleList = jsCast<JSCSSRuleList*>(handle.slot()->asCell());
      if (!jsCSSRuleList->hasCustomProperties())
          return false;
-    if (CSSStyleSheet* styleSheet = jsCSSRuleList->impl().styleSheet())
+    if (CSSStyleSheet* styleSheet = jsCSSRuleList->wrapped().styleSheet())
          return visitor.containsOpaqueRoot(root(styleSheet));
-    if (CSSRule* cssRule = jsCSSRuleList->impl().item(0))
+    if (CSSRule* cssRule = jsCSSRuleList->wrapped().item(0))
          return visitor.containsOpaqueRoot(root(cssRule));
      return false;
  }
diff --git a/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp b/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

index de2f907345a768f5cef368849627cb42d5e451ec..91ba31229909d648fc90a7df42f3a5e6923ce9f4 100644 (file)
--- a/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp
@@ -51,7 +51,7 @@ namespace WebCore {
  
  void JSCSSStyleDeclaration::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  class CSSPropertyInfo {
@@ -278,7 +278,7 @@ static inline JSValue getPropertyValueFallback(ExecState* exec, JSCSSStyleDeclar
  {
      // If the property is a shorthand property (such as "padding"),
      // it can only be accessed using getPropertyValue.
-    return jsStringWithCache(exec, thisObj->impl().getPropertyValueInternal(static_cast<CSSPropertyID>(index)));
+    return jsStringWithCache(exec, thisObj->wrapped().getPropertyValueInternal(static_cast<CSSPropertyID>(index)));
  }
  
  static inline JSValue cssPropertyGetterPixelOrPosPrefix(ExecState* exec, JSCSSStyleDeclaration* thisObj, unsigned propertyID)
@@ -288,7 +288,7 @@ static inline JSValue cssPropertyGetterPixelOrPosPrefix(ExecState* exec, JSCSSSt
      // posTop returns "CSS top" as number value in unit pixels _if_ its a
      // positioned element. if it is not a positioned element, return 0
      // from MSIE documentation FIXME: IMPLEMENT THAT (Dirk)
-    RefPtr<CSSValue> v = thisObj->impl().getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propertyID));
+    RefPtr<CSSValue> v = thisObj->wrapped().getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propertyID));
      if (v) {
          if (v->isPrimitiveValue())
              return jsNumber(static_pointer_cast<CSSPrimitiveValue>(v)->getFloatValue(CSSPrimitiveValue::CSS_PX));
@@ -300,7 +300,7 @@ static inline JSValue cssPropertyGetterPixelOrPosPrefix(ExecState* exec, JSCSSSt
  
  static inline JSValue cssPropertyGetter(ExecState* exec, JSCSSStyleDeclaration* thisObj, unsigned propertyID)
  {
-    RefPtr<CSSValue> v = thisObj->impl().getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propertyID));
+    RefPtr<CSSValue> v = thisObj->wrapped().getPropertyCSSValueInternal(static_cast<CSSPropertyID>(propertyID));
      if (v)
          return jsStringOrNull(exec, v->cssText());
  
@@ -341,7 +341,7 @@ bool JSCSSStyleDeclaration::putDelegate(ExecState* exec, PropertyName propertyNa
  
      ExceptionCode ec = 0;
      CSSPropertyID propertyID = static_cast<CSSPropertyID>(propertyInfo.propertyID);
-    impl().setPropertyInternal(propertyID, propValue, important, ec);
+    wrapped().setPropertyInternal(propertyID, propValue, important, ec);
      setDOMException(exec, ec);
  
      return true;
@@ -353,11 +353,11 @@ JSValue JSCSSStyleDeclaration::getPropertyCSSValue(ExecState& state)
      if (state.hadException())
          return jsUndefined();
  
-    RefPtr<CSSValue> cssValue = impl().getPropertyCSSValue(propertyName);
+    RefPtr<CSSValue> cssValue = wrapped().getPropertyCSSValue(propertyName);
      if (!cssValue)
          return jsNull();
  
-    globalObject()->world().m_cssValueRoots.add(cssValue.get(), root(&impl())); // Balanced by JSCSSValueOwner::finalize().
+    globalObject()->world().m_cssValueRoots.add(cssValue.get(), root(&wrapped())); // Balanced by JSCSSValueOwner::finalize().
      return toJS(&state, globalObject(), WTF::getPtr(cssValue));
  }
  
@@ -366,7 +366,7 @@ void JSCSSStyleDeclaration::getOwnPropertyNames(JSObject* object, ExecState* exe
      JSCSSStyleDeclaration* thisObject = jsCast<JSCSSStyleDeclaration*>(object);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
  
-    unsigned length = thisObject->impl().length();
+    unsigned length = thisObject->wrapped().length();
      for (unsigned i = 0; i < length; ++i)
          propertyNames.add(Identifier::from(exec, i));
  
diff --git a/Source/WebCore/bindings/js/JSCSSValueCustom.cpp b/Source/WebCore/bindings/js/JSCSSValueCustom.cpp

index ed512533ed33a392252bf6452c21ebc9aea9a176..d8f4705aebd2ac4f72acb09b028bd53732102ea6 100644 (file)
--- a/Source/WebCore/bindings/js/JSCSSValueCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCSSValueCustom.cpp
@@ -50,7 +50,7 @@ bool JSCSSValueOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handl
      if (!jsCSSValue->hasCustomProperties())
          return false;
      DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
-    void* root = world->m_cssValueRoots.get(&jsCSSValue->impl());
+    void* root = world->m_cssValueRoots.get(&jsCSSValue->wrapped());
      if (!root)
          return false;
      return visitor.containsOpaqueRoot(root);
@@ -60,8 +60,8 @@ void JSCSSValueOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
  {
      JSCSSValue* jsCSSValue = jsCast<JSCSSValue*>(handle.slot()->asCell());
      DOMWrapperWorld& world = *static_cast<DOMWrapperWorld*>(context);
-    world.m_cssValueRoots.remove(&jsCSSValue->impl());
-    uncacheWrapper(world, &jsCSSValue->impl(), jsCSSValue);
+    world.m_cssValueRoots.remove(&jsCSSValue->wrapped());
+    uncacheWrapper(world, &jsCSSValue->wrapped(), jsCSSValue);
  }
  
  JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, CSSValue* value)
diff --git a/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp b/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp

index b993bdc242b42c793c21e9d04721946b390ce7b7..da75802edffa167028ed8e0b124aca1c484323fd 100644 (file)
--- a/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp
@@ -53,9 +53,9 @@ static CanvasStyle toHTMLCanvasStyle(ExecState*, JSValue value)
          return CanvasStyle();
      JSObject* object = asObject(value);
      if (object->inherits(JSCanvasGradient::info()))
-        return CanvasStyle(&jsCast<JSCanvasGradient*>(object)->impl());
+        return CanvasStyle(&jsCast<JSCanvasGradient*>(object)->wrapped());
      if (object->inherits(JSCanvasPattern::info()))
-        return CanvasStyle(&jsCast<JSCanvasPattern*>(object)->impl());
+        return CanvasStyle(&jsCast<JSCanvasPattern*>(object)->wrapped());
      return CanvasStyle();
  }
  
@@ -67,12 +67,12 @@ JSValue JSCanvasRenderingContext2D::commit(ExecState&)
  
  JSValue JSCanvasRenderingContext2D::strokeStyle(ExecState& state) const
  {
-    return toJS(&state, globalObject(), impl().strokeStyle());
+    return toJS(&state, globalObject(), wrapped().strokeStyle());
  }
  
  void JSCanvasRenderingContext2D::setStrokeStyle(ExecState& state, JSValue value)
  {
-    CanvasRenderingContext2D& context = impl();
+    CanvasRenderingContext2D& context = wrapped();
      if (value.isString()) {
          context.setStrokeColor(asString(value)->value(&state));
          return;
@@ -82,12 +82,12 @@ void JSCanvasRenderingContext2D::setStrokeStyle(ExecState& state, JSValue value)
  
  JSValue JSCanvasRenderingContext2D::fillStyle(ExecState& state) const
  {
-    return toJS(&state, globalObject(), impl().fillStyle());
+    return toJS(&state, globalObject(), wrapped().fillStyle());
  }
  
  void JSCanvasRenderingContext2D::setFillStyle(ExecState& state, JSValue value)
  {
-    CanvasRenderingContext2D& context = impl();
+    CanvasRenderingContext2D& context = wrapped();
      if (value.isString()) {
          context.setFillColor(asString(value)->value(&state));
          return;
@@ -97,7 +97,7 @@ void JSCanvasRenderingContext2D::setFillStyle(ExecState& state, JSValue value)
  
  JSValue JSCanvasRenderingContext2D::webkitLineDash(ExecState& state) const
  {
-    const Vector<float>& dash = impl().getLineDash();
+    const Vector<float>& dash = wrapped().getLineDash();
  
      MarkedArgumentBuffer list;
      Vector<float>::const_iterator end = dash.end();
@@ -121,7 +121,7 @@ void JSCanvasRenderingContext2D::setWebkitLineDash(ExecState& state, JSValue val
          dash.append(elem);
      }
  
-    impl().setWebkitLineDash(dash);
+    wrapped().setWebkitLineDash(dash);
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp

index e5dd6e881276c8560afbd5d9513b207f222dddfd..7f50435f5a63d258d2c03fcca0f3785d6b9f4b00 100644 (file)
--- a/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp
@@ -44,7 +44,7 @@ namespace WebCore {
  
  void JSCanvasRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(impl().canvas()));
+    visitor.addOpaqueRoot(root(wrapped().canvas()));
  }
  
  JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, CanvasRenderingContext* object)
diff --git a/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp b/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp

index cb831d04cfb8ef8568476bd8fde3f8f82e9a7c91..6017f1f609fc6df3ebd953e4850338abd3d91c8f 100644 (file)
--- a/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCharacterDataCustom.cpp
@@ -36,7 +36,7 @@ namespace WebCore {
  JSValue JSCharacterData::before(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().before(toNodeOrStringVector(state), ec);
+    wrapped().before(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -45,7 +45,7 @@ JSValue JSCharacterData::before(ExecState& state)
  JSValue JSCharacterData::after(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().after(toNodeOrStringVector(state), ec);
+    wrapped().after(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -54,7 +54,7 @@ JSValue JSCharacterData::after(ExecState& state)
  JSValue JSCharacterData::replaceWith(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().replaceWith(toNodeOrStringVector(state), ec);
+    wrapped().replaceWith(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp b/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp

index b065d5cff1cf1b5064745962bdcd8d61df767f52..55c79212a1240f2fbbb80fb6fe0f54ccdde2b7bf 100644 (file)
--- a/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp
@@ -57,7 +57,7 @@ namespace WebCore {
  
  JSValue JSCommandLineAPIHost::inspectedObject(ExecState& state)
  {
-    CommandLineAPIHost::InspectableObject* object = impl().inspectedObject();
+    CommandLineAPIHost::InspectableObject* object = wrapped().inspectedObject();
      if (!object)
          return jsUndefined();
  
@@ -110,7 +110,7 @@ JSValue JSCommandLineAPIHost::getEventListeners(ExecState& state)
          return jsUndefined();
  
      Vector<EventListenerInfo> listenersArray;
-    impl().getEventListenersImpl(node, listenersArray);
+    wrapped().getEventListenersImpl(node, listenersArray);
  
      JSObject* result = constructEmptyObject(&state);
      for (size_t i = 0; i < listenersArray.size(); ++i) {
@@ -129,7 +129,7 @@ JSValue JSCommandLineAPIHost::inspect(ExecState& state)
      if (state.argumentCount() >= 2) {
          Deprecated::ScriptValue object(state.vm(), state.uncheckedArgument(0));
          Deprecated::ScriptValue hints(state.vm(), state.uncheckedArgument(1));
-        impl().inspectImpl(object.toInspectorValue(&state), hints.toInspectorValue(&state));
+        wrapped().inspectImpl(object.toInspectorValue(&state), hints.toInspectorValue(&state));
      }
  
      return jsUndefined();
@@ -142,7 +142,7 @@ JSValue JSCommandLineAPIHost::databaseId(ExecState& state)
  
      Database* database = JSDatabase::toWrapped(state.uncheckedArgument(0));
      if (database)
-        return jsStringWithCache(&state, impl().databaseIdImpl(database));
+        return jsStringWithCache(&state, wrapped().databaseIdImpl(database));
  
      return jsUndefined();
  }
@@ -154,7 +154,7 @@ JSValue JSCommandLineAPIHost::storageId(ExecState& state)
  
      Storage* storage = JSStorage::toWrapped(state.uncheckedArgument(0));
      if (storage)
-        return jsStringWithCache(&state, impl().storageIdImpl(storage));
+        return jsStringWithCache(&state, wrapped().storageIdImpl(storage));
  
      return jsUndefined();
  }
diff --git a/Source/WebCore/bindings/js/JSCryptoCustom.cpp b/Source/WebCore/bindings/js/JSCryptoCustom.cpp

index d07beaca15a5472b4690aac45c1ad754cf5d9a39..687ecd1b5b573fbbb2b5099dc7eb1f4587896a71 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoCustom.cpp
@@ -46,7 +46,7 @@ JSValue JSCrypto::getRandomValues(ExecState& state)
          return throwTypeError(&state);
  
      ExceptionCode ec = 0;
-    impl().getRandomValues(arrayBufferView.get(), ec);
+    wrapped().getRandomValues(arrayBufferView.get(), ec);
  
      if (ec) {
          setDOMException(&state, ec);
diff --git a/Source/WebCore/bindings/js/JSCryptoKeyCustom.cpp b/Source/WebCore/bindings/js/JSCryptoKeyCustom.cpp

index ad81e4d45b1e61eae1870aaec73de3ae5dbc89f5..58594bef2db29a2f0975ec99ffcaf84051db9d53 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoKeyCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoKeyCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  JSValue JSCryptoKey::algorithm(JSC::ExecState& state) const
  {
      JSCryptoAlgorithmBuilder builder(&state);
-    impl().buildAlgorithmDescription(builder);
+    wrapped().buildAlgorithmDescription(builder);
      return builder.result();
  }
  
diff --git a/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp b/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp

index 9fdb89bc27f68a22a32d9c994bef28dc1232979f..b4ad04622cffdf2882503d56289530ca193c5b07 100644 (file)
--- a/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp
@@ -34,8 +34,8 @@ namespace WebCore {
  
  void JSCryptoKeyPair::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(impl().publicKey());
-    visitor.addOpaqueRoot(impl().privateKey());
+    visitor.addOpaqueRoot(wrapped().publicKey());
+    visitor.addOpaqueRoot(wrapped().privateKey());
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSCustomEventCustom.cpp b/Source/WebCore/bindings/js/JSCustomEventCustom.cpp

index af149daaf05425123fe8869499d5b7bef5803e5a..c556c9e2e500a5757b72c30bdaf5c60b51b0e062 100644 (file)
--- a/Source/WebCore/bindings/js/JSCustomEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSCustomEventCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
      
  JSValue JSCustomEvent::detail(ExecState& state) const
  {
-    CustomEvent& event = impl();
+    CustomEvent& event = wrapped();
      
      if (event.detail().hasNoValue())
          return jsNull();
diff --git a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp

index b287c6b899627b41808998b2676a91e5b781252a..60c57f8d3a193d82dc3c611451d48e627233bd37 100644 (file)
--- a/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
+++ b/Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
@@ -81,7 +81,7 @@ String JSCustomXPathNSResolver::lookupNamespaceURI(const String& prefix)
          callType = m_customResolver->methodTable()->getCallData(m_customResolver.get(), callData);
          if (callType == CallTypeNone) {
              // FIXME: <http://webkit.org/b/114312> JSCustomXPathNSResolver::lookupNamespaceURI Console Message should include Line, Column, and SourceURL
-            if (PageConsoleClient* console = m_globalObject->impl().console())
+            if (PageConsoleClient* console = m_globalObject->wrapped().console())
                  console->addMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("XPathNSResolver does not have a lookupNamespaceURI method."));
              return String();
          }
diff --git a/Source/WebCore/bindings/js/JSDOMBinding.cpp b/Source/WebCore/bindings/js/JSDOMBinding.cpp

index 302c7a9a0674a0f8e0da1c1cec037a54d6249380..20ef609131906e38f3d237e72ec9a27f435d316f 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMBinding.cpp
+++ b/Source/WebCore/bindings/js/JSDOMBinding.cpp
@@ -173,7 +173,7 @@ void reportException(ExecState* exec, Exception* exception, CachedScript* cached
  
      JSDOMGlobalObject* globalObject = jsCast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
      if (JSDOMWindow* window = jsDynamicCast<JSDOMWindow*>(globalObject)) {
-        if (!window->impl().isCurrentlyDisplayedInFrame())
+        if (!window->wrapped().isCurrentlyDisplayedInFrame())
              return;
      }
  
@@ -515,12 +515,12 @@ uint64_t toUInt64(ExecState* exec, JSValue value, IntegerConversionConfiguration
  
  DOMWindow& activeDOMWindow(ExecState* exec)
  {
-    return asJSDOMWindow(exec->lexicalGlobalObject())->impl();
+    return asJSDOMWindow(exec->lexicalGlobalObject())->wrapped();
  }
  
  DOMWindow& firstDOMWindow(ExecState* exec)
  {
-    return asJSDOMWindow(exec->vmEntryGlobalObject())->impl();
+    return asJSDOMWindow(exec->vmEntryGlobalObject())->wrapped();
  }
  
  static inline bool canAccessDocument(JSC::ExecState* state, Document* targetDocument, SecurityReportingOption reportingOption = ReportSecurityError)
diff --git a/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp b/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp

index 13fdb52d6c25319c1938a74292242206acfec678..b048af913d2fb96716d515af305ebb946b66760f 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp
@@ -43,7 +43,7 @@ namespace WebCore {
  
  static HTMLFormElement* toHTMLFormElementOrNull(JSC::JSValue value)
  {
-    return value.inherits(JSHTMLFormElement::info()) ? &jsCast<JSHTMLFormElement*>(asObject(value))->impl() : nullptr;
+    return value.inherits(JSHTMLFormElement::info()) ? &jsCast<JSHTMLFormElement*>(asObject(value))->wrapped() : nullptr;
  }
  
  EncodedJSValue JSC_HOST_CALL constructJSDOMFormData(ExecState* exec)
@@ -64,9 +64,9 @@ JSValue JSDOMFormData::append(ExecState& state)
              String filename;
              if (state.argumentCount() >= 3 && !state.argument(2).isUndefinedOrNull())
                  filename = state.argument(2).toString(&state)->value(&state);
-            impl().append(name, JSBlob::toWrapped(value), filename);
+            wrapped().append(name, JSBlob::toWrapped(value), filename);
          } else
-            impl().append(name, value.toString(&state)->value(&state));
+            wrapped().append(name, value.toString(&state)->value(&state));
      }
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp b/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp

index 4312ae27695e286f7792b40e3dd5c786e8369c02..758cb58d2b0fc6d05afab5b196bbc6a973ebdb4e 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp
@@ -31,7 +31,7 @@ using namespace JSC;
  
  bool JSDOMMimeTypeArray::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp b/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp

index 0dd5451217dc808dd3e9f52abd2b4ffcd64f8b3f..4ff1262927cdcadc2aa2a9ebb06a41d43083042d 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp
@@ -38,7 +38,7 @@ using namespace JSC;
  
  bool JSDOMNamedFlowCollection::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp b/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp

index 2669d837df293465235a89425142ef6c17498306..53b4b4573273e5234db368d0b06b595cb29dc4da 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp
@@ -31,7 +31,7 @@ using namespace JSC;
  
  bool JSDOMPluginArray::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp b/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp

index 1a7586dbffc0323b811b557e39f558b70bcf03e7..ccfca349f2fdf8744eda883a0929adeac5b21195 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMPluginCustom.cpp
@@ -29,7 +29,7 @@ using namespace JSC;
  
  bool JSDOMPlugin::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp b/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp

index fd401b2905f691f6dfffdb5d85dd42534adf289b..5bd33cb2e50383cb73efa7b21ee5c61b7b6eaa1c 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMStringListCustom.cpp
@@ -29,7 +29,7 @@ namespace WebCore {
  RefPtr<DOMStringList> JSDOMStringList::toWrapped(ExecState* exec, JSValue value)
  {
      if (value.inherits(JSDOMStringList::info()))
-        return &jsCast<JSDOMStringList*>(asObject(value))->impl();
+        return &jsCast<JSDOMStringList*>(asObject(value))->wrapped();
  
      if (!isJSArray(value))
          return nullptr;
diff --git a/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp b/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp

index 9af845c1820b6a44918934ee310215e68d74d355..2271fd9ab9a7cad0e3a3b58c9b90e387f0809729 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp
@@ -40,7 +40,7 @@ bool JSDOMStringMap::getOwnPropertySlotDelegate(ExecState* exec, PropertyName pr
      if (propertyName.isSymbol())
          return false;
      bool nameIsValid;
-    const AtomicString& item = impl().item(propertyNameToString(propertyName), nameIsValid);
+    const AtomicString& item = wrapped().item(propertyNameToString(propertyName), nameIsValid);
      if (nameIsValid) {
          slot.setValue(this, ReadOnly | DontDelete | DontEnum, toJS(exec, globalObject(), item));
          return true;
@@ -52,7 +52,7 @@ void JSDOMStringMap::getOwnPropertyNames(JSObject* object, ExecState* exec, Prop
  {
      JSDOMStringMap* thisObject = jsCast<JSDOMStringMap*>(object);
      Vector<String> names;
-    thisObject->impl().getNames(names);
+    thisObject->wrapped().getNames(names);
      size_t length = names.size();
      for (size_t i = 0; i < length; ++i)
          propertyNames.add(Identifier::fromString(exec, names[i]));
@@ -65,7 +65,7 @@ bool JSDOMStringMap::deleteProperty(JSCell* cell, ExecState* exec, PropertyName
      JSDOMStringMap* thisObject = jsCast<JSDOMStringMap*>(cell);
      if (propertyName.isSymbol())
          return Base::deleteProperty(thisObject, exec, propertyName);
-    return thisObject->impl().deleteItem(propertyNameToString(propertyName));
+    return thisObject->wrapped().deleteItem(propertyNameToString(propertyName));
  }
  
  bool JSDOMStringMap::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned index)
@@ -83,7 +83,7 @@ bool JSDOMStringMap::putDelegate(ExecState* exec, PropertyName propertyName, JSV
          return false;
  
      ExceptionCode ec = 0;
-    impl().setItem(propertyNameToString(propertyName), stringValue, ec);
+    wrapped().setItem(propertyNameToString(propertyName), stringValue, ec);
      setDOMException(exec, ec);
      return !ec;
  }
diff --git a/Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp b/Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp

index bdd4877849eca7ccc91bb6da5bc43d16628dddce..54f75d0a19e64e725d54b0943107f609e253bd03 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp
@@ -48,7 +48,7 @@ JSValue JSDOMTokenList::toggle(ExecState& state)
      Optional<bool> force = state.argument(1).isUndefined() ? Nullopt : Optional<bool>(state.uncheckedArgument(1).toBoolean(&state));
      if (UNLIKELY(state.hadException()))
          return jsUndefined();
-    JSValue result = jsBoolean(impl().toggle(token, force, ec));
+    JSValue result = jsBoolean(wrapped().toggle(token, force, ec));
  
      setDOMException(&state, ec);
      return result;
diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp

index 64aab6e0d33a906d3c0216b1c7ece8f8e88b9710..f803dbecb194a565f98ace7ed657520668d38b73 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
@@ -60,7 +60,7 @@ namespace WebCore {
  
  static bool shouldAllowAccessFrom(const JSGlobalObject* thisObject, ExecState* exec)
  {
-    return BindingSecurity::shouldAllowAccessToDOMWindow(exec, asJSDOMWindow(thisObject)->impl());
+    return BindingSecurity::shouldAllowAccessToDOMWindow(exec, asJSDOMWindow(thisObject)->wrapped());
  }
  
  const ClassInfo JSDOMWindowBase::s_info = { "Window", &JSDOMGlobalObject::s_info, 0, CREATE_METHOD_TABLE(JSDOMWindowBase) };
@@ -70,7 +70,7 @@ const GlobalObjectMethodTable JSDOMWindowBase::s_globalObjectMethodTable = { &sh
  JSDOMWindowBase::JSDOMWindowBase(VM& vm, Structure* structure, PassRefPtr<DOMWindow> window, JSDOMWindowShell* shell)
      : JSDOMGlobalObject(vm, structure, &shell->world(), &s_globalObjectMethodTable)
      , m_windowCloseWatchpoints((window && window->frame()) ? IsWatched : IsInvalidated)
-    , m_impl(window)
+    , m_wrapped(window)
      , m_shell(shell)
      , m_privateFunctions(vm)
  {
@@ -134,25 +134,25 @@ void JSDOMWindowBase::destroy(JSCell* cell)
  
  void JSDOMWindowBase::updateDocument()
  {
-    ASSERT(m_impl->document());
+    ASSERT(m_wrapped->document());
      ExecState* exec = globalExec();
-    symbolTablePutWithAttributesTouchWatchpointSet(this, exec, exec->vm().propertyNames->document, toJS(exec, this, m_impl->document()), DontDelete | ReadOnly);
+    symbolTablePutWithAttributesTouchWatchpointSet(this, exec, exec->vm().propertyNames->document, toJS(exec, this, m_wrapped->document()), DontDelete | ReadOnly);
  }
  
  ScriptExecutionContext* JSDOMWindowBase::scriptExecutionContext() const
  {
-    return m_impl->document();
+    return m_wrapped->document();
  }
  
  void JSDOMWindowBase::printErrorMessage(const String& message) const
  {
-    printErrorMessageForFrame(impl().frame(), message);
+    printErrorMessageForFrame(wrapped().frame(), message);
  }
  
  bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
  {
      const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
-    Frame* frame = thisObject->impl().frame();
+    Frame* frame = thisObject->wrapped().frame();
      if (!frame)
          return false;
  
@@ -166,7 +166,7 @@ bool JSDOMWindowBase::supportsProfiling(const JSGlobalObject* object)
  bool JSDOMWindowBase::supportsRichSourceInfo(const JSGlobalObject* object)
  {
      const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
-    Frame* frame = thisObject->impl().frame();
+    Frame* frame = thisObject->wrapped().frame();
      if (!frame)
          return false;
  
@@ -195,16 +195,16 @@ static inline bool shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPag
  bool JSDOMWindowBase::shouldInterruptScript(const JSGlobalObject* object)
  {
      const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
-    ASSERT(thisObject->impl().frame());
-    Page* page = thisObject->impl().frame()->page();
+    ASSERT(thisObject->wrapped().frame());
+    Page* page = thisObject->wrapped().frame()->page();
      return shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page);
  }
  
  bool JSDOMWindowBase::shouldInterruptScriptBeforeTimeout(const JSGlobalObject* object)
  {
      const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
-    ASSERT(thisObject->impl().frame());
-    Page* page = thisObject->impl().frame()->page();
+    ASSERT(thisObject->wrapped().frame());
+    Page* page = thisObject->wrapped().frame()->page();
  
      if (shouldInterruptScriptToPreventInfiniteRecursionWhenClosingPage(page))
          return true;
@@ -220,7 +220,7 @@ bool JSDOMWindowBase::shouldInterruptScriptBeforeTimeout(const JSGlobalObject* o
  RuntimeFlags JSDOMWindowBase::javaScriptRuntimeFlags(const JSGlobalObject* object)
  {
      const JSDOMWindowBase* thisObject = static_cast<const JSDOMWindowBase*>(object);
-    Frame* frame = thisObject->impl().frame();
+    Frame* frame = thisObject->wrapped().frame();
      if (!frame)
          return RuntimeFlags();
      return frame->settings().javaScriptRuntimeFlags();
@@ -328,7 +328,7 @@ void JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(DOMWindow* window)
  JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleName, JSC::JSValue importerModuleKey)
  {
      JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
-    if (RefPtr<Document> document = thisObject->impl().document())
+    if (RefPtr<Document> document = thisObject->wrapped().document())
          return document->moduleLoader()->resolve(globalObject, exec, moduleName, importerModuleKey);
      JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
      return deferred->reject(exec, jsUndefined());
@@ -337,7 +337,7 @@ JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderResolve(JSC::JSGlobalObject
  JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleKey)
  {
      JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
-    if (RefPtr<Document> document = thisObject->impl().document())
+    if (RefPtr<Document> document = thisObject->wrapped().document())
          return document->moduleLoader()->fetch(globalObject, exec, moduleKey);
      JSC::JSInternalPromiseDeferred* deferred = JSC::JSInternalPromiseDeferred::create(exec, globalObject);
      return deferred->reject(exec, jsUndefined());
@@ -346,7 +346,7 @@ JSC::JSInternalPromise* JSDOMWindowBase::moduleLoaderFetch(JSC::JSGlobalObject*
  JSC::JSValue JSDOMWindowBase::moduleLoaderEvaluate(JSC::JSGlobalObject* globalObject, JSC::ExecState* exec, JSC::JSValue moduleKey, JSC::JSValue moduleRecord)
  {
      JSDOMWindowBase* thisObject = JSC::jsCast<JSDOMWindowBase*>(globalObject);
-    if (RefPtr<Document> document = thisObject->impl().document())
+    if (RefPtr<Document> document = thisObject->wrapped().document())
          return document->moduleLoader()->evaluate(globalObject, exec, moduleKey, moduleRecord);
      return JSC::jsUndefined();
  }
diff --git a/Source/WebCore/bindings/js/JSDOMWindowBase.h b/Source/WebCore/bindings/js/JSDOMWindowBase.h

index 107640c1768fb7d82e794b106f023b2914389f9f..d699a5ae57b7f722eaba4882706c1a4e101f3cd8 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWindowBase.h
+++ b/Source/WebCore/bindings/js/JSDOMWindowBase.h
@@ -46,7 +46,7 @@ namespace WebCore {
      public:
          void updateDocument();
  
-        DOMWindow& impl() const { return *m_impl; }
+        DOMWindow& wrapped() const { return *m_wrapped; }
          ScriptExecutionContext* scriptExecutionContext() const;
  
          // Called just before removing this window from the JSDOMWindowShell.
@@ -84,7 +84,7 @@ namespace WebCore {
          static JSC::JSInternalPromise* moduleLoaderFetch(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue);
          static JSC::JSValue moduleLoaderEvaluate(JSC::JSGlobalObject*, JSC::ExecState*, JSC::JSValue, JSC::JSValue);
  
-        RefPtr<DOMWindow> m_impl;
+        RefPtr<DOMWindow> m_wrapped;
          JSDOMWindowShell* m_shell;
  
          JSBuiltinInternalFunctions m_privateFunctions;
diff --git a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

index 0bc33754aa1fbc5a36931734f7d159e42490446e..00e62a42b649bf78563d6088ea38df810596238c 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -62,21 +62,21 @@ namespace WebCore {
  
  void JSDOMWindow::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    if (Frame* frame = impl().frame())
+    if (Frame* frame = wrapped().frame())
          visitor.addOpaqueRoot(frame);
  }
  
  static EncodedJSValue childFrameGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, PropertyName propertyName)
  {
-    return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(slotBase)->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow()));
+    return JSValue::encode(toJS(exec, jsCast<JSDOMWindow*>(slotBase)->wrapped().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))->document()->domWindow()));
  }
  
  static EncodedJSValue namedItemGetter(ExecState* exec, JSObject* slotBase, EncodedJSValue, PropertyName propertyName)
  {
      JSDOMWindowBase* thisObj = jsCast<JSDOMWindow*>(slotBase);
-    Document* document = thisObj->impl().frame()->document();
+    Document* document = thisObj->wrapped().frame()->document();
  
-    ASSERT(BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObj->impl()));
+    ASSERT(BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObj->wrapped()));
      ASSERT(is<HTMLDocument>(document));
  
      AtomicStringImpl* atomicPropertyName = propertyName.publicName();
@@ -96,9 +96,9 @@ static EncodedJSValue namedItemGetter(ExecState* exec, JSObject* slotBase, Encod
  static EncodedJSValue jsDOMWindowWebKit(ExecState* exec, JSObject*, EncodedJSValue thisValue, PropertyName)
  {
      JSDOMWindow* castedThis = toJSDOMWindow(JSValue::decode(thisValue));
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->wrapped()))
          return JSValue::encode(jsUndefined());
-    return JSValue::encode(toJS(exec, castedThis->globalObject(), castedThis->impl().webkitNamespace()));
+    return JSValue::encode(toJS(exec, castedThis->globalObject(), castedThis->wrapped().webkitNamespace()));
  }
  #endif
  
@@ -111,9 +111,9 @@ static EncodedJSValue jsDOMWindowIndexedDB(ExecState* exec, JSObject* slotBase,
      auto* castedThis = toJSDOMWindow(JSValue::decode(thisValue));
      if (!RuntimeEnabledFeatures::sharedFeatures().indexedDBEnabled())
          return JSValue::encode(jsUndefined());
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, castedThis->wrapped()))
          return JSValue::encode(jsUndefined());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = toJS(exec, castedThis->globalObject(), WTF::getPtr(DOMWindowIndexedDatabase::indexedDB(&impl)));
      return JSValue::encode(result);
  }
@@ -129,7 +129,7 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
      // We don't want any properties other than "close" and "closed" on a frameless window (i.e. one whose page got closed,
      // or whose iframe got removed).
      // FIXME: This doesn't fully match Firefox, which allows at least toString in addition to those.
-    if (!thisObject->impl().frame()) {
+    if (!thisObject->wrapped().frame()) {
          // The following code is safe for cross-domain and same domain use.
          // It ignores any custom properties that might be set on the DOMWindow (including a custom prototype).
          if (propertyName == exec->propertyNames().closed) {
@@ -145,14 +145,15 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
          // not allowed. 
          slot.setUndefined();
          return true;
-    } else
-        slot.setWatchpointSet(thisObject->m_windowCloseWatchpoints);
+    }
+
+    slot.setWatchpointSet(thisObject->m_windowCloseWatchpoints);
  
      // We need to check for cross-domain access here without printing the generic warning message
      // because we always allow access to some function, just different ones depending whether access
      // is allowed.
      String errorMessage;
-    bool allowsAccess = shouldAllowAccessToDOMWindow(exec, thisObject->impl(), errorMessage);
+    bool allowsAccess = shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), errorMessage);
      
      // Look for overrides before looking at any of our own properties, but ignore overrides completely
      // if this is cross-domain access.
@@ -176,7 +177,7 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
          slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, nonCachingStaticFunctionGetter<jsDOMWindowPrototypeFunctionPostMessage, 2>);
          return true;
      } else if (propertyName == exec->propertyNames().showModalDialog) {
-        if (!DOMWindow::canShowModalDialog(thisObject->impl().frame())) {
+        if (!DOMWindow::canShowModalDialog(thisObject->wrapped().frame())) {
              slot.setUndefined();
              return true;
          }
@@ -207,7 +208,7 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
      }
  
  #if ENABLE(USER_MESSAGE_HANDLERS)
-    if (propertyName == exec->propertyNames().webkit && thisObject->impl().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
+    if (propertyName == exec->propertyNames().webkit && thisObject->wrapped().shouldHaveWebKitNamespaceForWorld(thisObject->world())) {
          slot.setCacheableCustom(thisObject, allowsAccess ? DontDelete | ReadOnly : ReadOnly | DontDelete | DontEnum, jsDOMWindowWebKit);
          return true;
      }
@@ -237,7 +238,7 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
      // naming frames things that conflict with window properties that
      // are in Moz but not IE. Since we have some of these, we have to do
      // it the Moz way.
-    if (thisObject->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
+    if (thisObject->wrapped().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
          slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, childFrameGetter);
          return true;
      }
@@ -247,9 +248,9 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
  
      // allow window[1] or parent[1] etc. (#56983)
      Optional<uint32_t> index = parseIndex(propertyName);
-    if (index && index.value() < thisObject->impl().frame()->tree().scopedChildCount()) {
+    if (index && index.value() < thisObject->wrapped().frame()->tree().scopedChildCount()) {
          slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum,
-            toJS(exec, thisObject->impl().frame()->tree().scopedChild(index.value())->document()->domWindow()));
+            toJS(exec, thisObject->wrapped().frame()->tree().scopedChild(index.value())->document()->domWindow()));
          return true;
      }
  
@@ -260,7 +261,7 @@ bool JSDOMWindow::getOwnPropertySlot(JSObject* object, ExecState* exec, Property
      }
  
      // Allow shortcuts like 'Image1' instead of document.images.Image1
-    Document* document = thisObject->impl().frame()->document();
+    Document* document = thisObject->wrapped().frame()->document();
      if (is<HTMLDocument>(*document)) {
          AtomicStringImpl* atomicPropertyName = propertyName.publicName();
          if (atomicPropertyName && downcast<HTMLDocument>(*document).hasWindowNamedItem(*atomicPropertyName)) {
@@ -276,7 +277,7 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      
-    if (!thisObject->impl().frame()) {
+    if (!thisObject->wrapped().frame()) {
          // FIXME: We should have a message here that explains why the property access/function call was
          // not allowed. 
          slot.setUndefined();
@@ -287,7 +288,7 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
      // because we always allow access to some function, just different ones depending whether access
      // is allowed.
      String errorMessage;
-    bool allowsAccess = shouldAllowAccessToDOMWindow(exec, thisObject->impl(), errorMessage);
+    bool allowsAccess = shouldAllowAccessToDOMWindow(exec, thisObject->wrapped(), errorMessage);
  
      // Look for overrides before looking at any of our own properties, but ignore overrides completely
      // if this is cross-domain access.
@@ -301,7 +302,7 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
      // naming frames things that conflict with window properties that
      // are in Moz but not IE. Since we have some of these, we have to do
      // it the Moz way.
-    if (thisObject->impl().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
+    if (thisObject->wrapped().frame()->tree().scopedChild(propertyNameToAtomicString(propertyName))) {
          slot.setCustom(thisObject, ReadOnly | DontDelete | DontEnum, childFrameGetter);
          return true;
      }
@@ -323,9 +324,9 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
      // We need to test the correct priority order.
  
      // allow window[1] or parent[1] etc. (#56983)
-    if (index < thisObject->impl().frame()->tree().scopedChildCount()) {
+    if (index < thisObject->wrapped().frame()->tree().scopedChildCount()) {
          slot.setValue(thisObject, ReadOnly | DontDelete | DontEnum,
-            toJS(exec, thisObject->impl().frame()->tree().scopedChild(index)->document()->domWindow()));
+            toJS(exec, thisObject->wrapped().frame()->tree().scopedChild(index)->document()->domWindow()));
          return true;
      }
  
@@ -336,7 +337,7 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
      }
  
      // Allow shortcuts like 'Image1' instead of document.images.Image1
-    Document* document = thisObject->impl().frame()->document();
+    Document* document = thisObject->wrapped().frame()->document();
      if (is<HTMLDocument>(*document)) {
          // This propertyName is generated by Identifier::from.
          // This function generates Identifier from String and always returns the non-symbol Identifier.
@@ -354,12 +355,12 @@ bool JSDOMWindow::getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, u
  void JSDOMWindow::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
-    if (!thisObject->impl().frame())
+    if (!thisObject->wrapped().frame())
          return;
  
      // Optimization: access JavaScript global variables directly before involving the DOM.
      if (thisObject->JSGlobalObject::hasOwnPropertyForWrite(exec, propertyName)) {
-        if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+        if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
              JSGlobalObject::put(thisObject, exec, propertyName, value, slot);
          return;
      }
@@ -367,26 +368,26 @@ void JSDOMWindow::put(JSCell* cell, ExecState* exec, PropertyName propertyName,
      if (lookupPut(exec, propertyName, thisObject, value, *s_info.staticPropHashTable, slot))
          return;
  
-    if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          Base::put(thisObject, exec, propertyName, value, slot);
  }
  
  void JSDOMWindow::putByIndex(JSCell* cell, ExecState* exec, unsigned index, JSValue value, bool shouldThrow)
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
-    if (!thisObject->impl().frame())
+    if (!thisObject->wrapped().frame())
          return;
      
      Identifier propertyName = Identifier::from(exec, index);
  
      // Optimization: access JavaScript global variables directly before involving the DOM.
      if (thisObject->JSGlobalObject::hasOwnPropertyForWrite(exec, propertyName)) {
-        if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+        if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
              JSGlobalObject::putByIndex(thisObject, exec, index, value, shouldThrow);
          return;
      }
      
-    if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          Base::putByIndex(thisObject, exec, index, value, shouldThrow);
  }
  
@@ -394,7 +395,7 @@ bool JSDOMWindow::deleteProperty(JSCell* cell, ExecState* exec, PropertyName pro
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
      // Only allow deleting properties by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return false;
      return Base::deleteProperty(thisObject, exec, propertyName);
  }
@@ -403,7 +404,7 @@ bool JSDOMWindow::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
      // Only allow deleting properties by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return false;
      return Base::deletePropertyByIndex(thisObject, exec, propertyName);
  }
@@ -412,7 +413,7 @@ uint32_t JSDOMWindow::getEnumerableLength(ExecState* exec, JSObject* object)
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow the window to enumerated by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return 0;
      return Base::getEnumerableLength(exec, thisObject);
  }
@@ -421,7 +422,7 @@ void JSDOMWindow::getStructurePropertyNames(JSObject* object, ExecState* exec, P
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow the window to enumerated by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return;
      Base::getStructurePropertyNames(thisObject, exec, propertyNames, mode);
  }
@@ -430,7 +431,7 @@ void JSDOMWindow::getGenericPropertyNames(JSObject* object, ExecState* exec, Pro
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow the window to enumerated by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return;
      Base::getGenericPropertyNames(thisObject, exec, propertyNames, mode);
  }
@@ -439,7 +440,7 @@ void JSDOMWindow::getPropertyNames(JSObject* object, ExecState* exec, PropertyNa
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow the window to enumerated by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return;
      Base::getPropertyNames(thisObject, exec, propertyNames, mode);
  }
@@ -448,7 +449,7 @@ void JSDOMWindow::getOwnPropertyNames(JSObject* object, ExecState* exec, Propert
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow the window to enumerated by frames in the same origin.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return;
      Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
  }
@@ -457,7 +458,7 @@ bool JSDOMWindow::defineOwnProperty(JSC::JSObject* object, JSC::ExecState* exec,
  {
      JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(object);
      // Only allow defining properties in this way by frames in the same origin, as it allows setters to be introduced.
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(exec, thisObject->wrapped()))
          return false;
  
      // Don't allow shadowing location using accessor properties.
@@ -476,7 +477,7 @@ void JSDOMWindow::setLocation(ExecState& state, JSValue value)
      // a property named "location" instead of performing a navigation (<rdar://problem/5688039>).
      if (Frame* activeFrame = activeDOMWindow(&state).frame()) {
          if (activeFrame->settings().usesDashboardBackwardCompatibilityMode() && !activeFrame->tree().parent()) {
-            if (BindingSecurity::shouldAllowAccessToDOMWindow(&state, impl()))
+            if (BindingSecurity::shouldAllowAccessToDOMWindow(&state, wrapped()))
                  putDirect(state.vm(), Identifier::fromString(&state, "location"), value);
              return;
          }
@@ -487,7 +488,7 @@ void JSDOMWindow::setLocation(ExecState& state, JSValue value)
      if (state.hadException())
          return;
  
-    if (Location* location = impl().location())
+    if (Location* location = wrapped().location())
          location->setHref(activeDOMWindow(&state), firstDOMWindow(&state), locationString);
  }
  
@@ -530,7 +531,7 @@ JSValue JSDOMWindow::open(ExecState& state)
      if (state.hadException())
          return jsUndefined();
  
-    RefPtr<DOMWindow> openedWindow = impl().open(urlString, frameName, windowFeaturesString, activeDOMWindow(&state), firstDOMWindow(&state));
+    RefPtr<DOMWindow> openedWindow = wrapped().open(urlString, frameName, windowFeaturesString, activeDOMWindow(&state), firstDOMWindow(&state));
      if (!openedWindow)
          return jsUndefined();
      return toJS(&state, openedWindow.get());
@@ -585,7 +586,7 @@ JSValue JSDOMWindow::showModalDialog(ExecState& state)
  
      DialogHandler handler(state);
  
-    impl().showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(&state), firstDOMWindow(&state), [&handler](DOMWindow& dialog) {
+    wrapped().showModalDialog(urlString, dialogFeaturesString, activeDOMWindow(&state), firstDOMWindow(&state), [&handler](DOMWindow& dialog) {
          handler.dialogCreated(dialog);
      });
  
@@ -635,12 +636,12 @@ static JSValue handlePostMessage(DOMWindow& impl, ExecState& state)
  
  JSValue JSDOMWindow::postMessage(ExecState& state)
  {
-    return handlePostMessage(impl(), state);
+    return handlePostMessage(wrapped(), state);
  }
  
  JSValue JSDOMWindow::setTimeout(ExecState& state)
  {
-    ContentSecurityPolicy* contentSecurityPolicy = impl().document() ? impl().document()->contentSecurityPolicy() : nullptr;
+    ContentSecurityPolicy* contentSecurityPolicy = wrapped().document() ? wrapped().document()->contentSecurityPolicy() : nullptr;
      std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), contentSecurityPolicy);
      if (state.hadException())
          return jsUndefined();
@@ -651,7 +652,7 @@ JSValue JSDOMWindow::setTimeout(ExecState& state)
      int delay = state.argument(1).toInt32(&state);
  
      ExceptionCode ec = 0;
-    int result = impl().setTimeout(WTF::move(action), delay, ec);
+    int result = wrapped().setTimeout(WTF::move(action), delay, ec);
      setDOMException(&state, ec);
  
      return jsNumber(result);
@@ -659,7 +660,7 @@ JSValue JSDOMWindow::setTimeout(ExecState& state)
  
  JSValue JSDOMWindow::setInterval(ExecState& state)
  {
-    ContentSecurityPolicy* contentSecurityPolicy = impl().document() ? impl().document()->contentSecurityPolicy() : nullptr;
+    ContentSecurityPolicy* contentSecurityPolicy = wrapped().document() ? wrapped().document()->contentSecurityPolicy() : nullptr;
      std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), contentSecurityPolicy);
      if (state.hadException())
          return jsUndefined();
@@ -669,7 +670,7 @@ JSValue JSDOMWindow::setInterval(ExecState& state)
          return jsNumber(0);
  
      ExceptionCode ec = 0;
-    int result = impl().setInterval(WTF::move(action), delay, ec);
+    int result = wrapped().setInterval(WTF::move(action), delay, ec);
      setDOMException(&state, ec);
  
      return jsNumber(result);
@@ -677,7 +678,7 @@ JSValue JSDOMWindow::setInterval(ExecState& state)
  
  JSValue JSDOMWindow::addEventListener(ExecState& state)
  {
-    Frame* frame = impl().frame();
+    Frame* frame = wrapped().frame();
      if (!frame)
          return jsUndefined();
  
@@ -685,13 +686,13 @@ JSValue JSDOMWindow::addEventListener(ExecState& state)
      if (!listener.isObject())
          return jsUndefined();
  
-    impl().addEventListener(state.argument(0).toString(&state)->toAtomicString(&state), JSEventListener::create(asObject(listener), this, false, globalObject()->world()), state.argument(2).toBoolean(&state));
+    wrapped().addEventListener(state.argument(0).toString(&state)->toAtomicString(&state), JSEventListener::create(asObject(listener), this, false, globalObject()->world()), state.argument(2).toBoolean(&state));
      return jsUndefined();
  }
  
  JSValue JSDOMWindow::removeEventListener(ExecState& state)
  {
-    Frame* frame = impl().frame();
+    Frame* frame = wrapped().frame();
      if (!frame)
          return jsUndefined();
  
@@ -699,7 +700,7 @@ JSValue JSDOMWindow::removeEventListener(ExecState& state)
      if (!listener.isObject())
          return jsUndefined();
  
-    impl().removeEventListener(state.argument(0).toString(&state)->toAtomicString(&state), JSEventListener::create(asObject(listener), this, false, globalObject()->world()).ptr(), state.argument(2).toBoolean(&state));
+    wrapped().removeEventListener(state.argument(0).toString(&state)->toAtomicString(&state), JSEventListener::create(asObject(listener), this, false, globalObject()->world()).ptr(), state.argument(2).toBoolean(&state));
      return jsUndefined();
  }
  
@@ -709,9 +710,9 @@ DOMWindow* JSDOMWindow::toWrapped(JSValue value)
          return 0;
      JSObject* object = asObject(value);
      if (object->inherits(JSDOMWindow::info()))
-        return &jsCast<JSDOMWindow*>(object)->impl();
+        return &jsCast<JSDOMWindow*>(object)->wrapped();
      if (object->inherits(JSDOMWindowShell::info()))
-        return &jsCast<JSDOMWindowShell*>(object)->impl();
+        return &jsCast<JSDOMWindowShell*>(object)->wrapped();
      return 0;
  }
  
diff --git a/Source/WebCore/bindings/js/JSDOMWindowShell.cpp b/Source/WebCore/bindings/js/JSDOMWindowShell.cpp

index 54cb5e5404201505d5da7ea47e74fa0c2ef0e064..1120668522229f7d16def869df917967f51ca704 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWindowShell.cpp
+++ b/Source/WebCore/bindings/js/JSDOMWindowShell.cpp
@@ -73,7 +73,7 @@ void JSDOMWindowShell::setWindow(PassRefPtr<DOMWindow> domWindow)
  {
      // Replacing JSDOMWindow via telling JSDOMWindowShell to use the same DOMWindow it already uses makes no sense,
      // so we'd better never try to.
-    ASSERT(!window() || domWindow.get() != &window()->impl());
+    ASSERT(!window() || domWindow.get() != &window()->wrapped());
      // Explicitly protect the global object's prototype so it isn't collected
      // when we allocate the global object. (Once the global object is fully
      // constructed, it can mark its own prototype.)
@@ -94,9 +94,9 @@ void JSDOMWindowShell::setWindow(PassRefPtr<DOMWindow> domWindow)
  // JSDOMWindow methods
  // ----
  
-DOMWindow& JSDOMWindowShell::impl() const
+DOMWindow& JSDOMWindowShell::wrapped() const
  {
-    return window()->impl();
+    return window()->wrapped();
  }
  
  // ----
diff --git a/Source/WebCore/bindings/js/JSDOMWindowShell.h b/Source/WebCore/bindings/js/JSDOMWindowShell.h

index cedb59c7352acdf10a3176a07b2183ae752c68a8..01f048d67a4f5b8d0f1ee969d5d27545f12746d0 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWindowShell.h
+++ b/Source/WebCore/bindings/js/JSDOMWindowShell.h
@@ -48,7 +48,7 @@ namespace WebCore {
  
          DECLARE_INFO;
  
-        DOMWindow& impl() const;
+        DOMWindow& wrapped() const;
  
          static JSDOMWindowShell* create(JSC::VM& vm, PassRefPtr<DOMWindow> window, JSC::Structure* structure, DOMWrapperWorld& world)
          {
diff --git a/Source/WebCore/bindings/js/JSDOMWrapper.h b/Source/WebCore/bindings/js/JSDOMWrapper.h

index e49415e2bc424580c2bc900bd323f67b08095235..2626f58aeea90245100bd2db9ae107de0c33dee3 100644 (file)
--- a/Source/WebCore/bindings/js/JSDOMWrapper.h
+++ b/Source/WebCore/bindings/js/JSDOMWrapper.h
@@ -52,16 +52,15 @@ template<typename ImplementationClass> class JSDOMWrapper : public JSDOMObject {
  public:
      typedef JSDOMObject Base;
  
-    ImplementationClass& impl() const { return *m_impl; }
-    ~JSDOMWrapper() { std::exchange(m_impl, nullptr)->deref(); }
+    ImplementationClass& wrapped() const { return const_cast<ImplementationClass&>(m_wrapped.get()); }
  
  protected:
      JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject& globalObject, Ref<ImplementationClass>&& impl)
          : Base(structure, globalObject)
-        , m_impl(&impl.leakRef()) { }
+        , m_wrapped(WTF::move(impl)) { }
  
  private:
-    ImplementationClass* m_impl;
+    Ref<ImplementationClass> m_wrapped;
  };
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSDataCueCustom.cpp b/Source/WebCore/bindings/js/JSDataCueCustom.cpp

index 7ab3245d0bbc2bd7df57f2b759b34b0480f335a1..be53ebed95141bf68561975c4167ae52c01e2ebd 100644 (file)
--- a/Source/WebCore/bindings/js/JSDataCueCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDataCueCustom.cpp
@@ -38,12 +38,12 @@ namespace WebCore {
  #if ENABLE(DATACUE_VALUE)
  JSValue JSDataCue::value(ExecState& state) const
  {
-    return impl().value(&state);
+    return wrapped().value(&state);
  }
  
  void JSDataCue::setValue(ExecState& state, JSValue value)
  {
-    impl().setValue(&state, value);
+    wrapped().setValue(&state, value);
  }
  #endif
  
diff --git a/Source/WebCore/bindings/js/JSDataTransferCustom.cpp b/Source/WebCore/bindings/js/JSDataTransferCustom.cpp

index 0b0fa9076016567131cb8d7033c9c8618c0a1de8..dfc8d44cf66d5de2ed92d2ecdba1f3656628e744 100644 (file)
--- a/Source/WebCore/bindings/js/JSDataTransferCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDataTransferCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  JSValue JSDataTransfer::types(ExecState& state) const
  {
-    Vector<String> types = impl().types();
+    Vector<String> types = wrapped().types();
      return types.isEmpty() ? jsNull() : jsArray(&state, globalObject(), types);
  }
  
diff --git a/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp b/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp

index 8389d61e58313854f55633c2c93d511730c3ea0e..0e9b9767fc329cd9ec563bd9be4c1feff168599d 100644 (file)
--- a/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp
@@ -41,7 +41,7 @@ namespace WebCore {
  
  JSC::JSValue JSDedicatedWorkerGlobalScope::postMessage(JSC::ExecState& state)
  {
-    return handlePostMessage(state, &impl());
+    return handlePostMessage(state, &wrapped());
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp b/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp

index 7d80f6f1b8fea1d0a77edf8886b3ed330f66bf00..73762caa13c54fe5cfb9637809190f48c6689e9d 100644 (file)
--- a/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp
@@ -136,7 +136,7 @@ static JSObject* createRotationRateObject(const DeviceMotionData::RotationRate*
  
  JSValue JSDeviceMotionEvent::acceleration(ExecState& state) const
  {
-    DeviceMotionEvent& imp = impl();
+    DeviceMotionEvent& imp = wrapped();
      if (!imp.deviceMotionData()->acceleration())
          return jsNull();
      return createAccelerationObject(imp.deviceMotionData()->acceleration(), state);
@@ -144,7 +144,7 @@ JSValue JSDeviceMotionEvent::acceleration(ExecState& state) const
  
  JSValue JSDeviceMotionEvent::accelerationIncludingGravity(ExecState& state) const
  {
-    DeviceMotionEvent& imp = impl();
+    DeviceMotionEvent& imp = wrapped();
      if (!imp.deviceMotionData()->accelerationIncludingGravity())
          return jsNull();
      return createAccelerationObject(imp.deviceMotionData()->accelerationIncludingGravity(), state);
@@ -152,7 +152,7 @@ JSValue JSDeviceMotionEvent::accelerationIncludingGravity(ExecState& state) cons
  
  JSValue JSDeviceMotionEvent::rotationRate(ExecState& state) const
  {
-    DeviceMotionEvent& imp = impl();
+    DeviceMotionEvent& imp = wrapped();
      if (!imp.deviceMotionData()->rotationRate())
          return jsNull();
      return createRotationRateObject(imp.deviceMotionData()->rotationRate(), state);
@@ -160,7 +160,7 @@ JSValue JSDeviceMotionEvent::rotationRate(ExecState& state) const
  
  JSValue JSDeviceMotionEvent::interval(ExecState&) const
  {
-    DeviceMotionEvent& imp = impl();
+    DeviceMotionEvent& imp = wrapped();
      if (!imp.deviceMotionData()->canProvideInterval())
          return jsNull();
      return jsNumber(imp.deviceMotionData()->interval());
@@ -189,7 +189,7 @@ JSValue JSDeviceMotionEvent::initDeviceMotionEvent(ExecState& state)
      bool intervalProvided = !state.argument(6).isUndefinedOrNull();
      double interval = state.argument(6).toNumber(&state);
      RefPtr<DeviceMotionData> deviceMotionData = DeviceMotionData::create(acceleration, accelerationIncludingGravity, rotationRate, intervalProvided, interval);
-    impl().initDeviceMotionEvent(type, bubbles, cancelable, deviceMotionData.get());
+    wrapped().initDeviceMotionEvent(type, bubbles, cancelable, deviceMotionData.get());
      return jsUndefined();
  }
  
diff --git a/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp b/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp

index 1127052bc605e7acdf6d5da66dc428f8a8bf8ec6..56abd9b2418022e16e3984dc3750cb55226f71b3 100644 (file)
--- a/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp
@@ -40,7 +40,7 @@ namespace WebCore {
  
  JSValue JSDeviceOrientationEvent::alpha(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideAlpha())
          return jsNull();
      return jsNumber(imp.orientation()->alpha());
@@ -48,7 +48,7 @@ JSValue JSDeviceOrientationEvent::alpha(ExecState&) const
  
  JSValue JSDeviceOrientationEvent::beta(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideBeta())
          return jsNull();
      return jsNumber(imp.orientation()->beta());
@@ -56,7 +56,7 @@ JSValue JSDeviceOrientationEvent::beta(ExecState&) const
  
  JSValue JSDeviceOrientationEvent::gamma(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideGamma())
          return jsNull();
      return jsNumber(imp.orientation()->gamma());
@@ -65,7 +65,7 @@ JSValue JSDeviceOrientationEvent::gamma(ExecState&) const
  #if PLATFORM(IOS)
  JSValue JSDeviceOrientationEvent::webkitCompassHeading(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideCompassHeading())
          return jsNull();
      return jsNumber(imp.orientation()->compassHeading());
@@ -73,7 +73,7 @@ JSValue JSDeviceOrientationEvent::webkitCompassHeading(ExecState&) const
  
  JSValue JSDeviceOrientationEvent::webkitCompassAccuracy(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideCompassAccuracy())
          return jsNull();
      return jsNumber(imp.orientation()->compassAccuracy());
@@ -83,7 +83,7 @@ JSValue JSDeviceOrientationEvent::webkitCompassAccuracy(ExecState&) const
  #if !PLATFORM(IOS)
  JSValue JSDeviceOrientationEvent::absolute(ExecState&) const
  {
-    DeviceOrientationEvent& imp = impl();
+    DeviceOrientationEvent& imp = wrapped();
      if (!imp.orientation()->canProvideAbsolute())
          return jsNull();
      return jsBoolean(imp.orientation()->absolute());
@@ -114,7 +114,7 @@ JSValue JSDeviceOrientationEvent::initDeviceOrientationEvent(ExecState& state)
      bool absolute = state.argument(6).toBoolean(&state);
      RefPtr<DeviceOrientationData> orientation = DeviceOrientationData::create(alphaProvided, alpha, betaProvided, beta, gammaProvided, gamma, absoluteProvided, absolute);
  #endif
-    impl().initDeviceOrientationEvent(type, bubbles, cancelable, orientation.get());
+    wrapped().initDeviceOrientationEvent(type, bubbles, cancelable, orientation.get());
      return jsUndefined();
  }
  
diff --git a/Source/WebCore/bindings/js/JSDocumentCustom.cpp b/Source/WebCore/bindings/js/JSDocumentCustom.cpp

index ec0b9c2ba30e860f6e2ba980170d8f702b4452d7..094ce3e322db0d70b20a8dba30e4b12359c98471 100644 (file)
--- a/Source/WebCore/bindings/js/JSDocumentCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDocumentCustom.cpp
@@ -103,7 +103,7 @@ JSValue toJSNewlyCreated(ExecState* state, JSDOMGlobalObject* globalObject, Docu
  JSValue JSDocument::prepend(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().prepend(toNodeOrStringVector(state), ec);
+    wrapped().prepend(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -112,7 +112,7 @@ JSValue JSDocument::prepend(ExecState& state)
  JSValue JSDocument::append(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().append(toNodeOrStringVector(state), ec);
+    wrapped().append(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp b/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp

index c352d5db97bbcde0c6cfc961dbaea481cb7215c5..7da3847c176f0670c7ccd5912f36902fd9c04899 100644 (file)
--- a/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  JSValue JSDocumentFragment::prepend(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().prepend(toNodeOrStringVector(state), ec);
+    wrapped().prepend(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -46,7 +46,7 @@ JSValue JSDocumentFragment::prepend(ExecState& state)
  JSValue JSDocumentFragment::append(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().append(toNodeOrStringVector(state), ec);
+    wrapped().append(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp b/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp

index 833387201bbf602b5553608beb5510629cecb95a..a93d67173d942556b0f2262cb40819220b3fe9d5 100644 (file)
--- a/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp
@@ -36,7 +36,7 @@ namespace WebCore {
  JSValue JSDocumentType::before(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().before(toNodeOrStringVector(state), ec);
+    wrapped().before(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -45,7 +45,7 @@ JSValue JSDocumentType::before(ExecState& state)
  JSValue JSDocumentType::after(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().after(toNodeOrStringVector(state), ec);
+    wrapped().after(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -54,7 +54,7 @@ JSValue JSDocumentType::after(ExecState& state)
  JSValue JSDocumentType::replaceWith(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().replaceWith(toNodeOrStringVector(state), ec);
+    wrapped().replaceWith(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSElementCustom.cpp b/Source/WebCore/bindings/js/JSElementCustom.cpp

index fefde357a7dcb6eb7c5d6f661e7b57f5c00e9431..1d65242f161a8be662bf736ff82d5f8a66e198a4 100644 (file)
--- a/Source/WebCore/bindings/js/JSElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSElementCustom.cpp
@@ -70,7 +70,7 @@ JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, Element* e
  JSValue JSElement::before(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().before(toNodeOrStringVector(state), ec);
+    wrapped().before(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -79,7 +79,7 @@ JSValue JSElement::before(ExecState& state)
  JSValue JSElement::after(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().after(toNodeOrStringVector(state), ec);
+    wrapped().after(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -88,7 +88,7 @@ JSValue JSElement::after(ExecState& state)
  JSValue JSElement::replaceWith(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().replaceWith(toNodeOrStringVector(state), ec);
+    wrapped().replaceWith(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -97,7 +97,7 @@ JSValue JSElement::replaceWith(ExecState& state)
  JSValue JSElement::prepend(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().prepend(toNodeOrStringVector(state), ec);
+    wrapped().prepend(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
@@ -106,7 +106,7 @@ JSValue JSElement::prepend(ExecState& state)
  JSValue JSElement::append(ExecState& state)
  {
      ExceptionCode ec = 0;
-    impl().append(toNodeOrStringVector(state), ec);
+    wrapped().append(toNodeOrStringVector(state), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSEventCustom.cpp b/Source/WebCore/bindings/js/JSEventCustom.cpp

index 51e9f0d930f6c9f698fd20aca9b801a687af87e0..60995416956fbde1518a59addc0a5f406695f5bd 100644 (file)
--- a/Source/WebCore/bindings/js/JSEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSEventCustom.cpp
@@ -46,7 +46,7 @@ namespace WebCore {
  
  JSValue JSEvent::clipboardData(ExecState& state) const
  {
-    return impl().isClipboardEvent() ? toJS(&state, globalObject(), impl().clipboardData()) : jsUndefined();
+    return wrapped().isClipboardEvent() ? toJS(&state, globalObject(), wrapped().clipboardData()) : jsUndefined();
  }
  
  #define TRY_TO_WRAP_WITH_INTERFACE(interfaceName) \
diff --git a/Source/WebCore/bindings/js/JSEventListener.cpp b/Source/WebCore/bindings/js/JSEventListener.cpp

index 280ca12debd0f00f85eab30c98cdb378edf370cb..83eca94a407e3a1299cabf729882647cef685f75 100644 (file)
--- a/Source/WebCore/bindings/js/JSEventListener.cpp
+++ b/Source/WebCore/bindings/js/JSEventListener.cpp
@@ -91,10 +91,10 @@ void JSEventListener::handleEvent(ScriptExecutionContext* scriptExecutionContext
  
      if (scriptExecutionContext->isDocument()) {
          JSDOMWindow* window = jsCast<JSDOMWindow*>(globalObject);
-        if (!window->impl().isCurrentlyDisplayedInFrame())
+        if (!window->wrapped().isCurrentlyDisplayedInFrame())
              return;
          // FIXME: Is this check needed for other contexts?
-        ScriptController& script = window->impl().frame()->script();
+        ScriptController& script = window->wrapped().frame()->script();
          if (!script.canExecuteScripts(AboutToExecuteScript) || script.isPaused())
              return;
      }
diff --git a/Source/WebCore/bindings/js/JSEventTargetCustom.cpp b/Source/WebCore/bindings/js/JSEventTargetCustom.cpp

index c7c74505a6a1faef0cc7da9b2c665324e2d4f79c..e8ead1c1d42f0ddffee966e1820ed0250882f4bf 100644 (file)
--- a/Source/WebCore/bindings/js/JSEventTargetCustom.cpp
+++ b/Source/WebCore/bindings/js/JSEventTargetCustom.cpp
@@ -56,7 +56,7 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, EventTarget* targ
  
  #define TRY_TO_UNWRAP_WITH_INTERFACE(interfaceName) \
      if (value.inherits(JS##interfaceName::info()))                      \
-        return &jsCast<JS##interfaceName*>(asObject(value))->impl();
+        return &jsCast<JS##interfaceName*>(asObject(value))->wrapped();
  
  EventTarget* JSEventTarget::toWrapped(JSC::JSValue value)
  {
diff --git a/Source/WebCore/bindings/js/JSFileReaderCustom.cpp b/Source/WebCore/bindings/js/JSFileReaderCustom.cpp

index 51fbf4fa182f4c3bc46ba58fbde07c5ef58f1069..a3c09b18304119a8ee8dd77b4d7dff5482d3b09d 100644 (file)
--- a/Source/WebCore/bindings/js/JSFileReaderCustom.cpp
+++ b/Source/WebCore/bindings/js/JSFileReaderCustom.cpp
@@ -43,7 +43,7 @@ namespace WebCore {
  
  JSValue JSFileReader::result(ExecState& state) const
  {
-    FileReader& imp = impl();
+    FileReader& imp = wrapped();
      if (imp.readType() == FileReaderLoader::ReadAsArrayBuffer)
          return toJS(&state, globalObject(), WTF::getPtr(imp.arrayBufferResult()));
      return jsOwnedStringOrNull(&state, imp.stringResult());
diff --git a/Source/WebCore/bindings/js/JSGeolocationCustom.cpp b/Source/WebCore/bindings/js/JSGeolocationCustom.cpp

index ebc5ba7ab630cfa53d015b2c6d34238945280917..b01be7dbd0f03eca80c6d095f0aec8c776e852dc 100644 (file)
--- a/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
+++ b/Source/WebCore/bindings/js/JSGeolocationCustom.cpp
@@ -114,7 +114,7 @@ JSValue JSGeolocation::getCurrentPosition(ExecState& state)
          return jsUndefined();
      ASSERT(positionOptions);
  
-    impl().getCurrentPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
+    wrapped().getCurrentPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
      return jsUndefined();
  }
  
@@ -136,7 +136,7 @@ JSValue JSGeolocation::watchPosition(ExecState& state)
          return jsUndefined();
      ASSERT(positionOptions);
  
-    int watchID = impl().watchPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
+    int watchID = wrapped().watchPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
      return jsNumber(watchID);
  }
  
diff --git a/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp b/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp

index 2592f4672e8a2170ebffea22d8335581339f21f9..94bc324aede380f0ad929c8434c5b9daa99b0c53 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  static JSValue namedItems(ExecState& state, JSHTMLAllCollection* collection, PropertyName propertyName)
  {
-    Vector<Ref<Element>> namedItems = collection->impl().namedItems(propertyNameToAtomicString(propertyName));
+    Vector<Ref<Element>> namedItems = collection->wrapped().namedItems(propertyNameToAtomicString(propertyName));
  
      if (namedItems.isEmpty())
          return jsUndefined();
@@ -58,7 +58,7 @@ static EncodedJSValue JSC_HOST_CALL callHTMLAllCollection(ExecState* exec)
  
      // Do not use thisObj here. It can be the JSHTMLDocument, in the document.forms(i) case.
      JSHTMLAllCollection* jsCollection = jsCast<JSHTMLAllCollection*>(exec->callee());
-    HTMLAllCollection& collection = jsCollection->impl();
+    HTMLAllCollection& collection = jsCollection->wrapped();
  
      // Also, do we need the TypeError test here ?
  
@@ -101,7 +101,7 @@ bool JSHTMLAllCollection::nameGetter(ExecState* state, PropertyName propertyName
  JSValue JSHTMLAllCollection::item(ExecState& state)
  {
      if (Optional<uint32_t> index = parseIndex(*state.argument(0).toString(&state)->value(&state).impl()))
-        return toJS(&state, globalObject(), impl().item(index.value()));
+        return toJS(&state, globalObject(), wrapped().item(index.value()));
      return namedItems(state, this, Identifier::fromString(&state, state.argument(0).toString(&state)->value(&state)));
  }
  
diff --git a/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp

index e6ec8dc3ceaf4faf133e48e9459b98a6288dc681..14ad95bb176352897860317c820281f08dfd0b73 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp
@@ -68,7 +68,7 @@ static void get3DContextAttributes(ExecState& state, RefPtr<CanvasContextAttribu
  
  JSValue JSHTMLCanvasElement::getContext(ExecState& state)
  {
-    HTMLCanvasElement& canvas = impl();
+    HTMLCanvasElement& canvas = wrapped();
      const String& contextId = state.argument(0).toString(&state)->value(&state);
      
      RefPtr<CanvasContextAttributes> attrs;
@@ -88,7 +88,7 @@ JSValue JSHTMLCanvasElement::getContext(ExecState& state)
  
  JSValue JSHTMLCanvasElement::probablySupportsContext(ExecState& state)
  {
-    HTMLCanvasElement& canvas = impl();
+    HTMLCanvasElement& canvas = wrapped();
      if (!state.argumentCount())
          return jsBoolean(false);
      const String& contextId = state.uncheckedArgument(0).toString(&state)->value(&state);
@@ -109,7 +109,7 @@ JSValue JSHTMLCanvasElement::probablySupportsContext(ExecState& state)
  
  JSValue JSHTMLCanvasElement::toDataURL(ExecState& state)
  {
-    HTMLCanvasElement& canvas = impl();
+    HTMLCanvasElement& canvas = wrapped();
      ExceptionCode ec = 0;
  
      const String& type = valueToStringWithUndefinedOrNullCheck(&state, state.argument(0));
diff --git a/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp b/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp

index 7279a9450a17134053f683025c3c1087da50790b..889705afe0d836fc6eb5b91829f98008312a6bd7 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
@@ -42,10 +42,10 @@ namespace WebCore {
  
  bool JSHTMLCollection::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    ASSERT_WITH_MESSAGE(impl().type() != FormControls, "Should call the subclass' nameGetter");
-    ASSERT_WITH_MESSAGE(impl().type() != SelectOptions, "Should call the subclass' nameGetter");
+    ASSERT_WITH_MESSAGE(wrapped().type() != FormControls, "Should call the subclass' nameGetter");
+    ASSERT_WITH_MESSAGE(wrapped().type() != SelectOptions, "Should call the subclass' nameGetter");
  
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp b/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp

index 43174285468aeaf71871e0964f426112ec5a6009..1912c0b6be3b896244c62be16fe1519964fe0371 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp
@@ -81,7 +81,7 @@ bool JSHTMLDocument::getOwnPropertySlot(JSObject* object, ExecState* exec, Prope
  
  bool JSHTMLDocument::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto& document = impl();
+    auto& document = wrapped();
  
      AtomicStringImpl* atomicPropertyName = propertyName.publicName();
      if (!atomicPropertyName || !document.hasDocumentNamedItem(*atomicPropertyName))
@@ -115,7 +115,7 @@ JSValue JSHTMLDocument::all(ExecState& state) const
      if (v)
          return v;
  
-    return toJS(&state, globalObject(), impl().all());
+    return toJS(&state, globalObject(), wrapped().all());
  }
  
  void JSHTMLDocument::setAll(ExecState& state, JSValue value)
@@ -132,7 +132,7 @@ static Document* findCallingDocument(ExecState& state)
      if (!callerFrame)
          return nullptr;
  
-    return asJSDOMWindow(functor.callerFrame()->lexicalGlobalObject())->impl().document();
+    return asJSDOMWindow(functor.callerFrame()->lexicalGlobalObject())->wrapped().document();
  }
  
  // Custom functions
@@ -141,7 +141,7 @@ JSValue JSHTMLDocument::open(ExecState& state)
  {
      // For compatibility with other browsers, pass open calls with more than 2 parameters to the window.
      if (state.argumentCount() > 2) {
-        if (Frame* frame = impl().frame()) {
+        if (Frame* frame = wrapped().frame()) {
              JSDOMWindowShell* wrapper = toJSDOMWindowShell(frame, currentWorld(&state));
              if (wrapper) {
                  JSValue function = wrapper->get(&state, Identifier::fromString(&state, "open"));
@@ -157,10 +157,10 @@ JSValue JSHTMLDocument::open(ExecState& state)
  
      // document.open clobbers the security context of the document and
      // aliases it with the active security context.
-    Document* activeDocument = asJSDOMWindow(state.lexicalGlobalObject())->impl().document();
+    Document* activeDocument = asJSDOMWindow(state.lexicalGlobalObject())->wrapped().document();
  
      // In the case of two parameters or fewer, do a normal document open.
-    impl().open(activeDocument);
+    wrapped().open(activeDocument);
      return this;
  }
  
@@ -168,7 +168,7 @@ enum NewlineRequirement { DoNotAddNewline, DoAddNewline };
  
  static inline void documentWrite(ExecState& state, JSHTMLDocument* thisDocument, NewlineRequirement addNewline)
  {
-    HTMLDocument* document = &thisDocument->impl();
+    HTMLDocument* document = &thisDocument->wrapped();
      // DOM only specifies single string argument, but browsers allow multiple or no arguments.
  
      size_t size = state.argumentCount();
diff --git a/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp

index 3d48df04460933eccf45534bb7cca17c3d6c56f5..5836a1074be29567e16cb86e5542d3cc220d80b3 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp
@@ -36,7 +36,7 @@ using namespace JSC;
  
  JSScope* JSHTMLElement::pushEventHandlerScope(ExecState* exec, JSScope* scope) const
  {
-    HTMLElement& element = impl();
+    HTMLElement& element = wrapped();
  
      // The document is put on first, fall back to searching it only after the element and form.
      scope = JSWithScope::create(exec, asObject(toJS(exec, globalObject(), &element.document())), scope);
diff --git a/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp b/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp

index 8b55fa7de36e5c607889c9b1e9a51c3ec8a68b76..3afb3260726ddf5f3580d2f42b6f9abedf06f5b5 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp
@@ -33,15 +33,15 @@ namespace WebCore {
  static JSValue namedItems(ExecState& state, JSHTMLFormControlsCollection* collection, PropertyName propertyName)
  {
      const AtomicString& name = propertyNameToAtomicString(propertyName);
-    Vector<Ref<Element>> namedItems = collection->impl().namedItems(name);
+    Vector<Ref<Element>> namedItems = collection->wrapped().namedItems(name);
  
      if (namedItems.isEmpty())
          return jsUndefined();
      if (namedItems.size() == 1)
          return toJS(&state, collection->globalObject(), namedItems[0].ptr());
  
-    ASSERT(collection->impl().type() == FormControls);
-    return toJS(&state, collection->globalObject(), collection->impl().ownerNode().radioNodeList(name).get());
+    ASSERT(collection->wrapped().type() == FormControls);
+    return toJS(&state, collection->globalObject(), collection->wrapped().ownerNode().radioNodeList(name).get());
  }
  
  bool JSHTMLFormControlsCollection::nameGetter(ExecState* state, PropertyName propertyName, JSValue& value)
diff --git a/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp

index e34c03546ddea6caded1a3cac9f7bf7f3388bba4..3aed7052f4615ef0ac9359e71a9158780b3bd57a 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
  
  bool JSHTMLFormElement::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    Vector<Ref<Element>> namedItems = impl().namedElements(propertyNameToAtomicString(propertyName));
+    Vector<Ref<Element>> namedItems = wrapped().namedElements(propertyNameToAtomicString(propertyName));
      
      if (namedItems.isEmpty())
          return false;
diff --git a/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp

index ab000f713019e9b8a0bf58e235d7413a9acb9542..6fd5a97b257c60858f8929b2e9a2991b57df1e29 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
@@ -53,7 +53,7 @@ static inline bool allowSettingJavascriptURL(ExecState& state, HTMLFrameElement*
  
  void JSHTMLFrameElement::setLocation(ExecState& state, JSValue value)
  {
-    HTMLFrameElement& imp = impl();
+    HTMLFrameElement& imp = wrapped();
      String locationValue = valueToStringWithNullCheck(&state, value);
  
      if (!allowSettingJavascriptURL(state, &imp, locationValue))
diff --git a/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp

index 70856e553c4fd6c7d020fb97358986a26525356a..125aef7ec1d731f22e11640e80f32bb70aaeeaa6 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
@@ -40,7 +40,7 @@ namespace WebCore {
  
  bool JSHTMLFrameSetElement::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto* frameElement = impl().children()->namedItem(propertyNameToAtomicString(propertyName));
+    auto* frameElement = wrapped().children()->namedItem(propertyNameToAtomicString(propertyName));
      if (!is<HTMLFrameElement>(frameElement))
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSHTMLInputElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLInputElementCustom.cpp

index 8f42dbef524fd6fd8ce3daa1119ddfdb3b9b0155..372f3429814ca852fa35a728dadcfe0ba3645f37 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLInputElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLInputElementCustom.cpp
@@ -35,7 +35,7 @@ namespace WebCore {
  
  JSValue JSHTMLInputElement::selectionStart(ExecState& state) const
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          return throwTypeError(&state);
  
@@ -44,7 +44,7 @@ JSValue JSHTMLInputElement::selectionStart(ExecState& state) const
  
  void JSHTMLInputElement::setSelectionStart(ExecState& state, JSValue value)
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          throwTypeError(&state);
  
@@ -53,7 +53,7 @@ void JSHTMLInputElement::setSelectionStart(ExecState& state, JSValue value)
  
  JSValue JSHTMLInputElement::selectionEnd(ExecState& state) const
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          return throwTypeError(&state);
  
@@ -62,7 +62,7 @@ JSValue JSHTMLInputElement::selectionEnd(ExecState& state) const
  
  void JSHTMLInputElement::setSelectionEnd(ExecState& state, JSValue value)
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          throwTypeError(&state);
  
@@ -71,7 +71,7 @@ void JSHTMLInputElement::setSelectionEnd(ExecState& state, JSValue value)
  
  JSValue JSHTMLInputElement::selectionDirection(ExecState& state) const
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          return throwTypeError(&state);
  
@@ -80,7 +80,7 @@ JSValue JSHTMLInputElement::selectionDirection(ExecState& state) const
  
  void JSHTMLInputElement::setSelectionDirection(ExecState& state, JSValue value)
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection()) {
          throwTypeError(&state);
          return;
@@ -91,7 +91,7 @@ void JSHTMLInputElement::setSelectionDirection(ExecState& state, JSValue value)
  
  JSValue JSHTMLInputElement::setSelectionRange(ExecState& state)
  {
-    HTMLInputElement& input = impl();
+    HTMLInputElement& input = wrapped();
      if (!input.canHaveSelection())
          return throwTypeError(&state);
  
diff --git a/Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp

index 44009761d139d1318646b5c8e51e25bad0eb1403..2f41cfe5e24bf9881b603e05f5d2e3a979a0e50b 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp
@@ -38,9 +38,9 @@ void JSHTMLMediaElement::setController(ExecState&, JSValue value)
  {
      // 4.8.10.11.2 Media controllers: controller attribute.
      // On setting, it must first remove the element's mediagroup attribute, if any, 
-    impl().setMediaGroup(String());
+    wrapped().setMediaGroup(String());
      // and then set the current media controller to the given value.
-    impl().setController(JSMediaController::toWrapped(value));
+    wrapped().setController(JSMediaController::toWrapped(value));
  }
  
  }
diff --git a/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp b/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp

index 915e0287c78cdc095db1ade335d760cd3b583e7d..92345e6b57fcc503386a90c3a17794c4c131688f 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
  
  bool JSHTMLOptionsCollection::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
@@ -61,13 +61,13 @@ void JSHTMLOptionsCollection::setLength(ExecState& state, JSValue value)
              newLength = static_cast<unsigned>(lengthValue);
      }
      if (!ec)
-        impl().setLength(newLength, ec);
+        wrapped().setLength(newLength, ec);
      setDOMException(&state, ec);
  }
  
  void JSHTMLOptionsCollection::indexSetter(ExecState* exec, unsigned index, JSValue value)
  {
-    selectIndexSetter(&impl().selectElement(), exec, index, value);
+    selectIndexSetter(&wrapped().selectElement(), exec, index, value);
  }
  
  JSValue JSHTMLOptionsCollection::remove(ExecState& state)
@@ -75,9 +75,9 @@ JSValue JSHTMLOptionsCollection::remove(ExecState& state)
      // The argument can be an HTMLOptionElement or an index.
      JSValue argument = state.argument(0);
      if (HTMLOptionElement* option = JSHTMLOptionElement::toWrapped(argument))
-        impl().remove(option);
+        wrapped().remove(option);
      else
-        impl().remove(argument.toInt32(&state));
+        wrapped().remove(argument.toInt32(&state));
      return jsUndefined();
  }
  
diff --git a/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp

index b3df13f72eaa8fbaa078605f47633927ebe02cc6..30e3ebbb89a4ef23a59694c3abee57a80a6231e7 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp
@@ -34,7 +34,7 @@ using namespace HTMLNames;
  
  JSValue JSHTMLSelectElement::remove(ExecState& state)
  {
-    HTMLSelectElement& select = impl();
+    HTMLSelectElement& select = wrapped();
  
      if (!state.argumentCount()) {
          // When called with no argument, we should call Element::remove() to detach.
@@ -69,7 +69,7 @@ void selectIndexSetter(HTMLSelectElement* select, JSC::ExecState* exec, unsigned
  
  void JSHTMLSelectElement::indexSetter(JSC::ExecState* exec, unsigned index, JSC::JSValue value)
  {
-    selectIndexSetter(&impl(), exec, index, value);
+    selectIndexSetter(&wrapped(), exec, index, value);
  }
  
  }
diff --git a/Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp b/Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp

index 1bb86df88c9deeab09ba06f325de7bdf66d448af..97abe77c0b03ab165db6d476d8ea198d187bc0ca 100644 (file)
--- a/Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp
@@ -47,7 +47,7 @@ JSValue JSHTMLTemplateElement::content(ExecState& state) const
  {
      JSLockHolder lock(&state);
  
-    DocumentFragment* content = impl().content();
+    DocumentFragment* content = wrapped().content();
  
      JSObject* wrapper = getCachedWrapper(globalObject()->world(), content);
      if (wrapper)
diff --git a/Source/WebCore/bindings/js/JSHistoryCustom.cpp b/Source/WebCore/bindings/js/JSHistoryCustom.cpp

index a2c69ebee3da88a39b74e872dbe4c92d75f5a9d2..2bd2f6d8e3847b304fe958c4282f20197a239bfa 100644 (file)
--- a/Source/WebCore/bindings/js/JSHistoryCustom.cpp
+++ b/Source/WebCore/bindings/js/JSHistoryCustom.cpp
@@ -46,7 +46,7 @@ bool JSHistory::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propert
      // Our custom code is only needed to implement the Window cross-domain scheme, so if access is
      // allowed, return false so the normal lookup will take place.
      String message;
-    if (shouldAllowAccessToFrame(exec, impl().frame(), message))
+    if (shouldAllowAccessToFrame(exec, wrapped().frame(), message))
          return false;
  
      // Check for the few functions that we allow, even when called cross-domain.
@@ -69,14 +69,14 @@ bool JSHistory::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propert
          return true;
      }
  
-    printErrorMessageForFrame(impl().frame(), message);
+    printErrorMessageForFrame(wrapped().frame(), message);
      slot.setUndefined();
      return true;
  }
  
  bool JSHistory::putDelegate(ExecState* exec, PropertyName, JSValue, PutPropertySlot&)
  {
-    if (!shouldAllowAccessToFrame(exec, impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, wrapped().frame()))
          return true;
      return false;
  }
@@ -84,7 +84,7 @@ bool JSHistory::putDelegate(ExecState* exec, PropertyName, JSValue, PutPropertyS
  bool JSHistory::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
  {
      JSHistory* thisObject = jsCast<JSHistory*>(cell);
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return false;
      return Base::deleteProperty(thisObject, exec, propertyName);
  }
@@ -92,7 +92,7 @@ bool JSHistory::deleteProperty(JSCell* cell, ExecState* exec, PropertyName prope
  bool JSHistory::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
  {
      JSHistory* thisObject = jsCast<JSHistory*>(cell);
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return false;
      return Base::deletePropertyByIndex(thisObject, exec, propertyName);
  }
@@ -100,14 +100,14 @@ bool JSHistory::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned pr
  void JSHistory::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
  {
      JSHistory* thisObject = jsCast<JSHistory*>(object);
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return;
      Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
  }
  
  JSValue JSHistory::state(ExecState& state) const
  {
-    History& history = impl();
+    History& history = wrapped();
  
      JSValue cachedValue = m_state.get();
      if (!cachedValue.isEmpty() && !history.stateChanged())
@@ -121,7 +121,7 @@ JSValue JSHistory::state(ExecState& state) const
  
  JSValue JSHistory::pushState(ExecState& state)
  {
-    if (!shouldAllowAccessToFrame(&state, impl().frame()))
+    if (!shouldAllowAccessToFrame(&state, wrapped().frame()))
          return jsUndefined();
  
      RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(&state, state.argument(0), 0, 0);
@@ -140,7 +140,7 @@ JSValue JSHistory::pushState(ExecState& state)
      }
  
      ExceptionCode ec = 0;
-    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Push, ec);
+    wrapped().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Push, ec);
      setDOMException(&state, ec);
  
      m_state.clear();
@@ -150,7 +150,7 @@ JSValue JSHistory::pushState(ExecState& state)
  
  JSValue JSHistory::replaceState(ExecState& state)
  {
-    if (!shouldAllowAccessToFrame(&state, impl().frame()))
+    if (!shouldAllowAccessToFrame(&state, wrapped().frame()))
          return jsUndefined();
  
      RefPtr<SerializedScriptValue> historyState = SerializedScriptValue::create(&state, state.argument(0), 0, 0);
@@ -169,7 +169,7 @@ JSValue JSHistory::replaceState(ExecState& state)
      }
  
      ExceptionCode ec = 0;
-    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Replace, ec);
+    wrapped().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Replace, ec);
      setDOMException(&state, ec);
  
      m_state.clear();
diff --git a/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp b/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp

index 9dd401de3336c90798d0a79b29a160627ed788e7..a8cba03c5eb6bf5976564e0087a4ccf23c7df5ad 100644 (file)
--- a/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp
+++ b/Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp
@@ -76,7 +76,7 @@ JSValue JSIDBDatabase::createObjectStore(ExecState& state)
      }
  
      ExceptionCode ec = 0;
-    JSValue result = toJS(&state, globalObject(), impl().createObjectStore(name, keyPath, autoIncrement, ec).get());
+    JSValue result = toJS(&state, globalObject(), wrapped().createObjectStore(name, keyPath, autoIncrement, ec).get());
      setDOMException(&state, ec);
      return result;
  }
@@ -113,7 +113,7 @@ JSValue JSIDBDatabase::transaction(ExecState& exec)
      }
  
      ExceptionCode ec = 0;
-    JSValue result = toJS(&exec, globalObject(), impl().transaction(scriptContext, scope, mode, ec).get());
+    JSValue result = toJS(&exec, globalObject(), wrapped().transaction(scriptContext, scope, mode, ec).get());
      setDOMException(&exec, ec);
      return result;
  }
diff --git a/Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp b/Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp

index 29c5ee40865510ef6448e0c8bb03a9b4c64cce71..6ed7845316523c8cecd3f2f7e4e14767c60d011f 100644 (file)
--- a/Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp
+++ b/Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp
@@ -52,7 +52,7 @@ static JSValue putOrAdd(JSC::ExecState& state, bool overwrite)
          return JSValue::decode(throwThisTypeError(state, "IDBObjectStore", "put"));
  
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSIDBObjectStore::info());
-    auto& impl = castedThis->impl();
+    auto& wrapped = castedThis->wrapped();
  
      size_t argsCount = state.argumentCount();
      if (UNLIKELY(argsCount < 1))
@@ -64,9 +64,9 @@ static JSValue putOrAdd(JSC::ExecState& state, bool overwrite)
      if (argsCount == 1) {
          JSValue result;
          if (overwrite)
-            result = toJS(&state, castedThis->globalObject(), impl.put(state, value, ec).get());
+            result = toJS(&state, castedThis->globalObject(), wrapped.put(state, value, ec).get());
          else
-            result = toJS(&state, castedThis->globalObject(), impl.add(state, value, ec).get());
+            result = toJS(&state, castedThis->globalObject(), wrapped.add(state, value, ec).get());
  
          setDOMException(&state, ec);
          return result;
@@ -75,9 +75,9 @@ static JSValue putOrAdd(JSC::ExecState& state, bool overwrite)
      auto key = state.uncheckedArgument(1);
      JSValue result;
      if (overwrite)
-        result = toJS(&state, castedThis->globalObject(), impl.put(state, value, key, ec).get());
+        result = toJS(&state, castedThis->globalObject(), wrapped.put(state, value, key, ec).get());
      else
-        result = toJS(&state, castedThis->globalObject(), impl.add(state, value, key, ec).get());
+        result = toJS(&state, castedThis->globalObject(), wrapped.add(state, value, key, ec).get());
  
      setDOMException(&state, ec);
      return result;
@@ -127,7 +127,7 @@ JSValue JSIDBObjectStore::createIndex(ExecState& state)
      }
  
      ExceptionCode ec = 0;
-    JSValue result = toJS(&state, globalObject(), impl().createIndex(context, name, keyPath, unique, multiEntry, ec).get());
+    JSValue result = toJS(&state, globalObject(), wrapped().createIndex(context, name, keyPath, unique, multiEntry, ec).get());
      setDOMException(&state, ec);
      return result;
  }
diff --git a/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp b/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp

index e26bbe78d9fbbc4920ce1efcb4c350fd7a1324b8..9e69e1bfd664b66a8c3dadf1725fa4886993886f 100644 (file)
--- a/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
+++ b/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
@@ -107,7 +107,7 @@ JSValue JSInspectorFrontendHost::showContextMenu(ExecState& state)
  #else
      Vector<ContextMenuItem> items = menu.items();
  #endif
-    impl().showContextMenu(event, items);
+    wrapped().showContextMenu(event, items);
  #else
      UNUSED_PARAM(state);
  #endif
diff --git a/Source/WebCore/bindings/js/JSLocationCustom.cpp b/Source/WebCore/bindings/js/JSLocationCustom.cpp

index 131e2870bdb59d60536a910a771dd50772c06e49..0083e0cf159cc1f8900cfa18dd7b4255e09340ea 100644 (file)
--- a/Source/WebCore/bindings/js/JSLocationCustom.cpp
+++ b/Source/WebCore/bindings/js/JSLocationCustom.cpp
@@ -32,7 +32,7 @@ namespace WebCore {
  
  bool JSLocation::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
  {
-    Frame* frame = impl().frame();
+    Frame* frame = wrapped().frame();
      if (!frame) {
          slot.setUndefined();
          return true;
@@ -73,7 +73,7 @@ bool JSLocation::getOwnPropertySlotDelegate(ExecState* exec, PropertyName proper
  
  bool JSLocation::putDelegate(ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
  {
-    Frame* frame = impl().frame();
+    Frame* frame = wrapped().frame();
      if (!frame)
          return true;
  
@@ -102,7 +102,7 @@ bool JSLocation::deleteProperty(JSCell* cell, ExecState* exec, PropertyName prop
  {
      JSLocation* thisObject = jsCast<JSLocation*>(cell);
      // Only allow deleting by frames in the same origin.
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return false;
      return Base::deleteProperty(thisObject, exec, propertyName);
  }
@@ -111,7 +111,7 @@ bool JSLocation::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned p
  {
      JSLocation* thisObject = jsCast<JSLocation*>(cell);
      // Only allow deleting by frames in the same origin.
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return false;
      return Base::deletePropertyByIndex(thisObject, exec, propertyName);
  }
@@ -120,7 +120,7 @@ void JSLocation::getOwnPropertyNames(JSObject* object, ExecState* exec, Property
  {
      JSLocation* thisObject = jsCast<JSLocation*>(object);
      // Only allow the location object to enumerated by frames in the same origin.
-    if (!shouldAllowAccessToFrame(exec, thisObject->impl().frame()))
+    if (!shouldAllowAccessToFrame(exec, thisObject->wrapped().frame()))
          return;
      Base::getOwnPropertyNames(thisObject, exec, propertyNames, mode);
  }
@@ -134,11 +134,11 @@ bool JSLocation::defineOwnProperty(JSObject* object, ExecState* exec, PropertyNa
  
  JSValue JSLocation::toStringFunction(ExecState& state)
  {
-    Frame* frame = impl().frame();
+    Frame* frame = wrapped().frame();
      if (!frame || !shouldAllowAccessToFrame(&state, frame))
          return jsUndefined();
  
-    return jsStringWithCache(&state, impl().toString());
+    return jsStringWithCache(&state, wrapped().toString());
  }
  
  bool JSLocationPrototype::putDelegate(ExecState* exec, PropertyName propertyName, JSValue, PutPropertySlot&)
diff --git a/Source/WebCore/bindings/js/JSMediaSourceStatesCustom.cpp b/Source/WebCore/bindings/js/JSMediaSourceStatesCustom.cpp

index 8018b2633b78e9ce1de29133d9d94e6702ea351e..75e9cabbc3897e1601ed6c653c45f9cb5f25277c 100644 (file)
--- a/Source/WebCore/bindings/js/JSMediaSourceStatesCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMediaSourceStatesCustom.cpp
@@ -37,54 +37,54 @@ namespace WebCore {
  
  JSValue JSMediaSourceStates::width(ExecState&) const
  {
-    if (!impl().hasVideoSource())
+    if (!wrapped().hasVideoSource())
          return jsUndefined();
  
-    return jsNumber(impl().width());
+    return jsNumber(wrapped().width());
  }
  
  JSValue JSMediaSourceStates::height(ExecState&) const
  {
-    if (!impl().hasVideoSource())
+    if (!wrapped().hasVideoSource())
          return jsUndefined();
      
-    return jsNumber(impl().height());
+    return jsNumber(wrapped().height());
  }
  
  JSValue JSMediaSourceStates::frameRate(ExecState&) const
  {
-    if (!impl().hasVideoSource())
+    if (!wrapped().hasVideoSource())
          return jsUndefined();
      
-    return jsNumber(impl().frameRate());
+    return jsNumber(wrapped().frameRate());
  }
  
  JSValue JSMediaSourceStates::aspectRatio(ExecState&) const
  {
-    if (!impl().hasVideoSource())
+    if (!wrapped().hasVideoSource())
          return jsUndefined();
      
-    return jsNumber(impl().aspectRatio());
+    return jsNumber(wrapped().aspectRatio());
  }
  
  JSValue JSMediaSourceStates::facingMode(ExecState& state) const
  {
-    if (!impl().hasVideoSource())
+    if (!wrapped().hasVideoSource())
          return jsUndefined();
  
-    const AtomicString& mode = impl().facingMode();
+    const AtomicString& mode = wrapped().facingMode();
      if (mode.isEmpty())
          return jsUndefined();
      
-    return jsStringWithCache(&state, impl().facingMode());
+    return jsStringWithCache(&state, wrapped().facingMode());
  }
  
  JSValue JSMediaSourceStates::volume(ExecState&) const
  {
-    if (impl().hasVideoSource())
+    if (wrapped().hasVideoSource())
          return jsUndefined();
      
-    return jsNumber(impl().volume());
+    return jsNumber(wrapped().volume());
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp b/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp

index 01965e4b427266ffd2789c8b9b2848a9ae2da87a..375dd4b5f036393fabefc338877a67bee27fbb6a 100644 (file)
--- a/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp
@@ -35,10 +35,10 @@ namespace WebCore {
  
  void JSMessageChannel::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    if (MessagePort* port = impl().port1())
+    if (MessagePort* port = wrapped().port1())
          visitor.addOpaqueRoot(port);
  
-    if (MessagePort* port = impl().port2())
+    if (MessagePort* port = wrapped().port2())
          visitor.addOpaqueRoot(port);
  }
  
diff --git a/Source/WebCore/bindings/js/JSMessageEventCustom.cpp b/Source/WebCore/bindings/js/JSMessageEventCustom.cpp

index 44d9547f676e9856e9d5a41b4742523d4c721533..b55dc4ea2524402e5be4a82d22566100f6231c59 100644 (file)
--- a/Source/WebCore/bindings/js/JSMessageEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMessageEventCustom.cpp
@@ -53,7 +53,7 @@ JSValue JSMessageEvent::data(ExecState& state) const
          ASSERT_NOT_REACHED();
      }
  
-    MessageEvent& event = impl();
+    MessageEvent& event = wrapped();
      JSValue result;
      switch (event.dataType()) {
      case MessageEvent::DataTypeScriptValue: {
@@ -78,7 +78,7 @@ JSValue JSMessageEvent::data(ExecState& state) const
  
      case MessageEvent::DataTypeSerializedScriptValue:
          if (RefPtr<SerializedScriptValue> serializedValue = event.dataAsSerializedScriptValue()) {
-            MessagePortArray ports = impl().ports();
+            MessagePortArray ports = wrapped().ports();
              // FIXME: Why does this suppress exceptions?
              result = serializedValue->deserialize(&state, globalObject(), &ports, NonThrowing);
          } else
@@ -124,7 +124,7 @@ static JSC::JSValue handleInitMessageEvent(JSMessageEvent* jsEvent, JSC::ExecSta
      if (state.hadException())
          return jsUndefined();
  
-    MessageEvent& event = jsEvent->impl();
+    MessageEvent& event = jsEvent->wrapped();
      event.initMessageEvent(typeArg, canBubbleArg, cancelableArg, dataArg, originArg, lastEventIdArg, sourceArg, WTF::move(messagePorts));
      jsEvent->m_data.set(state.vm(), jsEvent, dataArg.jsValue());
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSMessagePortCustom.cpp b/Source/WebCore/bindings/js/JSMessagePortCustom.cpp

index 239f47afd6da5ebe5190e7cbb593e33bebf91e1f..6b212449875e78e8cbbdd72fc23d0f69b8396901 100644 (file)
--- a/Source/WebCore/bindings/js/JSMessagePortCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMessagePortCustom.cpp
@@ -48,13 +48,13 @@ namespace WebCore {
  void JSMessagePort::visitAdditionalChildren(SlotVisitor& visitor)
  {
      // If we have a locally entangled port, we can directly mark it as reachable. Ports that are remotely entangled are marked in-use by markActiveObjectsForContext().
-    if (MessagePort* port = impl().locallyEntangledPort())
+    if (MessagePort* port = wrapped().locallyEntangledPort())
          visitor.addOpaqueRoot(port);
  }
  
  JSC::JSValue JSMessagePort::postMessage(JSC::ExecState& state)
  {
-    return handlePostMessage(state, &impl());
+    return handlePostMessage(state, &wrapped());
  }
  
  void fillMessagePortArray(JSC::ExecState& state, JSC::JSValue value, MessagePortArray& portArray, ArrayBufferArray& arrayBuffers)
diff --git a/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp b/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp

index c468aad6a614e49f2a7fc9922ec2bad24242ec5d..deabc541db06f109e4d0bfc6c719409b5189b9fd 100644 (file)
--- a/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp
@@ -40,7 +40,7 @@ using DecisionPoint = MockContentFilterSettings::DecisionPoint;
  
  JSValue JSMockContentFilterSettings::decisionPoint(ExecState&) const
  {
-    DecisionPoint decisionPoint = impl().decisionPoint();
+    DecisionPoint decisionPoint = wrapped().decisionPoint();
      switch (decisionPoint) {
      case DecisionPoint::AfterWillSendRequest:
      case DecisionPoint::AfterRedirect:
@@ -69,7 +69,7 @@ void JSMockContentFilterSettings::setDecisionPoint(ExecState& state, JSValue val
      case DecisionPoint::AfterAddData:
      case DecisionPoint::AfterFinishedAddingData:
      case DecisionPoint::Never:
-        impl().setDecisionPoint(decisionPoint);
+        wrapped().setDecisionPoint(decisionPoint);
          return;
      }
  
@@ -107,7 +107,7 @@ static inline Decision toDecision(ExecState& state, JSValue value)
  
  JSValue JSMockContentFilterSettings::decision(ExecState&) const
  {
-    return toJSValue(impl().decision());
+    return toJSValue(wrapped().decision());
  }
  
  void JSMockContentFilterSettings::setDecision(ExecState& state, JSValue value)
@@ -116,12 +116,12 @@ void JSMockContentFilterSettings::setDecision(ExecState& state, JSValue value)
      if (state.hadException())
          return;
  
-    impl().setDecision(decision);
+    wrapped().setDecision(decision);
  }
  
  JSValue JSMockContentFilterSettings::unblockRequestDecision(ExecState&) const
  {
-    return toJSValue(impl().unblockRequestDecision());
+    return toJSValue(wrapped().unblockRequestDecision());
  }
  
  void JSMockContentFilterSettings::setUnblockRequestDecision(ExecState& state, JSValue value)
@@ -130,7 +130,7 @@ void JSMockContentFilterSettings::setUnblockRequestDecision(ExecState& state, JS
      if (state.hadException())
          return;
  
-    impl().setUnblockRequestDecision(unblockRequestDecision);
+    wrapped().setUnblockRequestDecision(unblockRequestDecision);
  }
  
  }; // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp b/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp

index 3805572472026b2a48d42336a6cb09d48bda6b85..c6c572403ae6b7832462e061b6c32613244327dd 100644 (file)
--- a/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp
+++ b/Source/WebCore/bindings/js/JSMutationObserverCustom.cpp
@@ -63,7 +63,7 @@ EncodedJSValue JSC_HOST_CALL constructJSMutationObserver(ExecState* exec)
  
  bool JSMutationObserverOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
  {
-    MutationObserver& observer = jsCast<JSMutationObserver*>(handle.slot()->asCell())->impl();
+    MutationObserver& observer = jsCast<JSMutationObserver*>(handle.slot()->asCell())->wrapped();
      auto observedNodes = observer.getObservedNodes();
      for (auto it = observedNodes.begin(), end = observedNodes.end(); it != end; ++it) {
          if (visitor.containsOpaqueRoot(root(*it)))
diff --git a/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp b/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp

index 846cf8faa8c511ef82151701b4a008bafa1bfcd1..a31e46a843218c986a8412a48076f0989bb8452b 100644 (file)
--- a/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  bool JSNamedNodeMap::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().getNamedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().getNamedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSNavigatorCustom.cpp b/Source/WebCore/bindings/js/JSNavigatorCustom.cpp

index 3d5fe1248648634a64a1d8975c4ac1bc3d1bd9b8..f24c055fc89b9de7b9a55c4e60e49072cad956ea 100644 (file)
--- a/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
@@ -68,13 +68,13 @@ JSValue JSNavigator::webkitGetUserMedia(ExecState& state)
          return jsUndefined();
      }
  
-    if (!impl().frame()) {
+    if (!wrapped().frame()) {
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
  
      // We do not need to protect the context (i.e. document) here as UserMediaRequest is observing context destruction and will check validity before resolving/rejecting promise.
-    Document* document = impl().frame()->document();
+    Document* document = wrapped().frame()->document();
  
      RefPtr<NavigatorUserMediaSuccessCallback> successCallback = JSNavigatorUserMediaSuccessCallback::create(asObject(state.uncheckedArgument(1)), globalObject());
      auto resolveCallback = [successCallback, document](const RefPtr<MediaStream>& stream) mutable {
diff --git a/Source/WebCore/bindings/js/JSNodeCustom.cpp b/Source/WebCore/bindings/js/JSNodeCustom.cpp

index 2c1a9f830e3527155a6cf37d677dcb202d136ce8..3123c9460954ebdb35d228f98d961cf47fc3f268 100644 (file)
--- a/Source/WebCore/bindings/js/JSNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNodeCustom.cpp
@@ -108,13 +108,13 @@ static inline bool isReachableFromDOM(Node* node, SlotVisitor& visitor)
  bool JSNodeOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
  {
      JSNode* jsNode = jsCast<JSNode*>(handle.slot()->asCell());
-    return isReachableFromDOM(&jsNode->impl(), visitor);
+    return isReachableFromDOM(&jsNode->wrapped(), visitor);
  }
  
  JSValue JSNode::insertBefore(ExecState& state)
  {
      ExceptionCode ec = 0;
-    bool ok = impl().insertBefore(JSNode::toWrapped(state.argument(0)), JSNode::toWrapped(state.argument(1)), ec);
+    bool ok = wrapped().insertBefore(JSNode::toWrapped(state.argument(0)), JSNode::toWrapped(state.argument(1)), ec);
      setDOMException(&state, ec);
      if (ok)
          return state.argument(0);
@@ -124,7 +124,7 @@ JSValue JSNode::insertBefore(ExecState& state)
  JSValue JSNode::replaceChild(ExecState& state)
  {
      ExceptionCode ec = 0;
-    bool ok = impl().replaceChild(JSNode::toWrapped(state.argument(0)), JSNode::toWrapped(state.argument(1)), ec);
+    bool ok = wrapped().replaceChild(JSNode::toWrapped(state.argument(0)), JSNode::toWrapped(state.argument(1)), ec);
      setDOMException(&state, ec);
      if (ok)
          return state.argument(1);
@@ -134,7 +134,7 @@ JSValue JSNode::replaceChild(ExecState& state)
  JSValue JSNode::removeChild(ExecState& state)
  {
      ExceptionCode ec = 0;
-    bool ok = impl().removeChild(JSNode::toWrapped(state.argument(0)), ec);
+    bool ok = wrapped().removeChild(JSNode::toWrapped(state.argument(0)), ec);
      setDOMException(&state, ec);
      if (ok)
          return state.argument(0);
@@ -144,7 +144,7 @@ JSValue JSNode::removeChild(ExecState& state)
  JSValue JSNode::appendChild(ExecState& state)
  {
      ExceptionCode ec = 0;
-    bool ok = impl().appendChild(JSNode::toWrapped(state.argument(0)), ec);
+    bool ok = wrapped().appendChild(JSNode::toWrapped(state.argument(0)), ec);
      setDOMException(&state, ec);
      if (ok)
          return state.argument(0);
@@ -160,7 +160,7 @@ JSScope* JSNode::pushEventHandlerScope(ExecState* exec, JSScope* node) const
  
  void JSNode::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(impl()));
+    visitor.addOpaqueRoot(root(wrapped()));
  }
  
  static ALWAYS_INLINE JSValue createWrapperInline(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node)
diff --git a/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp b/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp

index 2b4040e3d96f167e865b66805af3d99a03b4308f..b3f036139fa0fb1806484a610d84ac5ac57ca4dc 100644 (file)
--- a/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp
@@ -27,7 +27,7 @@ namespace WebCore {
  
  void JSNodeIterator::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    if (NodeFilter* filter = impl().filter())
+    if (NodeFilter* filter = wrapped().filter())
          visitor.addOpaqueRoot(filter);
  }
  
diff --git a/Source/WebCore/bindings/js/JSNodeListCustom.cpp b/Source/WebCore/bindings/js/JSNodeListCustom.cpp

index f7d863b8e395dbfcf113cc686b35f46874d500a2..ba062bea29b4603d4b719bcd77fb6f271e31d04f 100644 (file)
--- a/Source/WebCore/bindings/js/JSNodeListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNodeListCustom.cpp
@@ -42,12 +42,12 @@ bool JSNodeListOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handl
      JSNodeList* jsNodeList = jsCast<JSNodeList*>(handle.slot()->asCell());
      if (!jsNodeList->hasCustomProperties())
          return false;
-    if (jsNodeList->impl().isLiveNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<LiveNodeList&>(jsNodeList->impl()).ownerNode()));
-    if (jsNodeList->impl().isChildNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<ChildNodeList&>(jsNodeList->impl()).ownerNode()));
-    if (jsNodeList->impl().isEmptyNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<EmptyNodeList&>(jsNodeList->impl()).ownerNode()));
+    if (jsNodeList->wrapped().isLiveNodeList())
+        return visitor.containsOpaqueRoot(root(static_cast<LiveNodeList&>(jsNodeList->wrapped()).ownerNode()));
+    if (jsNodeList->wrapped().isChildNodeList())
+        return visitor.containsOpaqueRoot(root(static_cast<ChildNodeList&>(jsNodeList->wrapped()).ownerNode()));
+    if (jsNodeList->wrapped().isEmptyNodeList())
+        return visitor.containsOpaqueRoot(root(static_cast<EmptyNodeList&>(jsNodeList->wrapped()).ownerNode()));
      return false;
  }
  
diff --git a/Source/WebCore/bindings/js/JSNodeOrString.cpp b/Source/WebCore/bindings/js/JSNodeOrString.cpp

index 34361af496a8dc97ec7b346a5c043d96fcdbb95f..447c5d700d5651eadf1404bd3a7b1f4861133265 100644 (file)
--- a/Source/WebCore/bindings/js/JSNodeOrString.cpp
+++ b/Source/WebCore/bindings/js/JSNodeOrString.cpp
@@ -43,7 +43,7 @@ Vector<NodeOrString> toNodeOrStringVector(ExecState& state)
      for (size_t i = 0; i < argumentCount; ++i) {
          JSValue value = state.uncheckedArgument(i);
          if (auto* node = jsDynamicCast<JSNode*>(value))
-            result.uncheckedAppend(&node->impl());
+            result.uncheckedAppend(&node->wrapped());
          else {
              String string = value.toWTFString(&state);
              if (state.hadException())
diff --git a/Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp b/Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp

index 98c88149f39e2b0cba81d352e5b9bdb2905cb297..3adf80225c43bfb3ddb567b1695cae7d026beaa3 100644 (file)
--- a/Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
  
  void JSOscillatorNode::setType(ExecState& state, JSValue value)
  {
-    OscillatorNode& imp = impl();
+    OscillatorNode& imp = wrapped();
  
  #if ENABLE(LEGACY_WEB_AUDIO)
      if (value.isNumber()) {
diff --git a/Source/WebCore/bindings/js/JSPannerNodeCustom.cpp b/Source/WebCore/bindings/js/JSPannerNodeCustom.cpp

index 86c03ed3fb89259acf98ce332a6924287ee3b01d..6790f84a7cee9f166126cf641450c1b434684356 100644 (file)
--- a/Source/WebCore/bindings/js/JSPannerNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSPannerNodeCustom.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
  
  void JSPannerNode::setPanningModel(ExecState& state, JSValue value)
  {
-    PannerNode& imp = impl();
+    PannerNode& imp = wrapped();
  
  #if ENABLE(LEGACY_WEB_AUDIO)
      if (value.isNumber()) {
@@ -63,7 +63,7 @@ void JSPannerNode::setPanningModel(ExecState& state, JSValue value)
  
  void JSPannerNode::setDistanceModel(ExecState& state, JSValue value)
  {
-    PannerNode& imp = impl();
+    PannerNode& imp = wrapped();
  
  #if ENABLE(LEGACY_WEB_AUDIO)
      if (value.isNumber()) {
diff --git a/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp b/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp

index c6f61ebb5431b70469c4d7f0db65b4dc84da90ca..830c30558841c0222bdf2d8813edd7b217905df6 100644 (file)
--- a/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp
+++ b/Source/WebCore/bindings/js/JSPluginElementFunctions.cpp
@@ -57,7 +57,7 @@ static JSObject* pluginScriptObjectFromPluginViewBase(HTMLPlugInElement& pluginE
  
  static JSObject* pluginScriptObjectFromPluginViewBase(JSHTMLElement* jsHTMLElement)
  {
-    HTMLElement& element = jsHTMLElement->impl();
+    HTMLElement& element = jsHTMLElement->wrapped();
      if (!is<HTMLPlugInElement>(element))
          return nullptr;
  
@@ -67,7 +67,7 @@ static JSObject* pluginScriptObjectFromPluginViewBase(JSHTMLElement* jsHTMLEleme
  
  JSObject* pluginScriptObject(ExecState* exec, JSHTMLElement* jsHTMLElement)
  {
-    HTMLElement& element = jsHTMLElement->impl();
+    HTMLElement& element = jsHTMLElement->wrapped();
      if (!is<HTMLPlugInElement>(element))
          return nullptr;
  
@@ -165,7 +165,7 @@ CallType pluginElementGetCallData(JSHTMLElement* element, CallData& callData)
          return CallTypeHost;
      }
      
-    Instance* instance = pluginInstance(element->impl());
+    Instance* instance = pluginInstance(element->wrapped());
      if (!instance || !instance->supportsInvokeDefaultMethod())
          return CallTypeNone;
      callData.native.function = callPlugin;
diff --git a/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp b/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp

index 5f869a912e066e49b52ee8a0f14bf6475da2a8a8..95a0fb7825cb306b048bc783cff1c6b9a117b217 100644 (file)
--- a/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp
@@ -56,7 +56,7 @@ JSValue JSPopStateEvent::state(ExecState& state) const
          ASSERT_NOT_REACHED();
      }
  
-    PopStateEvent& event = impl();
+    PopStateEvent& event = wrapped();
  
      if (!event.state().hasNoValue()) {
          // We need to make sure a PopStateEvent does not leak objects in its state property across isolated DOM worlds.
diff --git a/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp b/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp

index 9ef5e93ed1ce5afabbd9adcb0dcb6a38b4f4ad11..40e5b90cc27e8c4e133002b62d8a118a017457c3 100644 (file)
--- a/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp
+++ b/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  bool JSRTCStatsResponse::nameGetter(ExecState* exec, PropertyName propertyName, JSValue& value)
  {
-    auto item = impl().namedItem(propertyNameToAtomicString(propertyName));
+    auto item = wrapped().namedItem(propertyNameToAtomicString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp b/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp

index b3364d264514526b57bfee0ed18df5d6d040c824..3eaef26125bfab8f7d52a5213602df0f31fe29a2 100644 (file)
--- a/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp
@@ -47,17 +47,17 @@ JSValue JSSQLResultSetRowList::item(ExecState& state)
          setDOMException(&state, TYPE_MISMATCH_ERR);
          return jsUndefined();
      }
-    if (index < 0 || (unsigned)index >= impl().length()) {
+    if (index < 0 || (unsigned)index >= wrapped().length()) {
          setDOMException(&state, INDEX_SIZE_ERR);
          return jsUndefined();
      }
  
      JSObject* object = constructEmptyObject(&state);
  
-    unsigned numColumns = impl().columnNames().size();
+    unsigned numColumns = wrapped().columnNames().size();
      unsigned valuesIndex = index * numColumns;
      for (unsigned i = 0; i < numColumns; i++) {
-        const SQLValue& value = impl().values()[valuesIndex + i];
+        const SQLValue& value = wrapped().values()[valuesIndex + i];
          JSValue jsValue;
  
          switch (value.type()) {
@@ -74,7 +74,7 @@ JSValue JSSQLResultSetRowList::item(ExecState& state)
              ASSERT_NOT_REACHED();
          }
  
-        object->putDirect(state.vm(), Identifier::fromString(&state, impl().columnNames()[i]), jsValue, DontDelete | ReadOnly);
+        object->putDirect(state.vm(), Identifier::fromString(&state, wrapped().columnNames()[i]), jsValue, DontDelete | ReadOnly);
      }
  
      return object;
diff --git a/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp b/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp

index 95a8dfce85a326bb315b0df2bef1e8440ba151ff..7421256b046a8d7268e2367dc2e13cfaac224312 100644 (file)
--- a/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp
@@ -109,7 +109,7 @@ JSValue JSSQLTransaction::executeSql(ExecState& state)
      }
  
      ExceptionCode ec = 0;
-    impl().executeSQL(sqlStatement, sqlValues, callback.release(), errorCallback.release(), ec);
+    wrapped().executeSQL(sqlStatement, sqlValues, callback.release(), errorCallback.release(), ec);
      setDOMException(&state, ec);
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp b/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp

index b6f0cf83615f71e65588ce3de3fcbbadd15b6ede..64e112846f87e26ba45f403130683c84b0baa7e3 100644 (file)
--- a/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSVGLengthCustom.cpp
@@ -33,9 +33,9 @@ namespace WebCore {
  
  JSValue JSSVGLength::value(ExecState& state) const
  {
-    SVGLength& podImp = impl().propertyReference();
+    SVGLength& podImp = wrapped().propertyReference();
      ExceptionCode ec = 0;
-    SVGLengthContext lengthContext(impl().contextElement());
+    SVGLengthContext lengthContext(wrapped().contextElement());
      float value = podImp.value(lengthContext, ec);
      if (ec) {
          setDOMException(&state, ec);
@@ -47,7 +47,7 @@ JSValue JSSVGLength::value(ExecState& state) const
  
  void JSSVGLength::setValue(ExecState& state, JSValue value)
  {
-    if (impl().isReadOnly()) {
+    if (wrapped().isReadOnly()) {
          setDOMException(&state, NO_MODIFICATION_ALLOWED_ERR);
          return;
      }
@@ -57,27 +57,27 @@ void JSSVGLength::setValue(ExecState& state, JSValue value)
          return;
      }
  
-    SVGLength& podImp = impl().propertyReference();
+    SVGLength& podImp = wrapped().propertyReference();
  
      ExceptionCode ec = 0;
-    SVGLengthContext lengthContext(impl().contextElement());
+    SVGLengthContext lengthContext(wrapped().contextElement());
      podImp.setValue(value.toFloat(&state), lengthContext, ec);
      if (ec) {
          setDOMException(&state, ec);
          return;
      }
  
-    impl().commitChange();
+    wrapped().commitChange();
  }
  
  JSValue JSSVGLength::convertToSpecifiedUnits(ExecState& state)
  {
-    if (impl().isReadOnly()) {
+    if (wrapped().isReadOnly()) {
          setDOMException(&state, NO_MODIFICATION_ALLOWED_ERR);
          return jsUndefined();
      }
  
-    SVGLength& podImp = impl().propertyReference();
+    SVGLength& podImp = wrapped().propertyReference();
  
      if (state.argumentCount() < 1)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
@@ -87,14 +87,14 @@ JSValue JSSVGLength::convertToSpecifiedUnits(ExecState& state)
          return jsUndefined();
  
      ExceptionCode ec = 0;
-    SVGLengthContext lengthContext(impl().contextElement());
+    SVGLengthContext lengthContext(wrapped().contextElement());
      podImp.convertToSpecifiedUnits(unitType, lengthContext, ec);
      if (ec) {
          setDOMException(&state, ec);
          return jsUndefined();
      }
  
-    impl().commitChange();
+    wrapped().commitChange();
      return jsUndefined();
  }
  
diff --git a/Source/WebCore/bindings/js/JSStorageCustom.cpp b/Source/WebCore/bindings/js/JSStorageCustom.cpp

index 585d7247b61ba090d41d08616e52f2510e3f4d3f..b84234b17e5b1b46510b0ee5ce2259c2109aaa31 100644 (file)
--- a/Source/WebCore/bindings/js/JSStorageCustom.cpp
+++ b/Source/WebCore/bindings/js/JSStorageCustom.cpp
@@ -41,7 +41,7 @@ bool JSStorage::nameGetter(ExecState* exec, PropertyName propertyName, JSValue&
          return false;
  
      ExceptionCode ec = 0;
-    String item = impl().getItem(propertyNameToString(propertyName), ec);
+    String item = wrapped().getItem(propertyNameToString(propertyName), ec);
      setDOMException(exec, ec);
  
      if (item.isNull())
@@ -69,7 +69,7 @@ bool JSStorage::deleteProperty(JSCell* cell, ExecState* exec, PropertyName prope
          return Base::deleteProperty(thisObject, exec, propertyName);
  
      ExceptionCode ec = 0;
-    thisObject->impl().removeItem(propertyNameToString(propertyName), ec);
+    thisObject->wrapped().removeItem(propertyNameToString(propertyName), ec);
      setDOMException(exec, ec);
      return true;
  }
@@ -83,12 +83,12 @@ void JSStorage::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyN
  {
      JSStorage* thisObject = jsCast<JSStorage*>(object);
      ExceptionCode ec = 0;
-    unsigned length = thisObject->impl().length(ec);
+    unsigned length = thisObject->wrapped().length(ec);
      setDOMException(exec, ec);
      if (exec->hadException())
          return;
      for (unsigned i = 0; i < length; ++i) {
-        propertyNames.add(Identifier::fromString(exec, thisObject->impl().key(i, ec)));
+        propertyNames.add(Identifier::fromString(exec, thisObject->wrapped().key(i, ec)));
          setDOMException(exec, ec);
          if (exec->hadException())
              return;
@@ -118,7 +118,7 @@ bool JSStorage::putDelegate(ExecState* exec, PropertyName propertyName, JSValue
          return true;
  
      ExceptionCode ec = 0;
-    impl().setItem(propertyNameToString(propertyName), stringValue, ec);
+    wrapped().setItem(propertyNameToString(propertyName), stringValue, ec);
      setDOMException(exec, ec);
  
      return true;
diff --git a/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp b/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp

index 0a69a2e6fd23c2983f798f4d05f2617171af6340..cb9397ef7d31d96e065c02f4f4907c614c3e82d2 100644 (file)
--- a/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp
+++ b/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp
@@ -32,7 +32,7 @@ namespace WebCore {
  
  void JSStyleSheet::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, StyleSheet* styleSheet)
diff --git a/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp b/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp

index d1c6065a97580f297e6ec247bfff8174b89956c1..c4222a9e34af265558beeee7e8512c3562115f46 100644 (file)
--- a/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp
@@ -40,7 +40,7 @@ bool JSStyleSheetList::nameGetter(ExecState* exec, PropertyName propertyName, JS
      if (propertyName.isSymbol())
          return false;
  
-    auto* item = impl().getNamedItem(propertyNameToString(propertyName));
+    auto* item = wrapped().getNamedItem(propertyNameToString(propertyName));
      if (!item)
          return false;
  
diff --git a/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp b/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp

index f5ba4d3029cd688f935efe30b79d79be22347f29..a50f8399ba5864d01ab130c8fcd51de4ebdee6dd 100644 (file)
--- a/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp
+++ b/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp
@@ -152,7 +152,7 @@ JSValue JSSubtleCrypto::encrypt(ExecState& state)
          return throwTypeError(&state);
  
      if (!key->allows(CryptoKeyUsageEncrypt)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'encrypt'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'encrypt'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
@@ -205,7 +205,7 @@ JSValue JSSubtleCrypto::decrypt(ExecState& state)
          return throwTypeError(&state);
  
      if (!key->allows(CryptoKeyUsageDecrypt)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'decrypt'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'decrypt'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
@@ -257,7 +257,7 @@ JSValue JSSubtleCrypto::sign(ExecState& state)
          return throwTypeError(&state);
  
      if (!key->allows(CryptoKeyUsageSign)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'sign'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'sign'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
@@ -309,7 +309,7 @@ JSValue JSSubtleCrypto::verify(ExecState& state)
          return throwTypeError(&state);
  
      if (!key->allows(CryptoKeyUsageVerify)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'verify'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'verify'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
@@ -646,7 +646,7 @@ JSValue JSSubtleCrypto::wrapKey(ExecState& state)
          return throwTypeError(&state);
  
      if (!wrappingKey->allows(CryptoKeyUsageWrapKey)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'wrapKey'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'wrapKey'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
@@ -728,7 +728,7 @@ JSValue JSSubtleCrypto::unwrapKey(ExecState& state)
          return throwTypeError(&state);
  
      if (!unwrappingKey->allows(CryptoKeyUsageUnwrapKey)) {
-        impl().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'unwrapKey'"));
+        wrapped().document()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, ASCIILiteral("Key usages do not include 'unwrapKey'"));
          setDOMException(&state, NOT_SUPPORTED_ERR);
          return jsUndefined();
      }
diff --git a/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp b/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp

index 57f88b955cf585188c2a6bee4df774f4f2951bef..deb440b3abeab7b8fe4220b7baad10220a497b8c 100644 (file)
--- a/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp
@@ -41,7 +41,7 @@ namespace WebCore {
  bool JSTextTrackCueOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
  {
      JSTextTrackCue* jsTextTrackCue = jsCast<JSTextTrackCue*>(handle.slot()->asCell());
-    TextTrackCue& textTrackCue = jsTextTrackCue->impl();
+    TextTrackCue& textTrackCue = jsTextTrackCue->wrapped();
  
      // If the cue is firing event listeners, its wrapper is reachable because
      // the wrapper is responsible for marking those event listeners.
@@ -84,7 +84,7 @@ JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, TextTrackCue* cue)
  
  void JSTextTrackCue::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    if (TextTrack* textTrack = impl().track())
+    if (TextTrack* textTrack = wrapped().track())
          visitor.addOpaqueRoot(root(textTrack));
  }
  
diff --git a/Source/WebCore/bindings/js/JSTextTrackCustom.cpp b/Source/WebCore/bindings/js/JSTextTrackCustom.cpp

index eb19f25787199f1e70e99af7ad2fb0427ce9f75d..7fce6ad2ae5d4f1e1b312078955ea0f6840acef7 100644 (file)
--- a/Source/WebCore/bindings/js/JSTextTrackCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTextTrackCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  void JSTextTrack::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  void JSTextTrack::setKind(ExecState& state, JSValue value)
@@ -47,7 +47,7 @@ void JSTextTrack::setKind(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setKind(string);
+    wrapped().setKind(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
@@ -60,7 +60,7 @@ void JSTextTrack::setLanguage(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setLanguage(string);
+    wrapped().setLanguage(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
diff --git a/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp b/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp

index e1b8c63099261d1f2b9f5e7a4ff5db652a90a854..3f46f4331bbbe6681277114fb3b42f24bfe9cd14 100644 (file)
--- a/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  void JSTextTrackList::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(impl().element()));
+    visitor.addOpaqueRoot(root(wrapped().element()));
  }
      
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSTrackCustom.cpp b/Source/WebCore/bindings/js/JSTrackCustom.cpp

index 975146724db026905444589add92f41bb45308c5..9a9436af809acfab6dc5098868c6e596f80df8f5 100644 (file)
--- a/Source/WebCore/bindings/js/JSTrackCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTrackCustom.cpp
@@ -44,11 +44,11 @@ TrackBase* toTrack(JSValue value)
  
      JSObject* object = asObject(value);
      if (object->inherits(JSTextTrack::info()))
-        return &jsCast<JSTextTrack*>(object)->impl();
+        return &jsCast<JSTextTrack*>(object)->wrapped();
      if (object->inherits(JSAudioTrack::info()))
-        return &jsCast<JSAudioTrack*>(object)->impl();
+        return &jsCast<JSAudioTrack*>(object)->wrapped();
      if (object->inherits(JSVideoTrack::info()))
-        return &jsCast<JSVideoTrack*>(object)->impl();
+        return &jsCast<JSVideoTrack*>(object)->wrapped();
  
      return 0;
  }
diff --git a/Source/WebCore/bindings/js/JSTrackEventCustom.cpp b/Source/WebCore/bindings/js/JSTrackEventCustom.cpp

index f51d3b963c81803cfe71b947b42c9dbd02bb85be..eab6ff2138c53d7e3feb6449b06d71b3df2e5c1d 100644 (file)
--- a/Source/WebCore/bindings/js/JSTrackEventCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTrackEventCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  JSValue JSTrackEvent::track(ExecState& state) const
  {
-    TrackBase* track = impl().track();
+    TrackBase* track = wrapped().track();
      if (!track)
          return jsNull();
  
diff --git a/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp b/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp

index c1e681d497b44c0b48e37a7fea081b12d0fc35d7..2be08a991f7dd14ef9a2a62d18f31d9cf17153e8 100644 (file)
--- a/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp
+++ b/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp
@@ -27,7 +27,7 @@ namespace WebCore {
  
  void JSTreeWalker::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    if (NodeFilter* filter = impl().filter())
+    if (NodeFilter* filter = wrapped().filter())
          visitor.addOpaqueRoot(filter);
  }
  
diff --git a/Source/WebCore/bindings/js/JSUserMessageHandlersNamespaceCustom.cpp b/Source/WebCore/bindings/js/JSUserMessageHandlersNamespaceCustom.cpp

index 8fc6ef8fb30d20b39bd098e2f1930592ff428afb..adf4936473b423dc12dec7ad80dbf720ab3ea9dd 100644 (file)
--- a/Source/WebCore/bindings/js/JSUserMessageHandlersNamespaceCustom.cpp
+++ b/Source/WebCore/bindings/js/JSUserMessageHandlersNamespaceCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  bool JSUserMessageHandlersNamespace::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
  {
-    if (UserMessageHandler* handler = impl().handler(propertyNameToAtomicString(propertyName), globalObject()->world())) {
+    if (UserMessageHandler* handler = wrapped().handler(propertyNameToAtomicString(propertyName), globalObject()->world())) {
          slot.setValue(this, ReadOnly | DontDelete | DontEnum, toJS(exec, globalObject(), handler));
          return true;
      }
diff --git a/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp b/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp

index 6f0af5af5a8ea1e1ea7e5fe191e0c807c2041e90..d828e12fa0c62e083b036b9c743f040e4c67f8a6 100644 (file)
--- a/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
+++ b/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  void JSVideoTrack::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(&impl()));
+    visitor.addOpaqueRoot(root(&wrapped()));
  }
  
  void JSVideoTrack::setKind(ExecState& state, JSValue value)
@@ -46,7 +46,7 @@ void JSVideoTrack::setKind(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setKind(string);
+    wrapped().setKind(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
@@ -59,7 +59,7 @@ void JSVideoTrack::setLanguage(ExecState& state, JSValue value)
      auto& string = value.toString(&state)->value(&state);
      if (state.hadException())
          return;
-    impl().setLanguage(string);
+    wrapped().setLanguage(string);
  #else
      UNUSED_PARAM(state);
      UNUSED_PARAM(value);
diff --git a/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp b/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp

index 66d7bea3e00e0de3af01815da6b921deddbc1314..a2a36184a4eed4955295a1e5877b9de401e6636d 100644 (file)
--- a/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp
+++ b/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
  
  void JSVideoTrackList::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(root(impl().element()));
+    visitor.addOpaqueRoot(root(wrapped().element()));
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp

index 99ff703c4649a6304e688bfda01e6f8b10fcf46b..7c4ec0818781c8721ecfbd7550fd61681bf2a113 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp
@@ -67,7 +67,7 @@ static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, const WebG
  
  void JSWebGL2RenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(&impl());
+    visitor.addOpaqueRoot(&wrapped());
  }
  
  JSValue JSWebGL2RenderingContext::getInternalformatParameter(ExecState* exec)
@@ -99,7 +99,7 @@ JSValue JSWebGL2RenderingContext::getIndexedParameter(ExecState* exec)
      if (exec->argumentCount() != 2)
          return exec->vm().throwException(exec, createNotEnoughArgumentsError(exec));
  
-    WebGL2RenderingContext& context = impl();
+    WebGL2RenderingContext& context = wrapped();
      unsigned pname = exec->uncheckedArgument(0).toInt32(exec);
      if (exec->hadException())
          return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp

index 4e4e5ca98fc14902a2cc000b6ab063890a21b165..831cf591ed7d08e9a08e1642a95a31c4661fdbbd 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp
@@ -174,7 +174,7 @@ static JSValue getObjectParameter(JSWebGLRenderingContextBase* obj, ExecState& s
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = obj->impl();
+    WebGLRenderingContextBase& context = obj->wrapped();
      unsigned target = state.uncheckedArgument(0).toInt32(&state);
      if (state.hadException())
          return jsUndefined();
@@ -265,7 +265,7 @@ static JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, WebGLExten
  
  void JSWebGLRenderingContextBase::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(&impl());
+    visitor.addOpaqueRoot(&wrapped());
  }
  
  JSValue JSWebGLRenderingContextBase::getAttachedShaders(ExecState& state)
@@ -273,7 +273,7 @@ JSValue JSWebGLRenderingContextBase::getAttachedShaders(ExecState& state)
      if (state.argumentCount() < 1)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      WebGLProgram* program = JSWebGLProgram::toWrapped(state.uncheckedArgument(0));
      if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
          return throwTypeError(&state);
@@ -296,7 +296,7 @@ JSValue JSWebGLRenderingContextBase::getExtension(ExecState& state)
      if (state.argumentCount() < 1)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      const String name = state.uncheckedArgument(0).toString(&state)->value(&state);
      if (state.hadException())
          return jsUndefined();
@@ -315,7 +315,7 @@ JSValue JSWebGLRenderingContextBase::getFramebufferAttachmentParameter(ExecState
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      unsigned target = state.uncheckedArgument(0).toInt32(&state);
      if (state.hadException())
          return jsUndefined();
@@ -339,7 +339,7 @@ JSValue JSWebGLRenderingContextBase::getParameter(ExecState& state)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      unsigned pname = state.uncheckedArgument(0).toInt32(&state);
      if (state.hadException())
          return jsUndefined();
@@ -357,7 +357,7 @@ JSValue JSWebGLRenderingContextBase::getProgramParameter(ExecState& state)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      WebGLProgram* program = JSWebGLProgram::toWrapped(state.uncheckedArgument(0));
      if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
          return throwTypeError(&state);
@@ -383,7 +383,7 @@ JSValue JSWebGLRenderingContextBase::getShaderParameter(ExecState& state)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      if (!state.uncheckedArgument(0).isUndefinedOrNull() && !state.uncheckedArgument(0).inherits(JSWebGLShader::info()))
          return throwTypeError(&state);
      WebGLShader* shader = JSWebGLShader::toWrapped(state.uncheckedArgument(0));
@@ -400,7 +400,7 @@ JSValue JSWebGLRenderingContextBase::getShaderParameter(ExecState& state)
  
  JSValue JSWebGLRenderingContextBase::getSupportedExtensions(ExecState& state)
  {
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      if (context.isContextLost())
          return jsNull();
      Vector<String> value = context.getSupportedExtensions();
@@ -421,7 +421,7 @@ JSValue JSWebGLRenderingContextBase::getUniform(ExecState& state)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
      
      ExceptionCode ec = 0;
-    WebGLRenderingContextBase& context = impl();
+    WebGLRenderingContextBase& context = wrapped();
      WebGLProgram* program = JSWebGLProgram::toWrapped(state.uncheckedArgument(0));
      if (!program && !state.uncheckedArgument(0).isUndefinedOrNull())
          return throwTypeError(&state);
@@ -691,77 +691,77 @@ static JSC::JSValue dataFunctionMatrix(DataFunctionMatrixToCall f, JSC::ExecStat
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform1fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_uniform1v, state, impl());
+    return dataFunctionf(f_uniform1v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform1iv(JSC::ExecState& state)
  {
-    return dataFunctioni(f_uniform1v, state, impl());
+    return dataFunctioni(f_uniform1v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform2fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_uniform2v, state, impl());
+    return dataFunctionf(f_uniform2v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform2iv(JSC::ExecState& state)
  {
-    return dataFunctioni(f_uniform2v, state, impl());
+    return dataFunctioni(f_uniform2v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform3fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_uniform3v, state, impl());
+    return dataFunctionf(f_uniform3v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform3iv(JSC::ExecState& state)
  {
-    return dataFunctioni(f_uniform3v, state, impl());
+    return dataFunctioni(f_uniform3v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform4fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_uniform4v, state, impl());
+    return dataFunctionf(f_uniform4v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniform4iv(JSC::ExecState& state)
  {
-    return dataFunctioni(f_uniform4v, state, impl());
+    return dataFunctioni(f_uniform4v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniformMatrix2fv(JSC::ExecState& state)
  {
-    return dataFunctionMatrix(f_uniformMatrix2fv, state, impl());
+    return dataFunctionMatrix(f_uniformMatrix2fv, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniformMatrix3fv(JSC::ExecState& state)
  {
-    return dataFunctionMatrix(f_uniformMatrix3fv, state, impl());
+    return dataFunctionMatrix(f_uniformMatrix3fv, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::uniformMatrix4fv(JSC::ExecState& state)
  {
-    return dataFunctionMatrix(f_uniformMatrix4fv, state, impl());
+    return dataFunctionMatrix(f_uniformMatrix4fv, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::vertexAttrib1fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_vertexAttrib1v, state, impl());
+    return dataFunctionf(f_vertexAttrib1v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::vertexAttrib2fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_vertexAttrib2v, state, impl());
+    return dataFunctionf(f_vertexAttrib2v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::vertexAttrib3fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_vertexAttrib3v, state, impl());
+    return dataFunctionf(f_vertexAttrib3v, state, wrapped());
  }
  
  JSC::JSValue JSWebGLRenderingContextBase::vertexAttrib4fv(JSC::ExecState& state)
  {
-    return dataFunctionf(f_vertexAttrib4v, state, impl());
+    return dataFunctionf(f_vertexAttrib4v, state, wrapped());
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp

index b6d39ac070f59773789891299dde0023572580d2..ede5bb97a868a421f3579f487f7599dc874e5862 100644 (file)
--- a/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp
@@ -38,7 +38,7 @@ namespace WebCore {
  
  void JSWebGLRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    visitor.addOpaqueRoot(&impl());
+    visitor.addOpaqueRoot(&wrapped());
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSWorkerCustom.cpp b/Source/WebCore/bindings/js/JSWorkerCustom.cpp

index 05a9e702e7c819bf7b751d9be77c112be3594fb3..0efbd12f033496ec3ce2cd06f1917b6f1fd3ebd4 100644 (file)
--- a/Source/WebCore/bindings/js/JSWorkerCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWorkerCustom.cpp
@@ -42,7 +42,7 @@ namespace WebCore {
  
  JSC::JSValue JSWorker::postMessage(JSC::ExecState& state)
  {
-    return handlePostMessage(state, &impl());
+    return handlePostMessage(state, &wrapped());
  }
  
  EncodedJSValue JSC_HOST_CALL constructJSWorker(ExecState* exec)
@@ -57,7 +57,7 @@ EncodedJSValue JSC_HOST_CALL constructJSWorker(ExecState* exec)
          return JSValue::encode(JSValue());
  
      // See section 4.8.2 step 14 of WebWorkers for why this is the lexicalGlobalObject. 
-    DOMWindow& window = asJSDOMWindow(exec->lexicalGlobalObject())->impl();
+    DOMWindow& window = asJSDOMWindow(exec->lexicalGlobalObject())->wrapped();
  
      ExceptionCode ec = 0;
      ASSERT(window.document());
diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp

index acd617e8698929075376e5832ab283f2d2fa7900..58da75e8e73294959de1ba637673b3c78852f8c7 100644 (file)
--- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
+++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp
@@ -47,7 +47,7 @@ const GlobalObjectMethodTable JSWorkerGlobalScopeBase::s_globalObjectMethodTable
  
  JSWorkerGlobalScopeBase::JSWorkerGlobalScopeBase(JSC::VM& vm, JSC::Structure* structure, PassRefPtr<WorkerGlobalScope> impl)
      : JSDOMGlobalObject(vm, structure, &normalWorld(vm), &s_globalObjectMethodTable)
-    , m_impl(impl)
+    , m_wrapped(impl)
  {
  }
  
@@ -64,7 +64,7 @@ void JSWorkerGlobalScopeBase::destroy(JSCell* cell)
  
  ScriptExecutionContext* JSWorkerGlobalScopeBase::scriptExecutionContext() const
  {
-    return m_impl.get();
+    return m_wrapped.get();
  }
  
  bool JSWorkerGlobalScopeBase::allowsAccessFrom(const JSGlobalObject* object, ExecState* exec)
diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h

index 031530ee586139fc5ab6f8b88514b584811c72de..2de8cc4fa068ed344206f1008b4ca6a7e6b769be 100644 (file)
--- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h
+++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h
@@ -42,7 +42,7 @@ namespace WebCore {
  
          DECLARE_INFO;
  
-        WorkerGlobalScope& impl() const { return *m_impl; }
+        WorkerGlobalScope& wrapped() const { return *m_wrapped; }
          ScriptExecutionContext* scriptExecutionContext() const;
  
          static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
@@ -65,7 +65,7 @@ namespace WebCore {
          void finishCreation(JSC::VM&);
  
      private:
-        RefPtr<WorkerGlobalScope> m_impl;
+        RefPtr<WorkerGlobalScope> m_wrapped;
      };
  
      // Returns a JSWorkerGlobalScope or jsNull()
diff --git a/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp b/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp

index 12898cc975bef500b3b10dbaf1f650a86dc3c302..a9457732d228cfa9aca80355fe3f42d7dfa159ae 100644 (file)
--- a/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp
@@ -53,9 +53,9 @@ namespace WebCore {
  
  void JSWorkerGlobalScope::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    if (WorkerLocation* location = impl().optionalLocation())
+    if (WorkerLocation* location = wrapped().optionalLocation())
          visitor.addOpaqueRoot(location);
-    if (WorkerNavigator* navigator = impl().optionalNavigator())
+    if (WorkerNavigator* navigator = wrapped().optionalNavigator())
          visitor.addOpaqueRoot(navigator);
  }
  
@@ -80,31 +80,31 @@ JSValue JSWorkerGlobalScope::importScripts(ExecState& state)
      }
      ExceptionCode ec = 0;
  
-    impl().importScripts(urls, ec);
+    wrapped().importScripts(urls, ec);
      setDOMException(&state, ec);
      return jsUndefined();
  }
  
  JSValue JSWorkerGlobalScope::setTimeout(ExecState& state)
  {
-    std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), impl().contentSecurityPolicy());
+    std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), wrapped().contentSecurityPolicy());
      if (state.hadException())
          return jsUndefined();
      if (!action)
          return jsNumber(0);
      int delay = state.argument(1).toInt32(&state);
-    return jsNumber(impl().setTimeout(WTF::move(action), delay));
+    return jsNumber(wrapped().setTimeout(WTF::move(action), delay));
  }
  
  JSValue JSWorkerGlobalScope::setInterval(ExecState& state)
  {
-    std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), impl().contentSecurityPolicy());
+    std::unique_ptr<ScheduledAction> action = ScheduledAction::create(&state, globalObject()->world(), wrapped().contentSecurityPolicy());
      if (state.hadException())
          return jsUndefined();
      if (!action)
          return jsNumber(0);
      int delay = state.argument(1).toInt32(&state);
-    return jsNumber(impl().setInterval(WTF::move(action), delay));
+    return jsNumber(wrapped().setInterval(WTF::move(action), delay));
  }
  
  } // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp b/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp

index 915b0628740e77ea0da70a7fbbecdb7180cba6bd..89b3bcfbb2c64b2e3b8ef1bf8f63796d6b8b2473 100644 (file)
--- a/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
+++ b/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp
@@ -58,16 +58,16 @@ namespace WebCore {
  
  void JSXMLHttpRequest::visitAdditionalChildren(SlotVisitor& visitor)
  {
-    if (XMLHttpRequestUpload* upload = impl().optionalUpload())
+    if (XMLHttpRequestUpload* upload = wrapped().optionalUpload())
          visitor.addOpaqueRoot(upload);
  
-    if (Document* responseDocument = impl().optionalResponseXML())
+    if (Document* responseDocument = wrapped().optionalResponseXML())
          visitor.addOpaqueRoot(responseDocument);
  
-    if (ArrayBuffer* responseArrayBuffer = impl().optionalResponseArrayBuffer())
+    if (ArrayBuffer* responseArrayBuffer = wrapped().optionalResponseArrayBuffer())
          visitor.addOpaqueRoot(responseArrayBuffer);
  
-    if (Blob* responseBlob = impl().optionalResponseBlob())
+    if (Blob* responseBlob = wrapped().optionalResponseBlob())
          visitor.addOpaqueRoot(responseBlob);
  }
  
@@ -77,7 +77,7 @@ JSValue JSXMLHttpRequest::open(ExecState& state)
      if (state.argumentCount() < 2)
          return state.vm().throwException(&state, createNotEnoughArgumentsError(&state));
  
-    const URL& url = impl().scriptExecutionContext()->completeURL(state.uncheckedArgument(1).toString(&state)->value(&state));
+    const URL& url = wrapped().scriptExecutionContext()->completeURL(state.uncheckedArgument(1).toString(&state)->value(&state));
      String method = state.uncheckedArgument(0).toString(&state)->value(&state);
  
      ExceptionCode ec = 0;
@@ -88,13 +88,13 @@ JSValue JSXMLHttpRequest::open(ExecState& state)
  
              if (!state.argument(4).isUndefined()) {
                  String password = valueToStringWithNullCheck(&state, state.uncheckedArgument(4));
-                impl().open(method, url, async, user, password, ec);
+                wrapped().open(method, url, async, user, password, ec);
              } else
-                impl().open(method, url, async, user, ec);
+                wrapped().open(method, url, async, user, ec);
          } else
-            impl().open(method, url, async, ec);
+            wrapped().open(method, url, async, ec);
      } else
-        impl().open(method, url, ec);
+        wrapped().open(method, url, ec);
  
      setDOMException(&state, ec);
      return jsUndefined();
@@ -138,30 +138,30 @@ private:
  
  JSValue JSXMLHttpRequest::send(ExecState& state)
  {
-    InspectorInstrumentation::willSendXMLHttpRequest(impl().scriptExecutionContext(), impl().url());
+    InspectorInstrumentation::willSendXMLHttpRequest(wrapped().scriptExecutionContext(), wrapped().url());
  
      ExceptionCode ec = 0;
      JSValue val = state.argument(0);
      if (val.isUndefinedOrNull())
-        impl().send(ec);
+        wrapped().send(ec);
      else if (val.inherits(JSDocument::info()))
-        impl().send(JSDocument::toWrapped(val), ec);
+        wrapped().send(JSDocument::toWrapped(val), ec);
      else if (val.inherits(JSBlob::info()))
-        impl().send(JSBlob::toWrapped(val), ec);
+        wrapped().send(JSBlob::toWrapped(val), ec);
      else if (val.inherits(JSDOMFormData::info()))
-        impl().send(JSDOMFormData::toWrapped(val), ec);
+        wrapped().send(JSDOMFormData::toWrapped(val), ec);
      else if (val.inherits(JSArrayBuffer::info()))
-        impl().send(toArrayBuffer(val), ec);
+        wrapped().send(toArrayBuffer(val), ec);
      else if (val.inherits(JSArrayBufferView::info())) {
          RefPtr<ArrayBufferView> view = toArrayBufferView(val);
-        impl().send(view.get(), ec);
+        wrapped().send(view.get(), ec);
      } else
-        impl().send(val.toString(&state)->value(&state), ec);
+        wrapped().send(val.toString(&state)->value(&state), ec);
  
      SendFunctor functor;
      state.iterate(functor);
-    impl().setLastSendLineAndColumnNumber(functor.line(), functor.column());
-    impl().setLastSendURL(functor.url());
+    wrapped().setLastSendLineAndColumnNumber(functor.line(), functor.column());
+    wrapped().setLastSendURL(functor.url());
      setDOMException(&state, ec);
      return jsUndefined();
  }
@@ -169,7 +169,7 @@ JSValue JSXMLHttpRequest::send(ExecState& state)
  JSValue JSXMLHttpRequest::responseText(ExecState& state) const
  {
      ExceptionCode ec = 0;
-    String text = impl().responseText(ec);
+    String text = wrapped().responseText(ec);
      if (ec) {
          setDOMException(&state, ec);
          return jsUndefined();
@@ -180,25 +180,25 @@ JSValue JSXMLHttpRequest::responseText(ExecState& state) const
  JSValue JSXMLHttpRequest::response(ExecState& state) const
  {
      // FIXME: Use CachedAttribute for other types than JSON as well.
-    if (m_response && impl().responseCacheIsValid())
+    if (m_response && wrapped().responseCacheIsValid())
          return m_response.get();
  
-    if (!impl().doneWithoutErrors() && impl().responseTypeCode() > XMLHttpRequest::ResponseTypeText)
+    if (!wrapped().doneWithoutErrors() && wrapped().responseTypeCode() > XMLHttpRequest::ResponseTypeText)
          return jsNull();
  
-    switch (impl().responseTypeCode()) {
+    switch (wrapped().responseTypeCode()) {
      case XMLHttpRequest::ResponseTypeDefault:
      case XMLHttpRequest::ResponseTypeText:
          return responseText(state);
  
      case XMLHttpRequest::ResponseTypeJSON:
          {
-            JSValue value = JSONParse(&state, impl().responseTextIgnoringResponseType());
+            JSValue value = JSONParse(&state, wrapped().responseTextIgnoringResponseType());
              if (!value)
                  value = jsNull();
              m_response.set(state.vm(), this, value);
  
-            impl().didCacheResponseJSON();
+            wrapped().didCacheResponseJSON();
  
              return value;
          }
@@ -206,7 +206,7 @@ JSValue JSXMLHttpRequest::response(ExecState& state) const
      case XMLHttpRequest::ResponseTypeDocument:
          {
              ExceptionCode ec = 0;
-            Document* document = impl().responseXML(ec);
+            Document* document = wrapped().responseXML(ec);
              if (ec) {
                  setDOMException(&state, ec);
                  return jsUndefined();
@@ -215,10 +215,10 @@ JSValue JSXMLHttpRequest::response(ExecState& state) const
          }
  
      case XMLHttpRequest::ResponseTypeBlob:
-        return toJS(&state, globalObject(), impl().responseBlob());
+        return toJS(&state, globalObject(), wrapped().responseBlob());
  
      case XMLHttpRequest::ResponseTypeArrayBuffer:
-        return toJS(&state, globalObject(), impl().responseArrayBuffer());
+        return toJS(&state, globalObject(), wrapped().responseArrayBuffer());
      }
  
      return jsUndefined();
diff --git a/Source/WebCore/bindings/js/JSXPathResultCustom.cpp b/Source/WebCore/bindings/js/JSXPathResultCustom.cpp

index 2416d6790813913f13ec0a519c5f1086c2635856..5d3486e859c64256677cd87bcabfc7b6a1603432 100644 (file)
--- a/Source/WebCore/bindings/js/JSXPathResultCustom.cpp
+++ b/Source/WebCore/bindings/js/JSXPathResultCustom.cpp
@@ -33,7 +33,7 @@ namespace WebCore {
  
  void JSXPathResult::visitAdditionalChildren(JSC::SlotVisitor& visitor)
  {
-    auto& value = impl().value();
+    auto& value = wrapped().value();
      if (value.isNodeSet()) {
          for (auto& node : value.toNodeSet())
              visitor.addOpaqueRoot(root(node.get()));
diff --git a/Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp b/Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp

index 331b9f1b0bbf579ac452d07edc1b9f658fcf615f..152b873700b9a0dc468cc03fb09e1a4324dc7681 100644 (file)
--- a/Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp
+++ b/Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp
@@ -53,7 +53,7 @@ JSValue JSXSLTProcessor::setParameter(ExecState& state)
      String namespaceURI = state.uncheckedArgument(0).toString(&state)->value(&state);
      String localName = state.uncheckedArgument(1).toString(&state)->value(&state);
      String value = state.uncheckedArgument(2).toString(&state)->value(&state);
-    impl().setParameter(namespaceURI, localName, value);
+    wrapped().setParameter(namespaceURI, localName, value);
      return jsUndefined();
  }
  
@@ -63,7 +63,7 @@ JSValue JSXSLTProcessor::getParameter(ExecState& state)
          return jsUndefined();
      String namespaceURI = state.uncheckedArgument(0).toString(&state)->value(&state);
      String localName = state.uncheckedArgument(1).toString(&state)->value(&state);
-    String value = impl().getParameter(namespaceURI, localName);
+    String value = wrapped().getParameter(namespaceURI, localName);
      return jsStringOrUndefined(&state, value);
  }
  
@@ -73,7 +73,7 @@ JSValue JSXSLTProcessor::removeParameter(ExecState& state)
          return jsUndefined();
      String namespaceURI = state.uncheckedArgument(0).toString(&state)->value(&state);
      String localName = state.uncheckedArgument(1).toString(&state)->value(&state);
-    impl().removeParameter(namespaceURI, localName);
+    wrapped().removeParameter(namespaceURI, localName);
      return jsUndefined();
  }
  
diff --git a/Source/WebCore/bindings/js/ScheduledAction.cpp b/Source/WebCore/bindings/js/ScheduledAction.cpp

index 058c91c9244a5c80ae9e8f0fb64ae0a846a3d5d3..febd2900e625e7ce36fc729337a492b8396d5d5a 100644 (file)
--- a/Source/WebCore/bindings/js/ScheduledAction.cpp
+++ b/Source/WebCore/bindings/js/ScheduledAction.cpp
@@ -117,7 +117,7 @@ void ScheduledAction::execute(Document& document)
      if (!window)
          return;
  
-    RefPtr<Frame> frame = window->impl().frame();
+    RefPtr<Frame> frame = window->wrapped().frame();
      if (!frame || !frame->script().canExecuteScripts(AboutToExecuteScript))
          return;
  
diff --git a/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp b/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp

index 0430ba7fd53cac2c542e863204dabac5fa0baf15..1cccf8af2100f07f505fe67bfc00b5944899418c 100644 (file)
--- a/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp
+++ b/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp
@@ -86,7 +86,7 @@ void ScriptCachedFrameData::restore(Frame& frame)
              windowShell->setWindow(window->vm(), window);
          else {
              DOMWindow* domWindow = frame.document()->domWindow();
-            if (&windowShell->window()->impl() == domWindow)
+            if (&windowShell->window()->wrapped() == domWindow)
                  continue;
  
              windowShell->setWindow(domWindow);
diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp

index b161e66f8d92c80c4fc8b2b726bc248657dd52d9..629c4213ae8fa1b6e9d26de003ff4e10b66e9a5e 100644 (file)
--- a/Source/WebCore/bindings/js/ScriptController.cpp
+++ b/Source/WebCore/bindings/js/ScriptController.cpp
@@ -208,7 +208,7 @@ void ScriptController::clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoP
      for (size_t i = 0; i < windowShells.size(); ++i) {
          JSDOMWindowShell* windowShell = windowShells[i].get();
  
-        if (&windowShell->window()->impl() == newDOMWindow)
+        if (&windowShell->window()->wrapped() == newDOMWindow)
              continue;
  
          // Clear the debugger and console from the current window before setting the new window.
@@ -391,7 +391,7 @@ void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*,
  {
      for (ShellMap::iterator iter = m_windowShells.begin(); iter != m_windowShells.end(); ++iter) {
          JSC::ExecState* exec = iter->value->window()->globalExec();
-        SecurityOrigin* origin = iter->value->window()->impl().document()->securityOrigin();
+        SecurityOrigin* origin = iter->value->window()->wrapped().document()->securityOrigin();
          result.append(std::pair<JSC::ExecState*, SecurityOrigin*>(exec, origin));
      }
  }
diff --git a/Source/WebCore/bindings/js/ScriptState.cpp b/Source/WebCore/bindings/js/ScriptState.cpp

index ae3c72976ff970aae2cd3519ab861a058b94bcde..26cab3c4a271dcab70a376a00902faad34804b83 100644 (file)
--- a/Source/WebCore/bindings/js/ScriptState.cpp
+++ b/Source/WebCore/bindings/js/ScriptState.cpp
@@ -52,7 +52,7 @@ DOMWindow* domWindowFromExecState(JSC::ExecState* scriptState)
      JSC::JSGlobalObject* globalObject = scriptState->lexicalGlobalObject();
      if (!globalObject->inherits(JSDOMWindowBase::info()))
          return nullptr;
-    return &JSC::jsCast<JSDOMWindowBase*>(globalObject)->impl();
+    return &JSC::jsCast<JSDOMWindowBase*>(globalObject)->wrapped();
  }
  
  Frame* frameFromExecState(JSC::ExecState* scriptState)
diff --git a/Source/WebCore/bindings/objc/DOM.mm b/Source/WebCore/bindings/objc/DOM.mm

index 63f6b552d04b9594bf1e32953ce51dbfd988c988..4352eb4e0eb8a9dd34824cba383594bbbe22783a 100644 (file)
--- a/Source/WebCore/bindings/objc/DOM.mm
+++ b/Source/WebCore/bindings/objc/DOM.mm
@@ -571,7 +571,7 @@ id <DOMEventTarget> kit(WebCore::EventTarget* eventTarget)
      if (!object->inherits(JSNode::info()))
          return nil;
  
-    WebCore::Node& node = jsCast<JSNode*>(object)->impl();
+    WebCore::Node& node = jsCast<JSNode*>(object)->wrapped();
      return kit(&node);
  }
  
diff --git a/Source/WebCore/bindings/objc/DOMUtility.mm b/Source/WebCore/bindings/objc/DOMUtility.mm

index fb17f0d3d86b10da5808d188cec904c0986279a1..1c3c7cfee253d0758d54b3849cff4b3e5cf7334e 100644 (file)
--- a/Source/WebCore/bindings/objc/DOMUtility.mm
+++ b/Source/WebCore/bindings/objc/DOMUtility.mm
@@ -91,7 +91,7 @@ static inline id createDOMWrapper(JSC::JSObject* object)
  {
      #define WRAP(className) \
          if (object->inherits(WebCore::JS##className::info())) \
-            return kit(&static_cast<WebCore::JS##className*>(object)->impl());
+            return kit(&static_cast<WebCore::JS##className*>(object)->wrapped());
  
      WRAP(CSSRule)
      WRAP(CSSRuleList)
@@ -121,10 +121,10 @@ static inline id createDOMWrapper(JSC::JSObject* object)
      #undef WRAP
  
      if (object->inherits(WebCore::JSDOMWindowShell::info()))
-        return kit(&static_cast<WebCore::JSDOMWindowShell*>(object)->impl());
+        return kit(&static_cast<WebCore::JSDOMWindowShell*>(object)->wrapped());
  
      if (object->inherits(WebCore::JSDOMImplementation::info()))
-        return kit(&static_cast<WebCore::JSDOMImplementation*>(object)->impl());
+        return kit(&static_cast<WebCore::JSDOMImplementation*>(object)->wrapped());
  
      return nil;
  }
diff --git a/Source/WebCore/bindings/objc/WebScriptObject.mm b/Source/WebCore/bindings/objc/WebScriptObject.mm

index 57f3202a8c2d6014ee1e1ac8fcf7e5bd062a77c8..fb6df25a4c7bf478fa3311397212c71c6f0576b6 100644 (file)
--- a/Source/WebCore/bindings/objc/WebScriptObject.mm
+++ b/Source/WebCore/bindings/objc/WebScriptObject.mm
@@ -252,7 +252,7 @@ static void addExceptionToConsole(ExecState* exec)
      // JSDOMWindowBase* isn't the right object to represent the currently executing
      // JavaScript. Instead, we should use ExecState, like we do elsewhere.
      JSDOMWindowBase* target = jsCast<JSDOMWindowBase*>(root->globalObject());
-    return BindingSecurity::shouldAllowAccessToDOMWindow(_private->originRootObject->globalObject()->globalExec(), target->impl());
+    return BindingSecurity::shouldAllowAccessToDOMWindow(_private->originRootObject->globalObject()->globalExec(), target->wrapped());
  }
  
  - (JSGlobalContextRef)_globalContextRef
@@ -541,7 +541,7 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root
  
          if (object->inherits(JSHTMLElement::info())) {
              // Plugin elements cache the instance internally.
-            if (ObjcInstance* instance = static_cast<ObjcInstance*>(pluginInstance(jsCast<JSHTMLElement*>(object)->impl())))
+            if (ObjcInstance* instance = static_cast<ObjcInstance*>(pluginInstance(jsCast<JSHTMLElement*>(object)->wrapped())))
                  return instance->getObject();
          } else if (object->inherits(ObjCRuntimeObject::info())) {
              ObjCRuntimeObject* runtimeObject = static_cast<ObjCRuntimeObject*>(object);
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

index 8861927f5ba0fbfeb938fcdc665cd1992de3d100..b6e8b2fe6752e660270d463c2e39d2df2dc79610 100644 (file)
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -421,7 +421,7 @@ sub GenerateGetOwnPropertySlotBody
          if ($indexedGetterFunction->signature->type eq "DOMString") {
              push(@getOwnPropertySlotImpl, "    if (optionalIndex) {\n");
          } else {
-            push(@getOwnPropertySlotImpl, "    if (optionalIndex && optionalIndex.value() < thisObject->impl().length()) {\n");
+            push(@getOwnPropertySlotImpl, "    if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {\n");
          }
          push(@getOwnPropertySlotImpl, "        unsigned index = optionalIndex.value();\n");
          # Assume that if there's a setter, the index will be writable
@@ -1188,9 +1188,9 @@ sub GenerateHeader
  
      if (NeedsImplementationClass($interface)) {
          if ($hasParent) {
-            push(@headerContent, "    $interfaceName& impl() const\n");
+            push(@headerContent, "    $interfaceName& wrapped() const\n");
              push(@headerContent, "    {\n");
-            push(@headerContent, "        return static_cast<$interfaceName&>(Base::impl());\n");
+            push(@headerContent, "        return static_cast<$interfaceName&>(Base::wrapped());\n");
              push(@headerContent, "    }\n");
          }
      }
@@ -1759,9 +1759,9 @@ sub GetIndexedGetterExpression
  {
      my $indexedGetterFunction = shift;
      if ($indexedGetterFunction->signature->type eq "DOMString") {
-        return "jsStringOrUndefined(state, thisObject->impl().item(index))";
+        return "jsStringOrUndefined(state, thisObject->wrapped().item(index))";
      }
-    return "toJS(state, thisObject->globalObject(), thisObject->impl().item(index))";
+    return "toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index))";
  }
  
  sub GenerateImplementation
@@ -2228,7 +2228,7 @@ sub GenerateImplementation
                  if ($indexedGetterFunction->signature->type eq "DOMString") {
                      push(@implContent, "    if (index <= MAX_ARRAY_INDEX) {\n");
                  } else {
-                    push(@implContent, "    if (index < thisObject->impl().length()) {\n");
+                    push(@implContent, "    if (index < thisObject->wrapped().length()) {\n");
                  }
                  # Assume that if there's a setter, the index will be writable
                  if ($interface->extendedAttributes->{"CustomIndexedSetter"}) {
@@ -2328,9 +2328,9 @@ sub GenerateImplementation
                      AddToImplIncludes("Frame.h");
                      AddToImplIncludes("Settings.h");
                      my $enable_function = ToMethodName($attribute->signature->extendedAttributes->{"EnabledBySetting"}) . "Enabled";
-                    push(@implContent, "    if (!castedThis->impl().frame())\n");
+                    push(@implContent, "    if (!castedThis->wrapped().frame())\n");
                      push(@implContent, "        return JSValue::encode(jsUndefined());\n");
-                    push(@implContent, "    Settings& settings = castedThis->impl().frame()->settings();\n");
+                    push(@implContent, "    Settings& settings = castedThis->wrapped().frame()->settings();\n");
                      push(@implContent, "    if (!settings.$enable_function())\n");
                      push(@implContent, "        return JSValue::encode(jsUndefined());\n");
                  }
@@ -2343,7 +2343,7 @@ sub GenerateImplementation
              if ($interface->extendedAttributes->{"CheckSecurity"} &&
                  !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"} &&
                  !$attribute->signature->extendedAttributes->{"DoNotCheckSecurityOnGetter"}) {
-                push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))\n");
+                push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))\n");
                  push(@implContent, "        return JSValue::encode(jsUndefined());\n");
              }
  
@@ -2361,7 +2361,7 @@ sub GenerateImplementation
                  my $exceptionCode = $getterExceptions ? "ec" : "0";
                  push(@implContent, "    static NeverDestroyed<const AtomicString> bindingName(\"$interfaceName.$name\", AtomicString::ConstructFromLiteral);\n");
                  push(@implContent, "    if (cursor.isCapturing()) {\n");
-                push(@implContent, "        $memoizedType memoizedResult = castedThis->impl().$implGetterFunctionName(" . join(", ", @arguments) . ");\n");
+                push(@implContent, "        $memoizedType memoizedResult = castedThis->wrapped().$implGetterFunctionName(" . join(", ", @arguments) . ");\n");
                  push(@implContent, "        cursor.appendInput<MemoizedDOMResult<$memoizedType>>(bindingName.get().string(), memoizedResult, $exceptionCode);\n");
                  push(@implContent, "        JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "memoizedResult", "castedThis") . ";\n");
                  push(@implContent, "        setDOMException(state, ec);\n") if $getterExceptions;
@@ -2385,7 +2385,7 @@ sub GenerateImplementation
                  push(@implContent, "    return JSValue::encode(castedThis->$implGetterFunctionName(*state));\n");
              } elsif ($attribute->signature->extendedAttributes->{"CheckSecurityForNode"}) {
                  $implIncludes{"JSDOMBinding.h"} = 1;
-                push(@implContent, "    auto& impl = castedThis->impl();\n");
+                push(@implContent, "    auto& impl = castedThis->wrapped();\n");
                  push(@implContent, "    return JSValue::encode(shouldAllowAccessToNode(state, impl." . $attribute->signature->name . "()) ? " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName()", "castedThis") . " : jsNull());\n");
              } elsif ($type eq "EventHandler") {
                  my $getter = $attribute->signature->extendedAttributes->{"WindowEventHandler"} ? "windowEventHandlerAttribute"
@@ -2393,7 +2393,7 @@ sub GenerateImplementation
                      : "eventHandlerAttribute";
                  my $eventName = EventHandlerAttributeEventName($attribute);
                  push(@implContent, "    UNUSED_PARAM(state);\n");
-                push(@implContent, "    return JSValue::encode($getter(castedThis->impl(), $eventName));\n");
+                push(@implContent, "    return JSValue::encode($getter(castedThis->wrapped(), $eventName));\n");
              } elsif ($attribute->signature->type =~ /Constructor$/) {
                  my $constructorType = $attribute->signature->type;
                  $constructorType =~ s/Constructor$//;
@@ -2421,9 +2421,9 @@ sub GenerateImplementation
                  my @callWithArgs = GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "JSValue::encode(jsUndefined())");
  
                  if ($svgListPropertyType) {
-                    push(@implContent, "    JSValue result =  " . NativeToJSValue($attribute->signature, 0, $interfaceName, "castedThis->impl().$implGetterFunctionName(" . (join ", ", @callWithArgs) . ")", "castedThis") . ";\n");
+                    push(@implContent, "    JSValue result =  " . NativeToJSValue($attribute->signature, 0, $interfaceName, "castedThis->wrapped().$implGetterFunctionName(" . (join ", ", @callWithArgs) . ")", "castedThis") . ";\n");
                  } elsif ($svgPropertyOrListPropertyType) {
-                    push(@implContent, "    $svgPropertyOrListPropertyType& impl = castedThis->impl().propertyReference();\n");
+                    push(@implContent, "    $svgPropertyOrListPropertyType& impl = castedThis->wrapped().propertyReference();\n");
                      if ($svgPropertyOrListPropertyType eq "float") { # Special case for JSSVGNumber
                          push(@implContent, "    JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl", "castedThis") . ";\n");
                      } else {
@@ -2446,7 +2446,7 @@ sub GenerateImplementation
  
                      unshift(@arguments, @callWithArgs);
                      my $jsType = NativeToJSValue($attribute->signature, 0, $interfaceName, "${functionName}(" . join(", ", @arguments) . ")", "castedThis");
-                    push(@implContent, "    auto& impl = castedThis->impl();\n") if !$attribute->isStatic;
+                    push(@implContent, "    auto& impl = castedThis->wrapped();\n") if !$attribute->isStatic;
                      if ($codeGenerator->IsSVGAnimatedType($type)) {
                          push(@implContent, "    RefPtr<$type> obj = $jsType;\n");
                          push(@implContent, "    JSValue result = toJS(state, castedThis->globalObject(), obj.get());\n");
@@ -2472,10 +2472,10 @@ sub GenerateImplementation
                  unshift(@arguments, GenerateCallWith($attribute->signature->extendedAttributes->{"CallWith"}, \@implContent, "JSValue::encode(jsUndefined())"));
  
                  if ($svgPropertyOrListPropertyType) {
-                    push(@implContent, "    $svgPropertyOrListPropertyType impl(*castedThis->impl());\n");
+                    push(@implContent, "    $svgPropertyOrListPropertyType impl(*castedThis->wrapped());\n");
                      push(@implContent, "    JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
                  } else {
-                    push(@implContent, "    auto& impl = castedThis->impl();\n");
+                    push(@implContent, "    auto& impl = castedThis->wrapped();\n");
                      push(@implContent, "    JSValue result = " . NativeToJSValue($attribute->signature, 0, $interfaceName, "impl.$implGetterFunctionName(" . join(", ", @arguments) . ")", "castedThis") . ";\n");
                  }
  
@@ -2517,7 +2517,7 @@ sub GenerateImplementation
  
              if ($interface->extendedAttributes->{"CheckSecurity"}) {
                  die if !ConstructorShouldBeOnInstance($interface);
-                push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, domObject->impl()))\n");
+                push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, domObject->wrapped()))\n");
                  push(@implContent, "        return JSValue::encode(jsUndefined());\n");
              }
  
@@ -2549,9 +2549,9 @@ sub GenerateImplementation
              push(@implContent, "    }\n");
              if ($interface->extendedAttributes->{"CheckSecurity"}) {
                  if ($interfaceName eq "DOMWindow") {
-                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))\n");
+                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))\n");
                  } else {
-                    push(@implContent, "    if (!shouldAllowAccessToFrame(state, castedThis->impl().frame()))\n");
+                    push(@implContent, "    if (!shouldAllowAccessToFrame(state, castedThis->wrapped().frame()))\n");
                  }
                  push(@implContent, "        return;\n");
              }
@@ -2661,9 +2661,9 @@ sub GenerateImplementation
              }
              if ($interface->extendedAttributes->{"CheckSecurity"} && !$attribute->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
                  if ($interfaceName eq "DOMWindow") {
-                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))\n");
+                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))\n");
                  } else {
-                    push(@implContent, "    if (!shouldAllowAccessToFrame(state, castedThis->impl().frame()))\n");
+                    push(@implContent, "    if (!shouldAllowAccessToFrame(state, castedThis->wrapped().frame()))\n");
                  }
                  push(@implContent, "        return;\n");
              }
@@ -2676,13 +2676,13 @@ sub GenerateImplementation
                  # FIXME: Find a way to do this special case without hardcoding the class and attribute names here.
                  if ((($interfaceName eq "DOMWindow") or ($interfaceName eq "WorkerGlobalScope")) and $name eq "onerror") {
                      $implIncludes{"JSErrorHandler.h"} = 1;
-                    push(@implContent, "    castedThis->impl().setAttributeEventListener($eventName, createJSErrorHandler(state, value, castedThis));\n");
+                    push(@implContent, "    castedThis->wrapped().setAttributeEventListener($eventName, createJSErrorHandler(state, value, castedThis));\n");
                  } else {
                      $implIncludes{"JSEventListener.h"} = 1;
                      my $setter = $attribute->signature->extendedAttributes->{"WindowEventHandler"} ? "setWindowEventHandlerAttribute"
                          : $attribute->signature->extendedAttributes->{"DocumentEventHandler"} ? "setDocumentEventHandlerAttribute"
                          : "setEventHandlerAttribute";
-                    push(@implContent, "    $setter(*state, *castedThis, castedThis->impl(), $eventName, value);\n");
+                    push(@implContent, "    $setter(*state, *castedThis, castedThis->wrapped(), $eventName, value);\n");
                  }
              } elsif ($attribute->signature->type =~ /Constructor$/) {
                  my $constructorType = $attribute->signature->type;
@@ -2705,18 +2705,18 @@ sub GenerateImplementation
                          my $implGetterFunctionName = $codeGenerator->WK_lcfirst($attribute->signature->extendedAttributes->{"ImplementedAs"} || $name);
                          my $attributeType = $attribute->signature->type;
                          if ($attribute->signature->isNullable) {
-                            push(@implContent, "    RefPtr<${attributeType}> forwardedImpl = castedThis->impl().${implGetterFunctionName}();\n");
+                            push(@implContent, "    RefPtr<${attributeType}> forwardedImpl = castedThis->wrapped().${implGetterFunctionName}();\n");
                              push(@implContent, "    if (!forwardedImpl)\n");
                              push(@implContent, "        return;\n");
                              push(@implContent, "    auto& impl = *forwardedImpl;\n");
                          } else {
                              # Attribute is not nullable, the implementation is expected to return a reference.
-                            push(@implContent, "    Ref<${attributeType}> forwardedImpl = castedThis->impl().${implGetterFunctionName}();\n");
+                            push(@implContent, "    Ref<${attributeType}> forwardedImpl = castedThis->wrapped().${implGetterFunctionName}();\n");
                              push(@implContent, "    auto& impl = forwardedImpl.get();\n");
                          }
                          $attribute = $codeGenerator->GetAttributeFromInterface($interface, $attribute->signature->type, $putForwards);
                      } else {
-                        push(@implContent, "    auto& impl = castedThis->impl();\n");
+                        push(@implContent, "    auto& impl = castedThis->wrapped();\n");
                      }
                  }
                  push(@implContent, "    ExceptionCode ec = 0;\n") if $setterRaisesException;
@@ -2823,13 +2823,13 @@ sub GenerateImplementation
          push(@implContent, "    auto* thisObject = jsCast<${className}*>(object);\n");
          push(@implContent, "    ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
          if ($indexedGetterFunction) {
-            push(@implContent, "    for (unsigned i = 0, count = thisObject->impl().length(); i < count; ++i)\n");
+            push(@implContent, "    for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)\n");
              push(@implContent, "        propertyNames.add(Identifier::from(state, i));\n");
          }
          if ($namedGetterFunction) {
              # FIXME: We may need to add an IDL extended attribute at some point if an interface needs enumerable named properties.
              push(@implContent, "    if (mode.includeDontEnumProperties()) {\n");
-            push(@implContent, "        for (auto& propertyName : thisObject->impl().supportedPropertyNames())\n");
+            push(@implContent, "        for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())\n");
              push(@implContent, "            propertyNames.add(Identifier::fromString(state, propertyName));\n");
              push(@implContent, "    }\n");
          }
@@ -2930,14 +2930,14 @@ sub GenerateImplementation
  
                  if ($interface->extendedAttributes->{"CheckSecurity"} and
                      !$function->signature->extendedAttributes->{"DoNotCheckSecurity"}) {
-                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))\n");
+                    push(@implContent, "    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))\n");
                      push(@implContent, "        return JSValue::encode(jsUndefined());\n");
                  }
  
                  if ($isCustom) {
                      push(@implContent, "    return JSValue::encode(castedThis->" . $functionImplementationName . "(*state));\n");
                  } else {
-                    push(@implContent, "    auto& impl = castedThis->impl();\n");
+                    push(@implContent, "    auto& impl = castedThis->wrapped();\n");
                      if ($svgPropertyType) {
                          push(@implContent, "    if (impl.isReadOnly()) {\n");
                          push(@implContent, "        setDOMException(state, NO_MODIFICATION_ALLOWED_ERR);\n");
@@ -2991,11 +2991,11 @@ sub GenerateImplementation
          push(@implContent, "    ASSERT_GC_OBJECT_INHERITS(thisObject, info());\n");
          push(@implContent, "    Base::visitChildren(thisObject, visitor);\n");
          if ($interface->extendedAttributes->{"EventTarget"} || $interface->name eq "EventTarget") {
-            push(@implContent, "    thisObject->impl().visitJSEventListeners(visitor);\n");
+            push(@implContent, "    thisObject->wrapped().visitJSEventListeners(visitor);\n");
          }
          push(@implContent, "    thisObject->visitAdditionalChildren(visitor);\n") if $interface->extendedAttributes->{"JSCustomMarkFunction"};
          if ($interface->extendedAttributes->{"ReportExtraMemoryCost"}) {
-            push(@implContent, "    visitor.reportExtraMemoryVisited(thisObject->impl().memoryCost());\n");
+            push(@implContent, "    visitor.reportExtraMemoryVisited(thisObject->wrapped().memoryCost());\n");
          }
          if ($numCachedAttributes > 0) {
              foreach (@{$interface->attributes}) {
@@ -3037,7 +3037,7 @@ sub GenerateImplementation
          if ($codeGenerator->InheritsExtendedAttribute($interface, "ActiveDOMObject")) {
              push(@implContent, "    auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
              $emittedJSCast = 1;
-            push(@implContent, "    if (js${interfaceName}->impl().hasPendingActivity())\n");
+            push(@implContent, "    if (js${interfaceName}->wrapped().hasPendingActivity())\n");
              push(@implContent, "        return true;\n");
          }
          if ($codeGenerator->InheritsExtendedAttribute($interface, "EventTarget")) {
@@ -3045,7 +3045,7 @@ sub GenerateImplementation
                  push(@implContent, "    auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
                  $emittedJSCast = 1;
              }
-            push(@implContent, "    if (js${interfaceName}->impl().isFiringEventListeners())\n");
+            push(@implContent, "    if (js${interfaceName}->wrapped().isFiringEventListeners())\n");
              push(@implContent, "        return true;\n");
          }
          if ($codeGenerator->InheritsInterface($interface, "Node")) {
@@ -3064,34 +3064,34 @@ sub GenerateImplementation
  
              my $rootString;
              if (GetGenerateIsReachable($interface) eq "Impl") {
-                $rootString  = "    ${implType}* root = &js${interfaceName}->impl();\n";
+                $rootString  = "    ${implType}* root = &js${interfaceName}->wrapped();\n";
              } elsif (GetGenerateIsReachable($interface) eq "ImplWebGLRenderingContext") {
-                $rootString  = "    WebGLRenderingContextBase* root = WTF::getPtr(js${interfaceName}->impl().context());\n";
+                $rootString  = "    WebGLRenderingContextBase* root = WTF::getPtr(js${interfaceName}->wrapped().context());\n";
              } elsif (GetGenerateIsReachable($interface) eq "ImplFrame") {
-                $rootString  = "    Frame* root = WTF::getPtr(js${interfaceName}->impl().frame());\n";
+                $rootString  = "    Frame* root = WTF::getPtr(js${interfaceName}->wrapped().frame());\n";
                  $rootString .= "    if (!root)\n";
                  $rootString .= "        return false;\n";
              } elsif (GetGenerateIsReachable($interface) eq "ImplDocument") {
-                $rootString  = "    Document* root = WTF::getPtr(js${interfaceName}->impl().document());\n";
+                $rootString  = "    Document* root = WTF::getPtr(js${interfaceName}->wrapped().document());\n";
                  $rootString .= "    if (!root)\n";
                  $rootString .= "        return false;\n";
              } elsif (GetGenerateIsReachable($interface) eq "ImplElementRoot") {
                  $implIncludes{"Element.h"} = 1;
                  $implIncludes{"JSNodeCustom.h"} = 1;
-                $rootString  = "    Element* element = WTF::getPtr(js${interfaceName}->impl().element());\n";
+                $rootString  = "    Element* element = WTF::getPtr(js${interfaceName}->wrapped().element());\n";
                  $rootString .= "    if (!element)\n";
                  $rootString .= "        return false;\n";
                  $rootString .= "    void* root = WebCore::root(element);\n";
              } elsif ($interfaceName eq "CanvasRenderingContext") {
                  $implIncludes{"Element.h"} = 1;
                  $implIncludes{"JSNodeCustom.h"} = 1;
-                $rootString  = "    void* root = WebCore::root(js${interfaceName}->impl().canvas());\n";
+                $rootString  = "    void* root = WebCore::root(js${interfaceName}->wrapped().canvas());\n";
              } elsif (GetGenerateIsReachable($interface) eq "ImplOwnerNodeRoot") {
                  $implIncludes{"Element.h"} = 1;
                  $implIncludes{"JSNodeCustom.h"} = 1;
-                $rootString  = "    void* root = WebCore::root(js${interfaceName}->impl().ownerNode());\n";
+                $rootString  = "    void* root = WebCore::root(js${interfaceName}->wrapped().ownerNode());\n";
              } else {
-                $rootString  = "    void* root = WebCore::root(&js${interfaceName}->impl());\n";
+                $rootString  = "    void* root = WebCore::root(&js${interfaceName}->wrapped());\n";
              }
  
              push(@implContent, $rootString);
@@ -3111,7 +3111,7 @@ sub GenerateImplementation
          push(@implContent, "{\n");
          push(@implContent, "    auto* js${interfaceName} = jsCast<JS${interfaceName}*>(handle.slot()->asCell());\n");
          push(@implContent, "    auto& world = *static_cast<DOMWrapperWorld*>(context);\n");
-        push(@implContent, "    uncacheWrapper(world, &js${interfaceName}->impl(), js${interfaceName});\n");
+        push(@implContent, "    uncacheWrapper(world, &js${interfaceName}->wrapped(), js${interfaceName});\n");
          push(@implContent, "}\n\n");
      }
  
@@ -3206,7 +3206,7 @@ END
          push(@implContent, "$implType* ${className}::toWrapped(JSC::JSValue value)\n");
          push(@implContent, "{\n");
          push(@implContent, "    if (auto* wrapper = " . GetCastingHelperForThisObject($interface) . "(value))\n");
-        push(@implContent, "        return &wrapper->impl();\n");
+        push(@implContent, "        return &wrapper->wrapped();\n");
          push(@implContent, "    return nullptr;\n");
          push(@implContent, "}\n");
      }
@@ -4255,7 +4255,7 @@ sub NativeToJSValue
              if ($selfIsTearOffType) {
                  AddToImplIncludes("SVGMatrixTearOff.h", $conditional);
                  # FIXME: Blink: Don't create a new one everytime we access the matrix property. This means, e.g, === won't work.
-                $value = "SVGMatrixTearOff::create(castedThis->impl(), $value)";
+                $value = "SVGMatrixTearOff::create(castedThis->wrapped(), $value)";
              } else {
                  AddToImplIncludes("SVGStaticPropertyTearOff.h", $conditional);
                  $tearOffType =~ s/SVGPropertyTearOff</SVGStaticPropertyTearOff<$interfaceName, /;
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp

index 99e122d3d7541a2f56a019e00d994abcecd432ad..b0d12c3893afe27b44b725880221e7839cfa7277 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp
@@ -149,9 +149,9 @@ EncodedJSValue jsTestActiveDOMObjectExcitingAttr(ExecState* state, JSObject* slo
      UNUSED_PARAM(slotBase);
      UNUSED_PARAM(thisValue);
      auto* castedThis = jsCast<JSTestActiveDOMObject*>(slotBase);
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))
          return JSValue::encode(jsUndefined());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = jsNumber(impl.excitingAttr());
      return JSValue::encode(result);
  }
@@ -162,7 +162,7 @@ EncodedJSValue jsTestActiveDOMObjectConstructor(ExecState* state, JSObject*, Enc
      JSTestActiveDOMObject* domObject = jsDynamicCast<JSTestActiveDOMObject*>(JSValue::decode(thisValue));
      if (!domObject)
          return throwVMTypeError(state);
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, domObject->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, domObject->wrapped()))
          return JSValue::encode(jsUndefined());
      return JSValue::encode(JSTestActiveDOMObject::getConstructor(state->vm(), domObject->globalObject()));
  }
@@ -179,9 +179,9 @@ EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionExcitingFunct
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestActiveDOMObject", "excitingFunction");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestActiveDOMObject::info());
-    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->impl()))
+    if (!BindingSecurity::shouldAllowAccessToDOMWindow(state, castedThis->wrapped()))
          return JSValue::encode(jsUndefined());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      if (UNLIKELY(state->argumentCount() < 1))
          return throwVMError(state, createNotEnoughArgumentsError(state));
      Node* nextChild = JSNode::toWrapped(state->argument(0));
@@ -198,7 +198,7 @@ EncodedJSValue JSC_HOST_CALL jsTestActiveDOMObjectPrototypeFunctionPostMessage(E
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestActiveDOMObject", "postMessage");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestActiveDOMObject::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      if (UNLIKELY(state->argumentCount() < 1))
          return throwVMError(state, createNotEnoughArgumentsError(state));
      String message = state->argument(0).toString(state)->value(state);
@@ -219,7 +219,7 @@ void JSTestActiveDOMObjectOwner::finalize(JSC::Handle<JSC::Unknown> handle, void
  {
      auto* jsTestActiveDOMObject = jsCast<JSTestActiveDOMObject*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestActiveDOMObject->impl(), jsTestActiveDOMObject);
+    uncacheWrapper(world, &jsTestActiveDOMObject->wrapped(), jsTestActiveDOMObject);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -269,7 +269,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestActiveDO
  TestActiveDOMObject* JSTestActiveDOMObject::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestActiveDOMObject*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp

index 09d6aab824e11d7ce4c9d719d7ff9b9cddbd92e0..caadbc1f0b57dd510ebbae06c8a0d311e95054fb 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp
@@ -134,7 +134,7 @@ void JSTestCustomConstructorWithNoInterfaceObjectOwner::finalize(JSC::Handle<JSC
  {
      auto* jsTestCustomConstructorWithNoInterfaceObject = jsCast<JSTestCustomConstructorWithNoInterfaceObject*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestCustomConstructorWithNoInterfaceObject->impl(), jsTestCustomConstructorWithNoInterfaceObject);
+    uncacheWrapper(world, &jsTestCustomConstructorWithNoInterfaceObject->wrapped(), jsTestCustomConstructorWithNoInterfaceObject);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -184,7 +184,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestCustomCo
  TestCustomConstructorWithNoInterfaceObject* JSTestCustomConstructorWithNoInterfaceObject::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestCustomConstructorWithNoInterfaceObject*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp

index 37c1e5812f41a5525549f340331e5f8e769b5069..994f366ef44c1e8409969aa8030a498244b96e22 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp
@@ -183,7 +183,7 @@ EncodedJSValue JSC_HOST_CALL jsTestCustomNamedGetterPrototypeFunctionAnotherFunc
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestCustomNamedGetter", "anotherFunction");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestCustomNamedGetter::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      if (UNLIKELY(state->argumentCount() < 1))
          return throwVMError(state, createNotEnoughArgumentsError(state));
      String str = state->argument(0).toString(state)->value(state);
@@ -204,7 +204,7 @@ void JSTestCustomNamedGetterOwner::finalize(JSC::Handle<JSC::Unknown> handle, vo
  {
      auto* jsTestCustomNamedGetter = jsCast<JSTestCustomNamedGetter*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestCustomNamedGetter->impl(), jsTestCustomNamedGetter);
+    uncacheWrapper(world, &jsTestCustomNamedGetter->wrapped(), jsTestCustomNamedGetter);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -254,7 +254,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestCustomNa
  TestCustomNamedGetter* JSTestCustomNamedGetter::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestCustomNamedGetter*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp

index 1a9fea7c117c704fa3bc663b4f350c23a869838d..8df92d9fd187353c27ff6039daa8cb84209d01a9 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp
@@ -167,7 +167,7 @@ EncodedJSValue jsTestEventConstructorAttr1(ExecState* state, JSObject* slotBase,
              return reportDeprecatedGetterError(*state, "TestEventConstructor", "attr1");
          return throwGetterTypeError(*state, "TestEventConstructor", "attr1");
      }
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = jsStringWithCache(state, impl.attr1());
      return JSValue::encode(result);
  }
@@ -184,7 +184,7 @@ EncodedJSValue jsTestEventConstructorAttr2(ExecState* state, JSObject* slotBase,
              return reportDeprecatedGetterError(*state, "TestEventConstructor", "attr2");
          return throwGetterTypeError(*state, "TestEventConstructor", "attr2");
      }
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = jsStringWithCache(state, impl.attr2());
      return JSValue::encode(result);
  }
@@ -214,7 +214,7 @@ void JSTestEventConstructorOwner::finalize(JSC::Handle<JSC::Unknown> handle, voi
  {
      auto* jsTestEventConstructor = jsCast<JSTestEventConstructor*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestEventConstructor->impl(), jsTestEventConstructor);
+    uncacheWrapper(world, &jsTestEventConstructor->wrapped(), jsTestEventConstructor);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -264,7 +264,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestEventCon
  TestEventConstructor* JSTestEventConstructor::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestEventConstructor*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp

index 978d92a645d2c48211a2068f8bfb9f3e15cbbb57..4edeac8693d6a27e2e27c09e9f25567693993113 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
@@ -145,10 +145,10 @@ bool JSTestEventTarget::getOwnPropertySlot(JSObject* object, ExecState* state, P
      auto* thisObject = jsCast<JSTestEventTarget*>(object);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
      Optional<uint32_t> optionalIndex = parseIndex(propertyName);
-    if (optionalIndex && optionalIndex.value() < thisObject->impl().length()) {
+    if (optionalIndex && optionalIndex.value() < thisObject->wrapped().length()) {
          unsigned index = optionalIndex.value();
          unsigned attributes = DontDelete | ReadOnly;
-        slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->impl().item(index)));
+        slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index)));
          return true;
      }
      if (getStaticValueSlot<JSTestEventTarget, Base>(state, JSTestEventTargetTable, thisObject, propertyName, slot))
@@ -171,9 +171,9 @@ bool JSTestEventTarget::getOwnPropertySlotByIndex(JSObject* object, ExecState* s
  {
      auto* thisObject = jsCast<JSTestEventTarget*>(object);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
-    if (index < thisObject->impl().length()) {
+    if (index < thisObject->wrapped().length()) {
          unsigned attributes = DontDelete | ReadOnly;
-        slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->impl().item(index)));
+        slot.setValue(thisObject, attributes, toJS(state, thisObject->globalObject(), thisObject->wrapped().item(index)));
          return true;
      }
      return Base::getOwnPropertySlotByIndex(thisObject, state, index, slot);
@@ -191,10 +191,10 @@ void JSTestEventTarget::getOwnPropertyNames(JSObject* object, ExecState* state,
  {
      auto* thisObject = jsCast<JSTestEventTarget*>(object);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
-    for (unsigned i = 0, count = thisObject->impl().length(); i < count; ++i)
+    for (unsigned i = 0, count = thisObject->wrapped().length(); i < count; ++i)
          propertyNames.add(Identifier::from(state, i));
      if (mode.includeDontEnumProperties()) {
-        for (auto& propertyName : thisObject->impl().supportedPropertyNames())
+        for (auto& propertyName : thisObject->wrapped().supportedPropertyNames())
              propertyNames.add(Identifier::fromString(state, propertyName));
      }
      Base::getOwnPropertyNames(thisObject, state, propertyNames, mode);
@@ -212,7 +212,7 @@ EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionItem(ExecState* s
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestEventTarget", "item");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      if (UNLIKELY(state->argumentCount() < 1))
          return throwVMError(state, createNotEnoughArgumentsError(state));
      unsigned index = toUInt32(state, state->argument(0), NormalConversion);
@@ -229,7 +229,7 @@ EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionAddEventListener(
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestEventTarget", "addEventListener");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue listener = state->argument(1);
      if (UNLIKELY(!listener.isObject()))
          return JSValue::encode(jsUndefined());
@@ -244,7 +244,7 @@ EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionRemoveEventListen
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestEventTarget", "removeEventListener");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue listener = state->argument(1);
      if (UNLIKELY(!listener.isObject()))
          return JSValue::encode(jsUndefined());
@@ -259,7 +259,7 @@ EncodedJSValue JSC_HOST_CALL jsTestEventTargetPrototypeFunctionDispatchEvent(Exe
      if (UNLIKELY(!castedThis))
          return throwThisTypeError(*state, "TestEventTarget", "dispatchEvent");
      ASSERT_GC_OBJECT_INHERITS(castedThis, JSTestEventTarget::info());
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      if (UNLIKELY(state->argumentCount() < 1))
          return throwVMError(state, createNotEnoughArgumentsError(state));
      ExceptionCode ec = 0;
@@ -277,13 +277,13 @@ void JSTestEventTarget::visitChildren(JSCell* cell, SlotVisitor& visitor)
      auto* thisObject = jsCast<JSTestEventTarget*>(cell);
      ASSERT_GC_OBJECT_INHERITS(thisObject, info());
      Base::visitChildren(thisObject, visitor);
-    thisObject->impl().visitJSEventListeners(visitor);
+    thisObject->wrapped().visitJSEventListeners(visitor);
  }
  
  bool JSTestEventTargetOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
  {
      auto* jsTestEventTarget = jsCast<JSTestEventTarget*>(handle.slot()->asCell());
-    if (jsTestEventTarget->impl().isFiringEventListeners())
+    if (jsTestEventTarget->wrapped().isFiringEventListeners())
          return true;
      UNUSED_PARAM(visitor);
      return false;
@@ -293,7 +293,7 @@ void JSTestEventTargetOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* co
  {
      auto* jsTestEventTarget = jsCast<JSTestEventTarget*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestEventTarget->impl(), jsTestEventTarget);
+    uncacheWrapper(world, &jsTestEventTarget->wrapped(), jsTestEventTarget);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -343,7 +343,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestEventTar
  TestEventTarget* JSTestEventTarget::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestEventTarget*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp

index 35da0e759e4839b123f9e523cdd26159f192a1e5..cad6e99de4c50130879e13500262db0909aa002c 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp
@@ -139,7 +139,7 @@ EncodedJSValue jsTestExceptionName(ExecState* state, JSObject* slotBase, Encoded
      UNUSED_PARAM(slotBase);
      UNUSED_PARAM(thisValue);
      auto* castedThis = jsCast<JSTestException*>(slotBase);
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = jsStringWithCache(state, impl.name());
      return JSValue::encode(result);
  }
@@ -169,7 +169,7 @@ void JSTestExceptionOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* cont
  {
      auto* jsTestException = jsCast<JSTestException*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestException->impl(), jsTestException);
+    uncacheWrapper(world, &jsTestException->wrapped(), jsTestException);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -219,7 +219,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestExceptio
  TestException* JSTestException::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestException*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp

index 573a090acf7a870e0bb719bff7f15c19ce1e6358..c7406ac1954e9092ba55f324af1bce1d5cdccd5d 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp
@@ -123,7 +123,7 @@ JSValue JSTestGenerateIsReachable::getConstructor(VM& vm, JSGlobalObject* global
  bool JSTestGenerateIsReachableOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
  {
      auto* jsTestGenerateIsReachable = jsCast<JSTestGenerateIsReachable*>(handle.slot()->asCell());
-    TestGenerateIsReachable* root = &jsTestGenerateIsReachable->impl();
+    TestGenerateIsReachable* root = &jsTestGenerateIsReachable->wrapped();
      return visitor.containsOpaqueRoot(root);
  }
  
@@ -131,7 +131,7 @@ void JSTestGenerateIsReachableOwner::finalize(JSC::Handle<JSC::Unknown> handle,
  {
      auto* jsTestGenerateIsReachable = jsCast<JSTestGenerateIsReachable*>(handle.slot()->asCell());
      auto& world = *static_cast<DOMWrapperWorld*>(context);
-    uncacheWrapper(world, &jsTestGenerateIsReachable->impl(), jsTestGenerateIsReachable);
+    uncacheWrapper(world, &jsTestGenerateIsReachable->wrapped(), jsTestGenerateIsReachable);
  }
  
  #if ENABLE(BINDING_INTEGRITY)
@@ -181,7 +181,7 @@ JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, TestGenerate
  TestGenerateIsReachable* JSTestGenerateIsReachable::toWrapped(JSC::JSValue value)
  {
      if (auto* wrapper = jsDynamicCast<JSTestGenerateIsReachable*>(value))
-        return &wrapper->impl();
+        return &wrapper->wrapped();
      return nullptr;
  }
  
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

index d2d7b801348fd6cc4c61a919e7b12030c66b6129..fd8cea35dc2efff0d54aee313661422e35c0bc1e 100644 (file)
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
@@ -462,7 +462,7 @@ EncodedJSValue jsTestInterfaceImplementsStr1(ExecState* state, JSObject* slotBas
              return reportDeprecatedGetterError(*state, "TestInterface", "implementsStr1");
          return throwGetterTypeError(*state, "TestInterface", "implementsStr1");
      }
-    auto& impl = castedThis->impl();
+    auto& impl = castedThis->wrapped();
      JSValue result = jsStringWithCache(state, impl.implementsStr1());
      return JSValue::encode(result);
  }
@@
author	youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)
committer	youenn.fablet@crf.canon.fr <youenn.fablet@crf.canon.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 2 Nov 2015 11:44:18 +0000 (11:44 +0000)
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/Modules/plugins/QuickTimePluginReplacement.mm		patch \| blob \| history
Source/WebCore/bindings/js/JSAttrCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSAudioBufferSourceNodeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSAudioTrackCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSBiquadFilterNodeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCSSRuleCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCSSValueCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCanvasRenderingContext2DCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCharacterDataCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCommandLineAPIHostCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoKeyCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCustomEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSCustomXPathNSResolver.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMBinding.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMMimeTypeArrayCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMNamedFlowCollectionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMPluginArrayCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMPluginCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMStringListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMStringMapCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMTokenListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWindowBase.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWindowBase.h		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWindowCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWindowShell.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWindowShell.h		patch \| blob \| history
Source/WebCore/bindings/js/JSDOMWrapper.h		patch \| blob \| history
Source/WebCore/bindings/js/JSDataCueCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDataTransferCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDedicatedWorkerGlobalScopeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDeviceMotionEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDeviceOrientationEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDocumentCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSDocumentTypeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSEventListener.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSEventTargetCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSFileReaderCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSGeolocationCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLCollectionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLDocumentCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLInputElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLMediaElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLSelectElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHTMLTemplateElementCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSHistoryCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSIDBDatabaseCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSIDBObjectStoreCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSLocationCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMediaSourceStatesCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMessageChannelCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMessageEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMessagePortCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMockContentFilterSettingsCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSMutationObserverCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNamedNodeMapCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNavigatorCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNodeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNodeListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSNodeOrString.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSOscillatorNodeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSPannerNodeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSPluginElementFunctions.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSPopStateEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSSQLTransactionCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSSVGLengthCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSStorageCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSStyleSheetCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSStyleSheetListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTextTrackCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTextTrackListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTrackCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTrackEventCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSUserMessageHandlersNamespaceCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSVideoTrackCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWebGL2RenderingContextCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWorkerCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSWorkerGlobalScopeBase.h		patch \| blob \| history
Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSXPathResultCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/JSXSLTProcessorCustom.cpp		patch \| blob \| history
Source/WebCore/bindings/js/ScheduledAction.cpp		patch \| blob \| history
Source/WebCore/bindings/js/ScriptCachedFrameData.cpp		patch \| blob \| history
Source/WebCore/bindings/js/ScriptController.cpp		patch \| blob \| history
Source/WebCore/bindings/js/ScriptState.cpp		patch \| blob \| history
Source/WebCore/bindings/objc/DOM.mm		patch \| blob \| history
Source/WebCore/bindings/objc/DOMUtility.mm		patch \| blob \| history
Source/WebCore/bindings/objc/WebScriptObject.mm		patch \| blob \| history
Source/WebCore/bindings/scripts/CodeGeneratorJS.pm		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestNode.h		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp		patch \| blob \| history
Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp		patch \| blob \| history
Source/WebCore/bridge/runtime_method.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorController.cpp		patch \| blob \| history
Source/WebKit/mac/ChangeLog		patch \| blob \| history
Source/WebKit/mac/WebView/WebFrame.mm		patch \| blob \| history
Source/WebKit/mac/WebView/WebScriptDebugger.mm		patch \| blob \| history
Source/WebKit/win/ChangeLog		patch \| blob \| history
Source/WebKit/win/WebFrame.cpp		patch \| blob \| history
Source/WebKit2/ChangeLog		patch \| blob \| history
Source/WebKit2/WebProcess/WebPage/WebFrame.cpp		patch \| blob \| history