1. 28 Sep, 2013 7 commits
    • akling@apple.com's avatar
      Pass VM instead of ExecState to JSFunction constructors. · 20d6f9c1
      akling@apple.com authored
      <https://webkit.org/b/122014>
      
      Reviewed by Geoffrey Garen.
      
      Source/JavaScriptCore:
      
      JSFunction doesn't need the ExecState for anything during its
      construction, so reduce the amount of loads by just passing the
      VM around instead.
      
      Factored out putDirectNonIndexAccessor() from the existing
      putDirectAccessor() to avoid snowballing the patch (and because
      it's kinda neat to avoid the extra branch.)
      
      JSC release binary size -= 9680 bytes.
      
      Source/WebCore:
      
      Updated for new JSFunction::create() signature.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156602 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      20d6f9c1
    • gyuyoung.kim@samsung.com's avatar
      Generate toCSSFooValue() for CSSImageValue · d0c71466
      gyuyoung.kim@samsung.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122051
      
      Reviewed by Andreas Kling.
      
      Clean up static_cast<CSSImageValue*> type casts. It will help to
      detect bad cast as well as improve code readability.
      
      Removed unnecessary local variables as well.
      
      No new tests, no behavior changes.
      
      * css/CSSCrossfadeValue.cpp:
      (WebCore::subimageKnownToBeOpaque):
      * css/CSSCursorImageValue.cpp:
      (WebCore::CSSCursorImageValue::~CSSCursorImageValue):
      (WebCore::CSSCursorImageValue::updateIfSVGCursorIsUsed):
      (WebCore::CSSCursorImageValue::cachedImage):
      (WebCore::CSSCursorImageValue::isSVGCursor):
      * css/CSSImageGeneratorValue.cpp:
      (WebCore::CSSImageGeneratorValue::subimageIsPending):
      (WebCore::CSSImageGeneratorValue::cachedImageForCSSValue):
      * css/CSSImageSetValue.cpp:
      (WebCore::CSSImageSetValue::fillImageSet):
      * css/CSSImageValue.h:
      * css/CSSValue.cpp:
      (WebCore::CSSValue::destroy):
      * css/StyleResolver.cpp:
      (WebCore::StyleResolver::applyProperty):
      (WebCore::StyleResolver::styleImage):
      * page/PageSerializer.cpp:
      (WebCore::PageSerializer::retrieveResourcesForProperties):
      * rendering/style/StylePendingImage.h:
      (WebCore::StylePendingImage::data):
      (WebCore::StylePendingImage::cssImageValue):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156601 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d0c71466
    • mrowe@apple.com's avatar
      WebCore fails to build with newer versions of clang. · 00e249e3
      mrowe@apple.com authored
      Reviewed by Sam Weinig.
      
      * Modules/indexeddb/IDBIndex.cpp: Remove an unused constant.
      * Modules/indexeddb/IDBObjectStore.cpp: Ditto.
      * Modules/webaudio/AudioContext.cpp: Ditto.
      * Modules/webaudio/ScriptProcessorNode.cpp: Ditto.
      * Modules/webdatabase/SQLResultSet.cpp: Ditto.
      * Modules/webdatabase/SQLTransactionBackend.cpp: Ditto.
      * Modules/websockets/WebSocketHandshake.cpp: Ditto.
      * bindings/objc/DOM.mm: Disable a warning about overriding a protocol method in a cateogry around the one
      place we do it. I don't understand why this generates a warning, nor can I see a different approach that
      would not result in the warning being emitted.
      * css/CSSGrammar.y.in: #if a function that's only used inside an #if.
      * html/track/TextTrackCue.cpp: Remove an unused constant.
      * loader/TextResourceDecoder.cpp: Remove two unused functions.
      * page/ContentSecurityPolicy.cpp: Add #if's around constants and functions that are only used when CSP_NEXT is enabled.
      (WebCore::CSPDirectiveList::checkSourceAndReportViolation): Reorder the ifs slightly to make the #if'ing easier.
      * page/ContentSecurityPolicy.h: Add #if's around functions that are only used when CSP_NEXT is enabled.
      * page/DOMSecurityPolicy.cpp: Ditto.
      * page/DOMSecurityPolicy.h: Ditto.
      * page/animation/CSSPropertyAnimation.cpp: Remove an unused function.
      * platform/mac/DisplaySleepDisabler.cpp: Add an #if around a constant that's only used on iOS.
      * platform/mac/WebCoreFullScreenWarningView.mm: Remove three unused constants.
      * rendering/RenderLayer.cpp: Remove two unused constants.
      * rendering/RenderLayerCompositor.cpp:
      (WebCore::compositingLogEnabled): Move the #if around the function definition.
      * svg/SVGAnimatedAngle.cpp: Remove an unused function.
      * svg/SVGUseElement.cpp: #if a function that's only used inside an ASSERT.
      * xml/XPathStep.cpp: Ditto.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156600 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      00e249e3
    • mrowe@apple.com's avatar
      WebKit fails to build with newer versions of clang. · 71c9e4d0
      mrowe@apple.com authored
      Reviewed by Sam Weinig.
      
      * Carbon/HIWebView.mm: Remove an unused function.
      * History/BinaryPropertyList.cpp: #if a constant that's only used in 64-bit.
      * Misc/WebIconDatabase.mm: Remove two unused constants.
      * Plugins/WebBaseNetscapePluginView.mm: Remove an unused constant.
      * WebCoreSupport/WebEditorClient.mm: Ditto.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156599 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      71c9e4d0
    • mrowe@apple.com's avatar
      WebKit2 fails to build with newer versions of clang. · f81ab24c
      mrowe@apple.com authored
      Reviewed by Anders Carlsson.
      
      * Shared/VisitedLinkTable.cpp: #if a function that's only used inside an ASSERT.
      * UIProcess/Plugins/mac/PluginInfoStoreMac.mm: Remove an unused constant.
      * UIProcess/mac/WKFullScreenWindowController.mm: Ditto.
      * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm: Ditto.
      * WebProcess/WebPage/FindController.cpp: Ditto.
      * WebProcess/WebPage/WebBackForwardListProxy.cpp: Remove two unused constants.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156598 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      f81ab24c
    • mrowe@apple.com's avatar
      JavaScriptCore fails to build with newer versions of clang. · aae57e37
      mrowe@apple.com authored
      Reviewed by Sam Weinig.
      
      * interpreter/Interpreter.cpp: Remove an unused function.
      * parser/SourceProvider.cpp: Ditto.
      * runtime/GCActivityCallback.cpp: #if a constant that's only used on non-CF platforms.
      * runtime/JSCJSValue.cpp: Remove an unused constant.
      * runtime/JSString.cpp: Ditto.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156597 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      aae57e37
    • mrowe@apple.com's avatar
      <rdar://problem/15079224> WTF fails to build with newer versions of clang. · 1524ed50
      mrowe@apple.com authored
      Reviewed by Sam Weinig.
      
      * wtf/DateMath.cpp: Remove some unused constants.
      * wtf/FastMalloc.cpp: #if some constants and functions that are unused in some configurations.
      Remove a function that's unused on all platforms.
      * wtf/TCSystemAlloc.cpp: Remove some unused constants.
      (TCMalloc_SystemRelease): Remove an if whose body is never executed.
      * wtf/dtoa.cpp: #if things such that storeInc is only defined when USE_LONG_LONG is undefined.
      Remove an unused constant.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156596 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1524ed50
  2. 27 Sep, 2013 33 commits
    • ap@apple.com's avatar
      Restore accidentally removed ChangeLog lines. · 14deeab8
      ap@apple.com authored
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156595 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      14deeab8
    • fpizlo@apple.com's avatar
      Get rid of SetMyScope/SetCallee; use normal variables for the scope and callee... · 48cdafdc
      fpizlo@apple.com authored
      Get rid of SetMyScope/SetCallee; use normal variables for the scope and callee of inlined call frames of closures
      https://bugs.webkit.org/show_bug.cgi?id=122047
      
      Reviewed by Oliver Hunt.
              
      Currently we have the DFG reserve space for inline call frames at exactly the same stack
      offsets that you would have gotten if the baseline interpreter/JIT had made the calls.
      We need to get rid of that. One of the weirder parts of this is that we have special DFG
      operations for accessing these inlined call frame headers. It's really hard for any
      analysis of DFG IR to see what the liveness of any of those frame header "variables" is;
      the liveness behaves like flushed arguments (it's all live until end of the inlinee) but
      we don't have anything like a Flush node for those special variables.
              
      This patch gets rid of the special operations for accessing inline call frame headers.
      GetMyScope and GetCallee still remain, and are only for accessing the machine call
      frame's scope/callee entries. The inline call frame's scope/callee now behave like
      normal variables, and have Flush behavior just like inline arguments.
      
      * dfg/DFGAbstractInterpreterInlines.h:
      (JSC::DFG::::executeEffects):
      * dfg/DFGByteCodeParser.cpp:
      (JSC::DFG::ByteCodeParser::getDirect):
      (JSC::DFG::ByteCodeParser::get):
      (JSC::DFG::ByteCodeParser::setDirect):
      (JSC::DFG::ByteCodeParser::set):
      (JSC::DFG::ByteCodeParser::setLocal):
      (JSC::DFG::ByteCodeParser::setArgument):
      (JSC::DFG::ByteCodeParser::flush):
      (JSC::DFG::ByteCodeParser::InlineStackEntry::remapOperand):
      (JSC::DFG::ByteCodeParser::handleInlining):
      (JSC::DFG::ByteCodeParser::getScope):
      * dfg/DFGCSEPhase.cpp:
      (JSC::DFG::CSEPhase::getCalleeLoadElimination):
      (JSC::DFG::CSEPhase::getMyScopeLoadElimination):
      (JSC::DFG::CSEPhase::performNodeCSE):
      * dfg/DFGClobberize.h:
      (JSC::DFG::clobberize):
      * dfg/DFGFixupPhase.cpp:
      (JSC::DFG::FixupPhase::fixupNode):
      * dfg/DFGNodeType.h:
      * dfg/DFGPredictionPropagationPhase.cpp:
      (JSC::DFG::PredictionPropagationPhase::propagate):
      * dfg/DFGSafeToExecute.h:
      (JSC::DFG::safeToExecute):
      * dfg/DFGSpeculativeJIT32_64.cpp:
      (JSC::DFG::SpeculativeJIT::compile):
      * dfg/DFGSpeculativeJIT64.cpp:
      (JSC::DFG::SpeculativeJIT::compile):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156594 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      48cdafdc
    • bjonesbe@adobe.com's avatar
      [CSS Shapes] New positioning model: Positive margins · 28bb0b6e
      bjonesbe@adobe.com authored
      https://bugs.webkit.org/show_bug.cgi?id=118089
      
      Reviewed by Alexandru Chiculita.
      
      The remaining tests for shape-outside with positive margins. These
      have all been imported from the CSSWG's repo.
      
      * csswg/contributors/adobe/submitted/shapes/shape-outside/resources/w3c-import.log:
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005-expected.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-005.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006-expected.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-006.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007-expected.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-007.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008-expected.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-008.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009-expected.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/shape-outside-floats-margin-009.html: Added.
      * csswg/contributors/adobe/submitted/shapes/shape-outside/w3c-import.log:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      28bb0b6e
    • ap@apple.com's avatar
      Layout Test media/media-controller-playback.html is flaky · 105e399e
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122042
      
      * platform/mac/TestExpectations: Marked as such.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156592 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      105e399e
    • lforschler@apple.com's avatar
      Versioning. · 648f3a69
      lforschler@apple.com authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156591 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      648f3a69
    • beidson@apple.com's avatar
      IndexedDB IDL Refactoring. · 77a081cf
      beidson@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=121996
      
      Reviewed by Alexey Proskuryakov.
      
      This includes:
      1 - Leveraging EventTarget.idl inheritance
      2 - Removing comments
      3 - Reordering to match the spec's IDLs
      4 - Removing nonstandard, WebKit-specific methods
      5 - Updating interfaces to match the spec (versions are only uint64_t's now...)
      6 - Updating implementation code as needed (versions are only uint64_t's now...)
      
      IDL changes:
      * Modules/indexeddb/IDBCursor.idl:
      * Modules/indexeddb/IDBDatabase.idl:
      * Modules/indexeddb/IDBFactory.idl:
      * Modules/indexeddb/IDBIndex.idl:
      * Modules/indexeddb/IDBKeyRange.idl:
      * Modules/indexeddb/IDBObjectStore.idl:
      * Modules/indexeddb/IDBRequest.idl:
      * Modules/indexeddb/IDBTransaction.idl:
      * Modules/indexeddb/IDBVersionChangeEvent.idl:
      
      * Modules/indexeddb/IndexedDB.h: Add new enum to represent version nullness.
      
      Adapt to new IDLs, and also refactor representation of initial, null versioning:
      * Modules/indexeddb/IDBCallbacks.h:
      (WebCore::IDBCallbacks::onBlocked):
      (WebCore::IDBCallbacks::onUpgradeNeeded):
      
      * Modules/indexeddb/IDBDatabase.cpp:
      (WebCore::IDBDatabase::version):
      (WebCore::IDBDatabase::onVersionChange):
      * Modules/indexeddb/IDBDatabase.h:
      
      * Modules/indexeddb/IDBDatabaseCallbacks.h:
      * Modules/indexeddb/IDBDatabaseCallbacksImpl.cpp:
      (WebCore::IDBDatabaseCallbacksImpl::onVersionChange):
      * Modules/indexeddb/IDBDatabaseCallbacksImpl.h:
      
      * Modules/indexeddb/IDBFactory.cpp:
      (WebCore::IDBFactory::open):
      (WebCore::IDBFactory::openInternal):
      (WebCore::IDBFactory::deleteDatabase):
      * Modules/indexeddb/IDBFactory.h:
      
      * Modules/indexeddb/IDBMetadata.h:
      (WebCore::IDBDatabaseMetadata::IDBDatabaseMetadata):
      
      * Modules/indexeddb/IDBOpenDBRequest.cpp:
      (WebCore::IDBOpenDBRequest::create):
      (WebCore::IDBOpenDBRequest::IDBOpenDBRequest):
      (WebCore::IDBOpenDBRequest::onBlocked):
      (WebCore::IDBOpenDBRequest::onUpgradeNeeded):
      * Modules/indexeddb/IDBOpenDBRequest.h:
      
      * Modules/indexeddb/IDBRequest.cpp:
      * Modules/indexeddb/IDBRequest.h:
      
      * Modules/indexeddb/IDBTransaction.cpp:
      * Modules/indexeddb/IDBTransaction.h:
      
      * Modules/indexeddb/IDBVersionChangeEvent.cpp:
      (WebCore::IDBVersionChangeEvent::IDBVersionChangeEvent):
      * Modules/indexeddb/IDBVersionChangeEvent.h:
      (WebCore::IDBVersionChangeEvent::create):
      (WebCore::IDBVersionChangeEvent::oldVersion):
      (WebCore::IDBVersionChangeEvent::newVersion):
      
      Keep leveldb building with minimal adaptations to the new IDLs,
      but note that the LevelDB implementation is now incompatible with the spec:
      * Modules/indexeddb/leveldb/IDBBackingStoreLevelDB.cpp:
      (WebCore::IDBBackingStore::getIDBDatabaseMetaData):
      (WebCore::objectStoreCursorOptions):
      (WebCore::indexCursorOptions):
      
      * Modules/indexeddb/leveldb/IDBDatabaseBackendLevelDB.cpp:
      (WebCore::IDBDatabaseBackendLevelDB::IDBDatabaseBackendLevelDB):
      (WebCore::IDBDatabaseBackendLevelDB::openInternal):
      (WebCore::IDBDatabaseBackendLevelDB::VersionChangeOperation::perform):
      (WebCore::IDBDatabaseBackendLevelDB::processPendingCalls):
      (WebCore::IDBDatabaseBackendLevelDB::openConnection):
      (WebCore::IDBDatabaseBackendLevelDB::runIntVersionChangeTransaction):
      (WebCore::IDBDatabaseBackendLevelDB::deleteDatabase):
      (WebCore::IDBDatabaseBackendLevelDB::deleteDatabaseFinal):
      (WebCore::IDBDatabaseBackendLevelDB::VersionChangeAbortOperation::perform):
      
      * Modules/indexeddb/leveldb/IDBLevelDBCoding.cpp:
      (WebCore::IDBLevelDBCoding::compareEncodedIDBKeys):
      
      * inspector/InspectorIndexedDBAgent.cpp: Update for metadata change.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156590 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      77a081cf
    • ossy@webkit.org's avatar
      CookieStorageShim should be PLATFORM(MAC) guarded · 4e3438e4
      ossy@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=121423
      
      Reviewed by Darin Adler.
      
      Original patch by Kwang Yul Seo <skyul@company100.com>.
      
      * WebProcess/WebProcess.cpp:
      (WebKit::WebProcess::initializeWebProcess):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156589 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      4e3438e4
    • enrica@apple.com's avatar
      Upstream changes to Pasteboard implementation for iOS. · 38848efa
      enrica@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=121818
      
      Reviewed by Benjamin Poulain.
      
      Source/WebCore: 
      
      * WebCore.exp.in:
      * editing/Editor.cpp:
      (WebCore::Editor::dispatchCPPEvent):
      * editing/ios/EditorIOS.mm:
      (WebCore::Editor::WebContentReader::addFragment):
      (WebCore::Editor::WebContentReader::readWebArchive):
      (WebCore::Editor::WebContentReader::readFilenames):
      (WebCore::Editor::WebContentReader::readHTML):
      (WebCore::Editor::WebContentReader::readRTFD):
      (WebCore::Editor::WebContentReader::readRTF):
      (WebCore::uniqueURLWithRelativePart):
      (WebCore::Editor::WebContentReader::readImage):
      (WebCore::Editor::WebContentReader::readURL):
      (WebCore::Editor::WebContentReader::readPlainText):
      (WebCore::Editor::webContentFromPasteboard):
      (WebCore::Editor::pasteWithPasteboard):
      (WebCore::Editor::createFragmentAndAddResources):
      (WebCore::Editor::createFragmentForImageResourceAndAddResource):
      * platform/Pasteboard.h:
      * platform/PasteboardStrategy.h:
      * platform/PlatformPasteboard.h:
      * platform/ios/PasteboardIOS.mm:
      (WebCore::PasteboardWebContent::PasteboardWebContent):
      (WebCore::PasteboardWebContent::~PasteboardWebContent):
      (WebCore::PasteboardImage::PasteboardImage):
      (WebCore::PasteboardImage::~PasteboardImage):
      (WebCore::Pasteboard::Pasteboard):
      (WebCore::Pasteboard::clear):
      (WebCore::Pasteboard::readString):
      (WebCore::Pasteboard::writeString):
      (WebCore::Pasteboard::types):
      * platform/ios/PlatformPasteboardIOS.mm:
      (WebCore::PlatformPasteboard::changeCount):
      (WebCore::PlatformPasteboard::write):
      (WebCore::PlatformPasteboard::count):
      (WebCore::PlatformPasteboard::readBuffer):
      (WebCore::PlatformPasteboard::readString):
      (WebCore::PlatformPasteboard::readURL):
      * platform/mac/PasteboardMac.mm:
      (WebCore::PasteboardWebContent::PasteboardWebContent):
      (WebCore::PasteboardWebContent::~PasteboardWebContent):
      (WebCore::PasteboardImage::PasteboardImage):
      (WebCore::PasteboardImage::~PasteboardImage):
      * platform/mac/PlatformPasteboardMac.mm:
      
      Source/WebKit/mac: 
      
      * WebCoreSupport/WebPlatformStrategies.h:
      * WebCoreSupport/WebPlatformStrategies.mm:
      (WebPlatformStrategies::writeToPasteboard):
      (WebPlatformStrategies::getPasteboardItemsCount):
      (WebPlatformStrategies::readBufferFromPasteboard):
      (WebPlatformStrategies::readURLFromPasteboard):
      (WebPlatformStrategies::readStringFromPasteboard):
      (WebPlatformStrategies::changeCount):
      
      Source/WebKit2: 
      
      * Shared/WebCoreArgumentCoders.cpp:
      (CoreIPC::decodeSharedBuffer):
      * Shared/WebCoreArgumentCoders.h:
      * UIProcess/WebContext.h:
      * UIProcess/WebContext.messages.in:
      * UIProcess/mac/WebContextMac.mm:
      (WebKit::WebContext::writeWebContentToPasteboard):
      (WebKit::WebContext::writeImageToPasteboard):
      (WebKit::WebContext::writeStringToPasteboard):
      (WebKit::WebContext::readStringFromPasteboard):
      (WebKit::WebContext::readURLFromPasteboard):
      (WebKit::WebContext::readBufferFromPasteboard):
      (WebKit::WebContext::getPasteboardItemsCount):
      * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
      (WebKit::WebPlatformStrategies::writeToPasteboard):
      (WebKit::WebPlatformStrategies::getPasteboardItemsCount):
      (WebKit::WebPlatformStrategies::readBufferFromPasteboard):
      (WebKit::WebPlatformStrategies::readURLFromPasteboard):
      (WebKit::WebPlatformStrategies::readStringFromPasteboard):
      (WebKit::WebPlatformStrategies::changeCount):
      * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156588 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      38848efa
    • roger_fong@apple.com's avatar
      [Windows] Unreviewed build fix following r156560. · 19e5534f
      roger_fong@apple.com authored
      * WebView.h:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156587 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      19e5534f
    • hmuller@adobe.com's avatar
      Crash on shape-outside when using calc() · df9b2640
      hmuller@adobe.com authored
      https://bugs.webkit.org/show_bug.cgi?id=121020
      
      Reviewed by Dirk Schulze.
      
      Source/WebCore:
      
      This change prevents a crash caused by specifying a CSS Shape geometry
      Length attribute with a calc() expression. It adds support for converting
      Lengths to CSSPrimitive Values, in large part by migrating Blink changes
      made to the calc classes since the split. Doing so required a few supporting
      changes in some related classes, notably CSSPrimitiveValue.
      
      Tests: fast/shapes/shape-inside/shape-inside-calc-crash.html
             css3/calc/simplification.html
      
      * css/BasicShapeFunctions.cpp:
      (WebCore::convertToCSSPrimitiveValue): Effectively use the new CSSPrimtiveValue(length,style) constructor to convert Lengths to CSSValues.
      (WebCore::valueForBasicShape): Use the convertToCSSPrimitiveValue() function.
      (WebCore::convertToLength): Added the CalculatedConversion convertToLength() flag to enable support for calc() valued Length Shape attributes.
      * css/BasicShapeFunctions.h:
      * css/CSSCalculationValue.cpp:
      (WebCore::hasDoubleValue):
      (WebCore::buildCssText):
      (WebCore::CSSCalcValue::clampToPermittedRange):
      (WebCore::CSSCalcValue::doubleValue):
      (WebCore::CSSCalcExpressionNode::~CSSCalcExpressionNode):
      (WebCore::CSSCalcPrimitiveValue::create):
      (WebCore::CSSCalcPrimitiveValue::toCalcValue):
      (WebCore::CSSCalcPrimitiveValue::doubleValue):
      (WebCore::CSSCalcPrimitiveValue::computeLengthPx):
      (WebCore::CSSCalcPrimitiveValue::primitiveType):
      (WebCore::CSSCalcPrimitiveValue::CSSCalcPrimitiveValue):
      (WebCore::determineCategory):
      (WebCore::isIntegerResult):
      (WebCore::CSSCalcBinaryOperation::create):
      (WebCore::CSSCalcBinaryOperation::createSimplified):
      (WebCore::CSSCalcBinaryOperation::doubleValue):
      (WebCore::CSSCalcBinaryOperation::buildCssText):
      (WebCore::CSSCalcBinaryOperation::primitiveType):
      (WebCore::CSSCalcBinaryOperation::CSSCalcBinaryOperation):
      (WebCore::CSSCalcBinaryOperation::getNumberSide):
      (WebCore::CSSCalcBinaryOperation::evaluate):
      (WebCore::CSSCalcBinaryOperation::evaluateOperator):
      (WebCore::CSSCalcExpressionNodeParser::parseValue):
      (WebCore::CSSCalcExpressionNodeParser::parseValueTerm):
      (WebCore::CSSCalcExpressionNodeParser::parseValueMultiplicativeExpression):
      (WebCore::CSSCalcExpressionNodeParser::parseAdditiveValueExpression):
      (WebCore::CSSCalcValue::createExpressionNode):
      (WebCore::CSSCalcValue::create):
      * css/CSSCalculationValue.h:
      (WebCore::CSSCalcExpressionNode::category):
      (WebCore::CSSCalcValue::create):
      (WebCore::CSSCalcValue::isInt):
      (WebCore::CSSCalcValue::permittedValueRange):
      (WebCore::CSSCalcValue::expressionNode):
      (WebCore::CSSCalcValue::CSSCalcValue):
      (WebCore::toCSSCalcValue):
      * css/CSSComputedStyleDeclaration.cpp:
      (WebCore::ComputedStyleExtractor::propertyValue): Pass the style along to the new valueForBasicShape() function.
      * css/CSSPrimitiveValue.cpp:
      (WebCore::CSSPrimitiveValue::unitCategory): Made this function public so that CSSCalculationValue could use it.
      (WebCore::CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor): Ditto.
      (WebCore::CSSPrimitiveValue::primitiveType): Cleared trailing whitespace.
      (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Construct a CSSPrimitiveValue from a Length and a RenderStyle*.
      (WebCore::CSSPrimitiveValue::init): The common part of the two Length CSSPrimitiveValue constructors.
      (WebCore::CSSPrimitiveValue::computeLengthDouble): Moved the case labels to the left per check-webkit-style.
      (WebCore::CSSPrimitiveValue::getStringValue): Ditto.
      (WebCore::CSSPrimitiveValue::getDoubleValue): Removed trailing whitespace.
      * css/CSSPrimitiveValue.h:
      (WebCore::CSSPrimitiveValue::create): Construct a CSSPrimitiveValue from a Length and a RenderStyle*.
      (WebCore::toCSSPrimitiveValue): Check the CSSValue*'s validity with ASSERT_WITH_SECURITY_IMPLICATION before casting to CSSPrimitiveValue*.
      * css/CSSValuePool.h:
      (WebCore::CSSValuePool::createValue): A new overload that delegates to the new CSSPrimitiveValue(length,style) constructor.
      * platform/CalculationValue.h:
      (WebCore::CalculationValue::operator==):
      (WebCore::CalculationValue::isNonNegative):
      (WebCore::CalculationValue::expression):
      (WebCore::CalcExpressionNumber::value):
      (WebCore::toCalcExpressionNumber):
      (WebCore::CalcExpressionLength::CalcExpressionLength):
      (WebCore::CalcExpressionLength::length):
      (WebCore::toCalcExpressionLength):
      (WebCore::CalcExpressionBinaryOperation::leftSide):
      (WebCore::CalcExpressionBinaryOperation::rightSide):
      (WebCore::CalcExpressionBinaryOperation::getOperator):
      (WebCore::toCalcExpressionBinaryOperation):
      (WebCore::CalcExpressionBlendLength::CalcExpressionBlendLength):
      (WebCore::CalcExpressionBlendLength::from):
      (WebCore::CalcExpressionBlendLength::to):
      (WebCore::CalcExpressionBlendLength::progress):
      (WebCore::toCalcExpressionBlendLength):
      
      LayoutTests:
      
      Specifying a CSS Shape geometry Length attribute with a calc() expression
      or looking up the value with getComputedStyle(), caused crashes.
      
      * fast/shapes/shape-inside/shape-inside-calc-crash-expected.txt: Added.
      * fast/shapes/shape-inside/shape-inside-calc-crash.html: Added.
      * css3/calc/simplification-expected.txt: Added
      * css3/calc/simplification.html: Added
      * LayoutTests/css3/calc/cssom-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156586 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      df9b2640
    • ap@apple.com's avatar
      Layout Test animations/combo-transform-translate+scale.html is flaky · e7bd69fa
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122040
      
      * platform/mac/TestExpectations: Marking as such.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156585 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      e7bd69fa
    • ap@apple.com's avatar
      Layout Test media/track/track-cue-overlap-snap-to-lines-not-set.html is flaky · 0b041ea2
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122039
      
      * platform/mac/TestExpectations: Marking as such.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156584 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      0b041ea2
    • ap@apple.com's avatar
      animations/transform-non-accelerated.html is flaky · c8b006f9
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122038
      
      * platform/mac/TestExpectations: Marking as such.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156583 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c8b006f9
    • akling@apple.com's avatar
      REGRESSION(r154219): 30% more malloc memory used on html5-full-render. · 8bfe97c6
      akling@apple.com authored
      <https://webkit.org/b/122034>
      
      Reviewed by Antti Koivisto.
      
      canExecuteScripts() used to rely on Frame::settings() returning null
      when the Frame was disconnected from its Page, and giving Frame its
      own handle on the Settings broke this mechanism.
      
      This caused us to hold on for some objects for a bit longer than we
      needed to in the run-perf-tests harness, showing up as a massive 30%
      regression in malloc memory use.
      
      Fixed it by added an explicit null check of Frame::page().
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8bfe97c6
    • alex.christensen@flexsim.com's avatar
      [Windows] Unreviewed build fix. · e1499256
      alex.christensen@flexsim.com authored
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
      Fixed linker symbols I broke last time.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156581 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      e1499256
    • ap@apple.com's avatar
      Updating bindings test results after KURL->URL rename. · d98fed12
      ap@apple.com authored
      Includes were now in the wrong order.
      
      * bindings/scripts/test/CPP/WebDOMTestActiveDOMObject.cpp:
      * bindings/scripts/test/CPP/WebDOMTestCustomNamedGetter.cpp:
      * bindings/scripts/test/CPP/WebDOMTestEventConstructor.cpp:
      * bindings/scripts/test/CPP/WebDOMTestEventTarget.cpp:
      * bindings/scripts/test/CPP/WebDOMTestException.cpp:
      * bindings/scripts/test/CPP/WebDOMTestInterface.cpp:
      * bindings/scripts/test/CPP/WebDOMTestObj.cpp:
      * bindings/scripts/test/CPP/WebDOMTestTypedefs.cpp:
      * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
      * bindings/scripts/test/JS/JSTestException.cpp:
      * bindings/scripts/test/JS/JSTestObj.cpp:
      * bindings/scripts/test/JS/JSTestTypedefs.cpp:
      * bindings/scripts/test/ObjC/DOMTestActiveDOMObject.mm:
      * bindings/scripts/test/ObjC/DOMTestCallback.mm:
      * bindings/scripts/test/ObjC/DOMTestCustomNamedGetter.mm:
      * bindings/scripts/test/ObjC/DOMTestEventConstructor.mm:
      * bindings/scripts/test/ObjC/DOMTestEventTarget.mm:
      * bindings/scripts/test/ObjC/DOMTestException.mm:
      * bindings/scripts/test/ObjC/DOMTestInterface.mm:
      * bindings/scripts/test/ObjC/DOMTestObj.mm:
      * bindings/scripts/test/ObjC/DOMTestTypedefs.mm:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156580 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d98fed12
    • lforschler@apple.com's avatar
      Add supporting logic for r156570. · 808b3bbf
      lforschler@apple.com authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      808b3bbf
    • commit-queue@webkit.org's avatar
      Unreviewed, rolling out r156569. · 16a896f5
      commit-queue@webkit.org authored
      http://trac.webkit.org/changeset/156569
      https://bugs.webkit.org/show_bug.cgi?id=122035
      
      broke a lot of mismatch tests (Requested by thorton on
      #webkit).
      
      Tools:
      
      * WebKitTestRunner/mac/PlatformWebViewMac.mm:
      (WTR::PlatformWebView::PlatformWebView):
      
      LayoutTests:
      
      * platform/mac-wk2/tiled-drawing/window-server-snapshots-work-expected-mismatch.html: Removed.
      * platform/mac-wk2/tiled-drawing/window-server-snapshots-work.html: Removed.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156578 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      16a896f5
    • alex.christensen@flexsim.com's avatar
      [Windows] Unreviewed build fix for Win64. · 27f95ac3
      alex.christensen@flexsim.com authored
      Patch by Alex Christensen <alex.christensen@flexsim.com> on 2013-09-27
      
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
      Added and fixed 64-bit linker symbols.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156577 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      27f95ac3
    • ap@apple.com's avatar
      Layout Test media/video-duration-known-after-eos.html is flaky · 206eaaff
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122033
      
      * platform/mac/TestExpectations: Marked as such.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156576 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      206eaaff
    • commit-queue@webkit.org's avatar
      Get MediaStreamCenterGStreamer compiling again · 1857f563
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=122029
      
      After MediaStream cleanup commit, it was not building anymore.
      
      Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> on 2013-09-27
      Reviewed by Eric Carlson.
      
      No new tests needed.
      
      * platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1857f563
    • commit-queue@webkit.org's avatar
      Storing a reference to MediaStreamTrack in RTCStatsRequest · 13739695
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=122030
      
      Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> on 2013-09-27
      Reviewed by Eric Carlson.
      
      The spec[1] says that the stats is related to a MediaStreamTrack object.
      It also says: "Evaluate the need for other selectors than MediaStreamTrack".
      So a MediaStreamTrack object is more suitable in this case.
      
      [1]http://dev.w3.org/2011/webrtc/editor/webrtc.html#stats-selector
      
      No new tests needed.
      
      * Modules/mediastream/RTCStatsRequestImpl.cpp:
      (WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl):
      (WebCore::RTCStatsRequestImpl::hasSelector):
      (WebCore::RTCStatsRequestImpl::track):
      * Modules/mediastream/RTCStatsRequestImpl.h:
      * platform/mediastream/RTCStatsRequest.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156574 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      13739695
    • ap@apple.com's avatar
      REGRESSION(r156546): 18 media tests broken · d6a00ec4
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122021
      
      * platform/mac/TestExpectations: Adding one more test, media/track/track-cue-rendering-vertical.html
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156573 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d6a00ec4
    • ap@apple.com's avatar
      [Mac] Intermittent crash on media/video-controls-captions-trackmenu.html · d0322770
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=110173
      
      This code got rewritten, and the test now just fails. Fixing and re-enabling it
      is tracked in a different bug.
      
      * platform/mac/TestExpectations: Removing superfluous entry which was confusing the parser.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156572 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d0322770
    • ap@apple.com's avatar
      Don't retry failures on Apple MountainLion Release WK1 tester · 8b75fc10
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122026
      
      Reviewed by Mark Rowe.
      
      * BuildSlaveSupport/build.webkit.org-config/config.json: Added --no-retry-failures
      on this bot.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156571 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8b75fc10
    • ap@apple.com's avatar
      Don't hardcode builder specific configuration in buildbot master.cfg · fc9c320e
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122023
      
      Reviewed by Mark Rowe.
      
      * BuildSlaveSupport/build.webkit.org-config/config.json: Added an additionalArguments
      property to Qt Mountain Lion Release, making it run pixel tests.
      
      * BuildSlaveSupport/build.webkit.org-config/master.cfg:
      (RunWebKitTests.start): Use additionalArguments.
      (RunWebKit2Tests.start): Don't hardcode individual bot behavior here.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156570 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      fc9c320e
    • timothy_horton@apple.com's avatar
      [wk2] WebKitTestRunner's window snapshots are blank with tiled drawing · 64f8a2cd
      timothy_horton@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122006
      <rdar://problem/15095197>
      
      Reviewed by Dean Jackson.
      
      * WebKitTestRunner/mac/PlatformWebViewMac.mm:
      (WTR::PlatformWebView::PlatformWebView):
      Layer-back the root view in WebKitTestRunner's window, to work around a bug
      where the window server snapshot API returns blank snapshots.
      
      Add a test that ensures that WebKitTestRunner's snapshots are not
      completely blank with tiled drawing enabled.
      
      * platform/mac-wk2/tiled-drawing/window-server-snapshots-work-expected-mismatch.html: Added.
      * platform/mac-wk2/tiled-drawing/window-server-snapshots-work.html: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156569 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      64f8a2cd
    • ap@apple.com's avatar
      Layout Test fast/animation/request-animation-frame-time-unit.html is flaky · 08575442
      ap@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122031
      
      * platform/mac/TestExpectations: Marking as such. Dean is going to look into
      related issues soon.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156568 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      08575442
    • commit-queue@webkit.org's avatar
      [Nix] Updating Nix trunk files · b4b8227d
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=121752
      
      Patch by Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> on 2013-09-27
      Reviewed by Benjamin Poulain.
      
      Source/WebCore:
      
      No new tests needed.
      
      * page/nix/EventHandlerNix.cpp:
      (WebCore::EventHandler::focusDocumentView):
      (WebCore::EventHandler::passWheelEventToWidget):
      (WebCore::EventHandler::passMousePressEventToSubframe):
      (WebCore::EventHandler::passMouseMoveEventToSubframe):
      (WebCore::EventHandler::passMouseReleaseEventToSubframe):
      * platform/DragImage.h:
      * platform/graphics/GraphicsContext3D.h:
      * platform/nix/DragImageNix.cpp:
      (WebCore::createDragImageFromImage):
      * platform/nix/GamepadsNix.cpp:
      (WebCore::sampleGamepads):
      * platform/nix/LanguageNix.cpp:
      (WebCore::platformLanguage):
      * platform/nix/LocalizedStringsNix.cpp:
      (WebCore::unacceptableTLSCertificate):
      * platform/nix/PasteboardNix.cpp:
      (WebCore::Pasteboard::types):
      * platform/nix/RenderThemeNix.cpp:
      (WebCore::toColor):
      (WebCore::themeEngine):
      (WebCore::webCanvas):
      (WebCore::getWebThemeState):
      (WebCore::RenderThemeNix::paintButton):
      (WebCore::RenderThemeNix::paintTextField):
      (WebCore::RenderThemeNix::paintCheckbox):
      (WebCore::RenderThemeNix::paintRadio):
      (WebCore::RenderThemeNix::paintMenuList):
      (WebCore::RenderThemeNix::paintProgressBar):
      (WebCore::RenderThemeNix::paintInnerSpinButton):
      (WebCore::RenderThemeNix::paintMeter):
      
      Source/WTF:
      
      * wtf/nix/FeatureDefinesNix.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156567 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      b4b8227d
    • commit-queue@webkit.org's avatar
      [WK2][CoordinatedGraphics] fix build after r156560 · 4a021a11
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=122028
      
      Fixing build.
      
      Patch by Ralph Thomas <ralpht@gmail.com> on 2013-09-27
      Reviewed by Anders Carlsson.
      
      * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp:
      (WebKit::CoordinatedLayerTreeHost::paintLayerContents):
      * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      4a021a11
    • timothy@apple.com's avatar
      Attempt to fix Windows build. · 46197ca1
      timothy@apple.com authored
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156565 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      46197ca1
    • fpizlo@apple.com's avatar
      Deoptimize 32-bit deoptimization · 22958794
      fpizlo@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122025
      
      Reviewed by Oliver Hunt.
              
      Just simplifying a bunch of code. I don't want the old, super-complicated,
      deoptimization code to get in the way of changes I'll be making to DFG stack layout.
      
      * bytecode/ValueRecovery.h:
      (JSC::ValueRecovery::inGPR):
      (JSC::ValueRecovery::isInRegisters):
      (JSC::ValueRecovery::gpr):
      (JSC::ValueRecovery::dumpInContext):
      * dfg/DFGOSRExitCompiler32_64.cpp:
      (JSC::DFG::OSRExitCompiler::compileExit):
      * dfg/DFGOSRExitCompiler64.cpp:
      (JSC::DFG::OSRExitCompiler::compileExit):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      22958794
    • jer.noble@apple.com's avatar
      REGRESSION(r156546): 17 media tests broken · a1489bf8
      jer.noble@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=122021
      
      Unreviewed gardening; add failing tests to TestExpectations while triaging new failures.
      
      * platform/mac/TestExpectations:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156561 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a1489bf8