1. 25 Jan, 2011 40 commits
    • inferno@chromium.org's avatar
      2011-01-25 Cris Neckar <cdn@chromium.org> · 49aa540c
      inferno@chromium.org authored
              Reviewed by Adam Barth.
      
              Test for crash when a window's location changes before creating an object URL.
              https://bugs.webkit.org/show_bug.cgi?id=53038
      
              * fast/dom/window-domurl-crash-expected.txt: Added.
              * fast/dom/window-domurl-crash.html: Added.
      2011-01-25  Cris Neckar  <cdn@chromium.org>
      
              Reviewed by Adam Barth.
      
              Add a hashset of DOMURLs to ScriptExecutionContext to track back references.
              https://bugs.webkit.org/show_bug.cgi?id=53038
      
              Test: fast/dom/window-domurl-crash.html
      
              * dom/ScriptExecutionContext.cpp:
              (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
              (WebCore::ScriptExecutionContext::createdDomUrl):
              (WebCore::ScriptExecutionContext::destroyedDomUrl):
              * dom/ScriptExecutionContext.h:
              (WebCore::ScriptExecutionContext::domUrls):
              * html/DOMURL.cpp:
              (WebCore::DOMURL::DOMURL):
              (WebCore::DOMURL::~DOMURL):
              (WebCore::DOMURL::contextDestroyed):
              * html/DOMURL.h:
              (WebCore::DOMURL::scriptExecutionContext):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76652 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      49aa540c
    • aroben@apple.com's avatar
      Windows Production build fix · 1ef1789e
      aroben@apple.com authored
      Reviewed by Steve Falkenburg.
      
      * JavaScriptCore.vcproj/JavaScriptCore.make: Set BUILDSTYLE to Release_PGO at the very start
      of the file so that ConfigurationBuildDir takes that into account. Also set it the right way
      (by redefining the macro) rather than the wrong way (by modifying the environment variable).
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76650 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1ef1789e
    • andersca@apple.com's avatar
      2011-01-25 Anders Carlsson <andersca@apple.com> · d984e9c6
      andersca@apple.com authored
              Reviewed by Simon Fraser.
      
              Add LayerTreeHost class
              https://bugs.webkit.org/show_bug.cgi?id=53132
      
              * WebKit2.xcodeproj/project.pbxproj:
              Add LayerTreeHost files.
      
              * WebProcess/WebPage/DrawingAreaImpl.cpp:
              (WebKit::DrawingAreaImpl::DrawingAreaImpl):
              Initialize m_layerTreeHost.
      
              (WebKit::DrawingAreaImpl::setRootCompositingLayer):
              Call the m_layerTreeHost.
      
              * WebProcess/WebPage/LayerTreeHost.cpp: Added.
              (WebKit::LayerTreeHost::attachRootCompositingLayer):
              (WebKit::LayerTreeHost::detachRootCompositingLayer):
              Add stubbed out functions.
      
              (WebKit::LayerTreeHost::syncCompositingLayers):
              Sync the compositing layers in the main frame.
      
              * WebProcess/WebPage/LayerTreeHost.h: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76649 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d984e9c6
    • antti@apple.com's avatar
      https://bugs.webkit.org/show_bug.cgi?id=52983 · 3c931302
      antti@apple.com authored
      Eliminate m_tagHistory pointer from CSSSelector
      
      Reviewed by Darin Adler.
      
      Keep the component selectors in the array in CSSSelectorList instead
      of maintaining a linked list between them. This allows eliminating
      m_tagHistory pointer, shrinking CSSSelector by 25% (selection performance
      seems to improve some too due to better locality).
      
      * WebCore.xcodeproj/project.pbxproj:
              
          Make CSSSelector.h a private header.
              
      * css/CSSGrammar.y:
              
          Use CSSParserSelector during parsing to keep the tag history in 
          a linked list. This is flattened to an array after parsing.
          Use accessors for setting selector values.
          Use OwnPtr in selector vector.
                  
      * css/CSSPageRule.cpp:
      (WebCore::CSSPageRule::CSSPageRule):
      * css/CSSPageRule.h:
      (WebCore::CSSPageRule::create):
              
          Simplify.
          
      * css/CSSParser.cpp:
      (WebCore::CSSParser::~CSSParser):
      (WebCore::CSSParser::createFloatingSelector):
      (WebCore::CSSParser::sinkFloatingSelector):
      (WebCore::CSSParser::createStyleRule):
      (WebCore::CSSParser::updateSpecifiersWithElementName):
      (WebCore::CSSParser::createPageRule):
      * css/CSSParser.h:
      (WebCore::CSSParser::reusableSelectorVector):
              
          CSSSelector -> CSSParserSelector.
          Use OwnPtr in selector vector.
                  
      * css/CSSParserValues.cpp:
      (WebCore::CSSParserSelector::CSSParserSelector):
      (WebCore::CSSParserSelector::~CSSParserSelector):
      * css/CSSParserValues.h:
      (WebCore::CSSParserSelector::releaseSelector):
      (WebCore::CSSParserSelector::setTag):
      (WebCore::CSSParserSelector::setValue):
      (WebCore::CSSParserSelector::setAttribute):
      (WebCore::CSSParserSelector::setArgument):
      (WebCore::CSSParserSelector::setSimpleSelector):
      (WebCore::CSSParserSelector::setMatch):
      (WebCore::CSSParserSelector::setRelation):
      (WebCore::CSSParserSelector::setForPage):
      (WebCore::CSSParserSelector::pseudoType):
      (WebCore::CSSParserSelector::isUnknownPseudoElement):
      (WebCore::CSSParserSelector::isSimple):
      (WebCore::CSSParserSelector::tagHistory):
      (WebCore::CSSParserSelector::setTagHistory):
              
          Linked list used during parsing.
          Avoid recursive destruction.
      
      * css/CSSSelector.cpp:
      (WebCore::CSSSelector::extractPseudoType):
      (WebCore::CSSSelector::operator==):
      (WebCore::CSSSelector::selectorText):
      (WebCore::CSSSelector::setSimpleSelector):
      * css/CSSSelector.h:
      (WebCore::CSSSelector::CSSSelector):
      (WebCore::CSSSelector::~CSSSelector):
      (WebCore::CSSSelector::tagHistory):
      (WebCore::CSSSelector::tag):
      (WebCore::CSSSelector::value):
      (WebCore::CSSSelector::setTag):
      (WebCore::CSSSelector::isLastInTagHistory):
      (WebCore::CSSSelector::setNotLastInTagHistory):
      (WebCore::CSSSelector::RareData::RareData):
      (WebCore::CSSSelector::RareData::~RareData):
      (WebCore::CSSSelector::createRareData):
      (WebCore::CSSSelector::setValue):
              
          Remove m_tagHistory.
          Keep m_value in the union with the rare data pointer instead.
          Make m_value and m_tag private, implement accessors.
          Add a new bit to indicate end of the tag history (multipart selector).
          Eliminate complex destruction. Selectors are now deleted as an array or by a CSSParserSelector chain.
                  
      * css/CSSSelectorList.cpp:
      (WebCore::CSSSelectorList::adoptSelectorVector):
              
          Flatten everything to an array.
              
      (WebCore::SelectorNeedsNamespaceResolutionFunctor::operator()):
      * css/CSSSelectorList.h:
      (WebCore::CSSSelectorList::hasOneSelector):
      (WebCore::CSSSelectorList::next):
              
          Skip over the subparts of multipart selectors to find the next selector.
          
      * css/CSSStyleRule.h:
      (WebCore::CSSStyleRule::adoptSelectorVector):
              
          CSSSelector -> CSSParserSelector.
                  
      * css/CSSStyleSelector.cpp:
      (WebCore::CSSStyleSelector::SelectorChecker::checkOneSelector):
      (WebCore::CSSRuleSet::addRule):
      (WebCore::collectIdsAndSiblingRulesFromList):
      (WebCore::CSSStyleSelector::matchPageRulesForList):
      * dom/Node.cpp:
      (WebCore::Node::querySelector):
      * dom/SelectorNodeList.cpp:
      (WebCore::createSelectorNodeList):
              
          Use accessors.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      3c931302
    • commit-queue@webkit.org's avatar
      2011-01-25 Mansi Mithal <mansi.mithal@nokia.com> · 13aa0664
      commit-queue@webkit.org authored
              Reviewed by Antonio Gomes.
      
              QtTestBrowser should have a UI Settings to prevent loading images
              https://bugs.webkit.org/show_bug.cgi?id=52409
      
              Added a new action item named "DisableAutoLoadImages"
              under the "Settings" menu
      
              * QtTestBrowser/launcherwindow.cpp:
              (LauncherWindow::createChrome):
              (LauncherWindow::toggleAutoLoadImages):
              * QtTestBrowser/launcherwindow.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76646 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      13aa0664
    • simonjam@chromium.org's avatar
      2011-01-25 James Simonsen <simonjam@chromium.org> · 7b4c22ba
      simonjam@chromium.org authored
              Reviewed by Tony Chang.
      
              [Chromium] Support small caps in complex text on linux
              https://bugs.webkit.org/show_bug.cgi?id=53051
      
              * platform/chromium-linux/fast/text/atsui-multiple-renderers-expected.checksum: Added.
              * platform/chromium-linux/fast/text/atsui-multiple-renderers-expected.png: Added.
              * platform/chromium-linux/fast/text/atsui-multiple-renderers-expected.txt: Added.
              * platform/chromium-linux/fast/text/atsui-small-caps-punctuation-size-expected.checksum: Added.
              * platform/chromium-linux/fast/text/atsui-small-caps-punctuation-size-expected.png: Added.
              * platform/chromium/test_expectations.txt: Re-enable 2 tests on linux.
      2011-01-25  James Simonsen  <simonjam@chromium.org>
      
              Reviewed by Tony Chang.
      
              [Chromium] Support small caps in complex text on linux
              https://bugs.webkit.org/show_bug.cgi?id=53051
      
              * platform/graphics/chromium/ComplexTextControllerLinux.cpp:
              (WebCore::ComplexTextController::nextScriptRun): Break runs at small caps boundaries.
              (WebCore::ComplexTextController::setupFontForScriptRun): Setup small caps font data if needed.
              * platform/graphics/chromium/ComplexTextControllerLinux.h: Store small caps text in separate string.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76644 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7b4c22ba
    • dpranke@chromium.org's avatar
      2011-01-25 Dirk Pranke <dpranke@chromium.org> · 35fc8141
      dpranke@chromium.org authored
              Reviewed by Tony Chang.
      
              Minor bug fixes and cleanup for filesystem wrappers, port/* test
              classes, test_expectations.py. This change adds "test-win" and
              "test-mac" variants to the test port so that we can better test
              rebaselining, and adds a MockUser() object for reuse in testing.
      
              https://bugs.webkit.org/show_bug.cgi?id=53036
      
              * Scripts/webkitpy/common/system/filesystem.py:
              * Scripts/webkitpy/common/system/filesystem_mock.py:
              * Scripts/webkitpy/layout_tests/layout_package/test_expectations.py:
              * Scripts/webkitpy/layout_tests/port/factory.py:
              * Scripts/webkitpy/layout_tests/port/base.py:
              * Scripts/webkitpy/layout_tests/port/test.py:
              * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
              * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py:
              * Scripts/webkitpy/tool/mocktool.py:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76642 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      35fc8141
    • jer.noble@apple.com's avatar
      Unreviewed build fix: add failing test to gtk/Skipped. · 091627d6
      jer.noble@apple.com authored
      * platform/gtk/Skipped:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76640 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      091627d6
    • sfalken@apple.com's avatar
      Windows production build fix. · 0d9eec91
      sfalken@apple.com authored
      Use correct environment variable escaping
      
      Rubber-stamped by Adam Roben.
      
      Source/JavaScriptCore: 
      
      * JavaScriptCore.vcproj/JavaScriptCore.make:
      * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
      
      Source/WebCore: 
      
      * WebCore.vcproj/WebCore.make:
      
      Source/WebKit/win: 
      
      * WebKit.vcproj/WebKit.make:
      
      Source/WebKit2: 
      
      * win/WebKit2.make:
      * win/WebKit2Generated.make:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76638 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      0d9eec91
    • abarth@webkit.org's avatar
      2011-01-25 Adam Barth <abarth@webkit.org> · d7652e8b
      abarth@webkit.org authored
              Reviewed by Eric Seidel.
      
              Empty URLs are never display isolated
              https://bugs.webkit.org/show_bug.cgi?id=53053
      
              This check mirrors the check in the local case.  There isn't a good way
              to test this with a LayoutTest, but it is tested in Chromium (where
              this registry is used).
      
              * platform/SchemeRegistry.cpp:
              (WebCore::SchemeRegistry::shouldTreatURLSchemeAsDisplayIsolated):
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76637 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d7652e8b
    • weinig@apple.com's avatar
      2011-01-25 Sam Weinig <sam@webkit.org> · cb7e49f9
      weinig@apple.com authored
              Reviewed by Anders Carlsson.
      
              Pipe a timestamp down into the PlatformWheelEvent for the Mac.
              https://bugs.webkit.org/show_bug.cgi?id=53111
      
              * platform/PlatformWheelEvent.h:
              (WebCore::PlatformWheelEvent::PlatformWheelEvent):
              (WebCore::PlatformWheelEvent::timestamp):
              Add timestamp member.
      
              * platform/mac/WheelEventMac.mm:
              (WebCore::PlatformWheelEvent::PlatformWheelEvent):
              Initialize the timestamp from the event.
      2011-01-25  Anders Carlsson  <andersca@apple.com>
      
              Reviewed by Sam Weinig.
      
              Don't inform the UI process about compositing changes when using the new drawing area
              https://bugs.webkit.org/show_bug.cgi?id=53120
      
              * WebProcess/WebPage/WebPage.cpp:
              (WebKit::WebPage::changeAcceleratedCompositingMode):
              Return early if we're using the new drawing area.
      
              (WebKit::WebPage::exitAcceleratedCompositingMode):
              Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76636 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      cb7e49f9
    • oliver@apple.com's avatar
      2011-01-25 Oliver Hunt <oliver@apple.com> · f60aec77
      oliver@apple.com authored
              Reviewed by Gavin Barraclough.
      
              JSON.stringify processing time exponentially grows with size of object
              https://bugs.webkit.org/show_bug.cgi?id=51922
      
              Remove last use of reserveCapacity from JSON stringification, as it results
              in appalling append behaviour when there are a large number of property names
              and nothing else.
      
              * runtime/JSONObject.cpp:
              (JSC::Stringifier::appendQuotedString):
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      f60aec77
    • andersca@apple.com's avatar
      2011-01-25 Anders Carlsson <andersca@apple.com> · 5fa7162f
      andersca@apple.com authored
              Reviewed by Sam Weinig.
      
              Don't inform the UI process about compositing changes when using the new drawing area
              https://bugs.webkit.org/show_bug.cgi?id=53120
      
              * WebProcess/WebPage/WebPage.cpp:
              (WebKit::WebPage::changeAcceleratedCompositingMode):
              Return early if we're using the new drawing area.
      
              (WebKit::WebPage::exitAcceleratedCompositingMode):
              Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76634 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5fa7162f
    • rniwa@webkit.org's avatar
      2011-01-25 Sheriff Bot <webkit.review.bot@gmail.com> · 7f5f5294
      rniwa@webkit.org authored
              Unreviewed, rolling out r76625.
              http://trac.webkit.org/changeset/76625
              https://bugs.webkit.org/show_bug.cgi?id=53119
      
              "incorrect pixel test results" (Requested by rniwa on
              #webkit).
      
              * rendering/RenderBox.cpp:
              (WebCore::RenderBox::localCaretRect):
      2011-01-25  Sheriff Bot  <webkit.review.bot@gmail.com>
      
              Unreviewed, rolling out r76625.
              http://trac.webkit.org/changeset/76625
              https://bugs.webkit.org/show_bug.cgi?id=53119
      
              "incorrect pixel test results" (Requested by rniwa on
              #webkit).
      
              * editing/selection/caret-painting-after-paste-undo-rtl.html: Removed.
              * editing/selection/caret-painting-after-paste-undo.html: Removed.
              * platform/mac/editing/deleting/5408255-expected.checksum:
              * platform/mac/editing/deleting/5408255-expected.png:
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Removed.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Removed.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Removed.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Removed.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Removed.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Removed.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76633 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7f5f5294
    • tony@chromium.org's avatar
      2011-01-25 Tony Chang <tony@chromium.org> · 28f2b0ab
      tony@chromium.org authored
              Unreviewed, debugger-scripts.html is failing on windows too.
      
              * platform/chromium/test_expectations.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76632 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      28f2b0ab
    • dimich@chromium.org's avatar
      [Chromium] Not reviewed, rebaseline for a test. · e762199b
      dimich@chromium.org authored
      The difference is because V8 has different error messages.
      
      * platform/chromium-mac/fast/js/js-continue-break-restrictions-expected.txt: Added.
      * platform/chromium-win/fast/js/js-continue-break-restrictions-expected.txt: Added.
      * platform/chromium/test_expectations.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76631 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      e762199b
    • jamesr@google.com's avatar
      2011-01-25 James Robinson <jamesr@chromium.org> · 5b5f0c3f
      jamesr@google.com authored
              Remove = TEXT PASS lines for tests that consistently pass.
      
              * platform/chromium/test_expectations.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5b5f0c3f
    • paroga@webkit.org's avatar
      2011-01-25 Patrick Gansterer <paroga@webkit.org> · 5e2d3026
      paroga@webkit.org authored
              Reviewed by Adam Roben.
      
              [WINCE] Ensure layouted frame when painting
              https://bugs.webkit.org/show_bug.cgi?id=53108
      
              * WebView.cpp:
              (WebView::paint):
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5e2d3026
    • jer.noble@apple.com's avatar
      Unreviewed build fix: rollback untintentional changes in media expected results. · 250c1b31
      jer.noble@apple.com authored
      * media/video-source-moved-expected.txt:
      * media/video-source-none-supported-expected.txt:
      * LayoutTests/platform/win/media/audio-data-url-expected.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      250c1b31
    • tony@chromium.org's avatar
      2011-01-25 Tony Chang <tony@chromium.org> · c042d8e9
      tony@chromium.org authored
              Unreviewed, mark inspector/debugger-scripts.html as failing on chromium linux.
      
              * platform/chromium/test_expectations.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76627 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c042d8e9
    • paroga@webkit.org's avatar
      2011-01-25 Patrick Gansterer <paroga@webkit.org> · b41e33e3
      paroga@webkit.org authored
              Unreviewed WinCE build fix for r76614.
      
              * platform/FileSystem.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76626 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      b41e33e3
    • leviw@chromium.org's avatar
      2011-01-21 Levi Weintraub <leviw@chromium.org> · 2ea38bbf
      leviw@chromium.org authored
              Reviewed by Darin Adler.
      
              Adding border and padding to the calculation of the local caret rect for RenderBoxes.
      
              Undo moves caret to invalid position
              https://bugs.webkit.org/show_bug.cgi?id=49744
      
              Tests: editing/selection/caret-painting-after-paste-undo-rtl.html
                     editing/selection/caret-painting-after-paste-undo.html
      
              * rendering/RenderBox.cpp:
              (WebCore::RenderBox::localCaretRect):
      2011-01-21  Levi Weintraub  <leviw@chromium.org>
      
              Reviewed by Darin Adler.
      
              Updating the expected result for 5408255 and adding tests for caret positioning at the
              beginning and end of RenderBoxes.
      
              Undo moves caret to invalid position
              https://bugs.webkit.org/show_bug.cgi?id=49744
      
              * editing/selection/caret-painting-after-paste-undo-rtl.html: Added.
              * editing/selection/caret-painting-after-paste-undo.html: Added.
              * platform/mac/editing/deleting/5408255-expected.checksum:
              * platform/mac/editing/deleting/5408255-expected.png:
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.checksum: Added.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.png: Added.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-expected.txt: Added.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.checksum: Added.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.png: Added.
              * platform/mac/editing/selection/caret-painting-after-paste-undo-rtl-expected.txt: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76625 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      2ea38bbf
    • tony@chromium.org's avatar
      2011-01-25 Tony Chang <tony@chromium.org> · 6ab872d3
      tony@chromium.org authored
              Unreviewed, add chromium-mac baselines after r76599.
      
              The platform/mac-leopard results were stale which is why the expected
              text results aren't updated as well.
      
              * platform/chromium-mac/svg/custom/junk-data-expected.checksum: Added.
              * platform/chromium-mac/svg/custom/junk-data-expected.png: Added.
              * platform/chromium-mac/svg/custom/missing-xlink-expected.checksum: Added.
              * platform/chromium-mac/svg/custom/missing-xlink-expected.png: Added.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76624 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      6ab872d3
    • jamesr@google.com's avatar
      2011-01-25 James Robinson <jamesr@chromium.org> · 096902d9
      jamesr@google.com authored
              Reviewed by Mihai Parparita.
      
              Convert requestAnimationFrame tests to be script-tests
              https://bugs.webkit.org/show_bug.cgi?id=53109
      
              This converts the new requestAnimationFrame tests to be proper script-tests using make-script-test-wrapper.
      
              * fast/animation/request-animation-frame-cancel-expected.txt:
              * fast/animation/request-animation-frame-cancel.html:
              * fast/animation/request-animation-frame-cancel2-expected.txt:
              * fast/animation/request-animation-frame-cancel2.html:
              * fast/animation/request-animation-frame-display-expected.txt:
              * fast/animation/request-animation-frame-display.html:
              * fast/animation/request-animation-frame-expected.txt:
              * fast/animation/request-animation-frame-within-callback-expected.txt:
              * fast/animation/request-animation-frame-within-callback.html:
              * fast/animation/request-animation-frame.html:
              * fast/animation/script-tests/TEMPLATE.html: Added.
              * fast/animation/script-tests/request-animation-frame-cancel.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel.html.
              * fast/animation/script-tests/request-animation-frame-cancel2.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel2.html.
              (secondCallbackId):
              * fast/animation/script-tests/request-animation-frame-display.js: Added.
              * fast/animation/script-tests/request-animation-frame-within-callback.js: Copied from LayoutTests/fast/animation/request-animation-frame-within-callback.html.
              (window):
              * fast/animation/script-tests/request-animation-frame.js: Added.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      096902d9
    • weinig@apple.com's avatar
      2011-01-25 Sam Weinig <sam@webkit.org> · 7e6de6b9
      weinig@apple.com authored
              Reviewed by Anders Carlsson.
      
              Add hasPreciseScrollingDeltas bit to PlatformWheelEvent on the Mac.
              https://bugs.webkit.org/show_bug.cgi?id=53107
      
              * platform/PlatformWheelEvent.h:
              (WebCore::PlatformWheelEvent::PlatformWheelEvent):
              (WebCore::PlatformWheelEvent::hasPreciseScrollingDeltas):
              * platform/mac/WheelEventMac.mm:
              (WebCore::PlatformWheelEvent::PlatformWheelEvent):
      2011-01-25  Sam Weinig  <sam@webkit.org>
      
              Reviewed by Anders Carlsson.
      
              Add hasPreciseScrollingDeltas bit to PlatformWheelEvent on the Mac.
              https://bugs.webkit.org/show_bug.cgi?id=53107
      
              * Shared/WebEvent.h:
              (WebKit::WebWheelEvent::hasPreciseScrollingDeltas):
              * Shared/WebEventConversion.cpp:
              (WebKit::WebKit2PlatformWheelEvent::WebKit2PlatformWheelEvent):
              * Shared/WebWheelEvent.cpp:
              (WebKit::WebWheelEvent::WebWheelEvent):
              * Shared/mac/WebEventFactory.mm:
              (WebKit::WebEventFactory::createWebWheelEvent):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76622 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7e6de6b9
    • jer.noble@apple.com's avatar
      2011-01-20 Jer Noble <jer.noble@apple.com> · 1a9f042d
      jer.noble@apple.com authored
              Reviewed by Eric Carlson.
      
              REGRESSION (r72119): Audio never plays on Star Wars intro animation
              https://bugs.webkit.org/show_bug.cgi?id=52467
      
              Test the ability to read audio/m4a files.  Disabled this new test
              on the chromium and qt platforms, as they do not support M4A/AAC.
      
              * media/audio-mpeg4-supported-expected.txt: Added.
              * media/audio-mpeg4-supported.html: Added.
              * media/content/silence.m4a: Added.
              * platform/chromium/test_expectations.txt:
              * platform/qt/Skipped:
      2011-01-20  Jer Noble  <jer.noble@apple.com>
      
              Reviewed by Eric Carlson.
      
              REGRESSION (r72119): Audio never plays on Star Wars intro animation
              https://bugs.webkit.org/show_bug.cgi?id=52467
      
              QuickTime's eat/m4a movie importer compontent doesn't list audio/m4a as a mime
              type which it supports, though it handles .m4a files just fine.  Change the way
              we build the list of supported MIME Types through a new WebKitSystemInterface
              function.
      
              Caused by r72119, which adds system-specific extension->MIME entries to the cache
              before global entries, and the system-specific entries include QuickTime's registry
              entries which contain the audio/m4a MIME type, while its components do not.
      
              Test: media/audio-mpeg4-supported.html
      
              * WebCore.vcproj/QTMovieWinCommon.vsprops:
              * platform/graphics/win/QTMovie.cpp:
              (getMIMETypeCallBack):
              (initializeSupportedTypes):
              (QTMovie::countSupportedTypes): gSupportedTypes is now a CFArrayRef.
              (QTMovie::getSupportedType): Ditto.
      2011-01-24  Jer Noble  <jer.noble@apple.com>
      
              Reviewed by Eric Carlson.
      
              REGRESSION (r72119): Audio never plays on Star Wars intro animation
              https://bugs.webkit.org/show_bug.cgi?id=52467
      
              Add wkGetQuickTimeMIMETypeList() function.
      
              * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
              * win/lib/WebKitSystemInterface.lib:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76621 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1a9f042d
    • tony@chromium.org's avatar
      2011-01-25 Tony Chang <tony@chromium.org> · 12de08e1
      tony@chromium.org authored
              Reviewed by Dimitri Glazkov.
      
              [chromium] remove unused layoutTestController callback
              https://bugs.webkit.org/show_bug.cgi?id=53103
      
              This method is used by a test_shell_test, but not needed by DRT.
      
              * DumpRenderTree/chromium/LayoutTestController.cpp:
              (LayoutTestController::LayoutTestController):
              * DumpRenderTree/chromium/LayoutTestController.h:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76620 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      12de08e1
    • tony@chromium.org's avatar
      2011-01-25 Tony Chang <tony@chromium.org> · 3c4f0e8f
      tony@chromium.org authored
              Unreviewed, rebaseline a test on chromium-win.  Part of r76586 rebaselines.
      
              * platform/chromium-win/svg/custom/svg-fonts-in-html-expected.checksum:
              * platform/chromium-win/svg/custom/svg-fonts-in-html-expected.png:
              * platform/chromium-win/svg/custom/svg-fonts-in-html-expected.txt:
              * platform/chromium/test_expectations.txt:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      3c4f0e8f
    • rniwa@webkit.org's avatar
      2011-01-25 Ryosuke Niwa <rniwa@webkit.org> · d390cd78
      rniwa@webkit.org authored
              Another unreviewed SVG rebaselines for Chromium.
      
              * platform/chromium-linux/svg/text/text-text-05-t-expected.checksum:
              * platform/chromium-linux/svg/text/text-text-05-t-expected.png:
              * platform/chromium-mac/svg/text/text-text-05-t-expected.checksum:
              * platform/chromium-mac/svg/text/text-text-05-t-expected.png:
              * platform/chromium-win/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt:
              * platform/chromium-win/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt:
              * platform/chromium-win/svg/text/text-text-05-t-expected.checksum:
              * platform/chromium-win/svg/text/text-text-05-t-expected.png:
              * platform/chromium-win/svg/text/text-text-05-t-expected.txt:
              * platform/chromium/test_expectations.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76618 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d390cd78
    • andersca@apple.com's avatar
      2011-01-25 Anders Carlsson <andersca@apple.com> · 53f88810
      andersca@apple.com authored
              Reviewed by Sam Weinig.
      
              need a way to request the host CALayer render server port
              https://bugs.webkit.org/show_bug.cgi?id=53101
              <rdar://problem/8913620>
      
              * PluginProcess/PluginControllerProxy.cpp:
              (WebKit::PluginControllerProxy::compositingRenderServerPort):
              Get the render server port from the plug-in process.
      
              * PluginProcess/PluginControllerProxy.h:
              * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
              (WebKit::NPN_GetValue):
              Call NetscapePlugin::compositingRenderServerPort.
      
              * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
              (WebKit::NetscapePlugin::compositingRenderServerPort):
              Call PluginController::compositingRenderServerPort.
      
              * WebProcess/Plugins/PluginView.cpp:
              (WebKit::PluginView::compositingRenderServerPort):
              Get the render server port from the web process.
      
              * WebProcess/Plugins/PluginView.h:
              Add compositingRenderServerPort.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76617 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      53f88810
    • hans@chromium.org's avatar
      2011-01-25 Hans Wennborg <hans@chromium.org> · d10d6685
      hans@chromium.org authored
              Reviewed by Jeremy Orlow.
      
              IndexedDB: Remove PlatformBridge::idbShutdown()
              https://bugs.webkit.org/show_bug.cgi?id=53077
      
              Since Chromium r72157, this is not used anymore. The previous use was
              to signal to the embedder that IndexedDB was shutting down, but we
              agreed it is better if the embedder keeps track of that itself.
      
              No new tests: this does not change any functionality.
      
              * platform/chromium/PlatformBridge.h:
              * storage/IDBFactoryBackendInterface.cpp:
              * storage/IDBFactoryBackendInterface.h:
              (WebCore::IDBFactoryBackendInterface::~IDBFactoryBackendInterface):
              * storage/chromium/IDBFactoryBackendInterface.cpp:
      2011-01-25  Hans Wennborg  <hans@chromium.org>
      
              Reviewed by Jeremy Orlow.
      
              IndexedDB: Remove PlatformBridge::idbShutdown()
              https://bugs.webkit.org/show_bug.cgi?id=53077
      
              Since Chromium r72157, this is not used anymore. Chromium keeps track
              of when it shuts down IndexedDB itself.
      
              * public/WebKitClient.h:
              * src/PlatformBridge.cpp:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76616 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d10d6685
    • antti@apple.com's avatar
      Not reviewed. · 72ef29bb
      antti@apple.com authored
              
      Try to fix windows build.
      
      * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76615 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      72ef29bb
    • darin@apple.com's avatar
      2011-01-25 Darin Adler <darin@apple.com> · c58ff503
      darin@apple.com authored
              Reviewed by Anders Carlsson.
      
              WebKit is using CSBackupSetItemExcluded incorrectly
              https://bugs.webkit.org/show_bug.cgi?id=53095
              rdar://problem/8790540
      
              * Misc/WebIconDatabase.mm:
              (importToWebCoreFormat): Removed code that was calling CSBackupSetItemExcluded.
              It was incorrect, and this responsibility has been moved to WebCore.
      2011-01-25  Darin Adler  <darin@apple.com>
      
              Reviewed by Anders Carlsson.
      
              WebKit is using CSBackupSetItemExcluded incorrectly
              https://bugs.webkit.org/show_bug.cgi?id=53095
              rdar://problem/8790540
      
              * loader/icon/IconDatabase.cpp:
              (WebCore::IconDatabase::performOpenInitialization): Added code to
              exclude the database from backup one time, and record inside the
              database that this has been done.
              (WebCore::IconDatabase::wasExcludedFromBackup): Added.
              (WebCore::IconDatabase::setWasExcludedFromBackup): Added.
              * loader/icon/IconDatabase.h: Added new functions above.
      
              * platform/FileSystem.cpp:
              (WebCore::canExcludeFromBackup): Added.
              (WebCore::excludeFromBackup): Added.
      
              * platform/FileSystem.h: Added canExcludeFromBackup, excludeFromBackup,
              and pathAsURL functions. Cleaned up ifdefs and comments a bit and sorted
              things alphabetically, particularly platform-specific sections.
      
              * platform/cf/FileSystemCF.cpp:
              (WebCore::pathAsURL): Added.
      
              * platform/mac/FileSystemMac.mm:
              (WebCore::canExcludeFromBackup): Added.
              (WebCore::excludeFromBackup): Added.
      
              * platform/network/cf/FormDataStreamCFNet.cpp:
              (WebCore::advanceCurrentStream): Changed to call pathAsURL.
              * platform/network/mac/FormDataStreamMac.mm:
              (WebCore::advanceCurrentStream): Ditto.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76614 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c58ff503
    • mjs@apple.com's avatar
      2011-01-25 Maciej Stachowiak <mjs@apple.com> · 1c65d548
      mjs@apple.com authored
              Reviewed by Darin Adler.
      
              Skip another new test that uses eventSender
              https://bugs.webkit.org/show_bug.cgi?id=53094
      
              * platform/mac-wk2/Skipped:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76613 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1c65d548
    • commit-queue@webkit.org's avatar
      2011-01-25 Helder Correia <helder@sencha.com> · 7c90805c
      commit-queue@webkit.org authored
              Reviewed by Dirk Schulze.
      
              REGRESSION(75139): SVG gradients are not applied to texts
              https://bugs.webkit.org/show_bug.cgi?id=52531
      
              CGContextConcatCTM should use the CGLayer context, not the
              GraphicsContext. Also, the CTM needs to be adjusted (translated).
              This fixes SVG text gradient fill.
      
              Test: svg/css/composite-shadow-text.svg
      
              * platform/graphics/cg/GraphicsContextCG.cpp:
              (WebCore::GraphicsContext::fillRect):
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76612 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7c90805c
    • antti@apple.com's avatar
      REGRESSION: Leak in JSParser::Scope::copyCapturedVariablesToVector() · be333a79
      antti@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=53061
               
      Reviewed by Oliver Hunt.
      
      Cache did not know about the subclass so failed to fully delete the items. 
      Got rid of the subclass and moved the classes to separate files.
      
      * CMakeLists.txt:
      * GNUmakefile.am:
      * JavaScriptCore.exp:
      * JavaScriptCore.gypi:
      * JavaScriptCore.pro:
      * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
      * JavaScriptCore.xcodeproj/project.pbxproj:
      * parser/JSParser.cpp:
      (JSC::JSParser::Scope::saveFunctionInfo):
      (JSC::JSParser::Scope::restoreFunctionInfo):
      (JSC::JSParser::findCachedFunctionInfo):
      (JSC::JSParser::parseFunctionInfo):
      * parser/SourceProvider.h:
      * parser/SourceProviderCache.cpp: Added.
      (JSC::SourceProviderCache::~SourceProviderCache):
      (JSC::SourceProviderCache::byteSize):
      * parser/SourceProviderCache.h: Added.
      (JSC::SourceProviderCache::SourceProviderCache):
      (JSC::SourceProviderCache::add):
      (JSC::SourceProviderCache::get):
      * parser/SourceProviderCacheItem.h: Added.
      (JSC::SourceProviderCacheItem::SourceProviderCacheItem):
      (JSC::SourceProviderCacheItem::approximateByteSize):
      (JSC::SourceProviderCacheItem::closeBraceToken):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76611 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      be333a79
    • commit-queue@webkit.org's avatar
      2011-01-25 Benjamin Kalman <kalman@chromium.org> · 8043268f
      commit-queue@webkit.org authored
              Reviewed by Ryosuke Niwa.
      
              Cannot extend or modify forward by word over a non-contenteditable region
              https://bugs.webkit.org/show_bug.cgi?id=53070
      
              Add regression test.
      
              * editing/selection/extend-forward-by-word-over-non-editable-expected.txt: Added.
              * editing/selection/extend-forward-by-word-over-non-editable.html: Added.
      2011-01-25  Benjamin Kalman  <kalman@chromium.org>
      
              Reviewed by Ryosuke Niwa.
      
              Cannot extend or modify forward by word over a non-contenteditable region
              https://bugs.webkit.org/show_bug.cgi?id=53070
      
              Test: editing/selection/extend-forward-by-word-over-non-editable.html
      
              Change all instances of honorEditableBoundaryAtOrAfter to honorEditableBoundaryAtOrBefore and vice versa in the
              functions which determine the end/start of words/lines/sentences in visible_units.cpp.
      
              This fixes the bug where moving forwards by a word over a non-contenteditable region would place the cursor
              inside that region, and then get moved back to the start of the word due to honorEditableBoundaryAtOrBefore.
              The cursor is now moved to the end of the region (which is effectively a noop in this case).
      
              * editing/visible_units.cpp: Change all instances of honorEditableBoundaryAtOrAfter to
              honorEditableBoundaryAtOrBefore and vice versa.
              (WebCore::previousWordPosition):
              (WebCore::nextWordPosition):
              (WebCore::startOfLine):
              (WebCore::endOfLine):
              (WebCore::previousSentencePosition):
              (WebCore::nextSentencePosition):
              (WebCore::logicalStartOfLine):
              (WebCore::logicalEndOfLine):
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76610 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8043268f
    • commit-queue@webkit.org's avatar
      2011-01-25 Marcilio Mendonca <mamendonca@rim.com> · a14c73d5
      commit-queue@webkit.org authored
              Reviewed by Darin Adler.
      
              Bug 53087: Refactoring: replaced a hanging "else" with a "return"
              statement
              https://bugs.webkit.org/show_bug.cgi?id=53087.
      
              Refactoring work: Replaced a hanging "else" within an #if PLATFORM(M
              with a "return" so that the code is more readable and less error pro
              (e.g., "else" doesn't use braces so adding extra lines to the else
              block won't have any effect; even worse, code still compiles
              successfully.
      
              * wtf/Assertions.cpp:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a14c73d5
    • mjs@apple.com's avatar
      Change some floating point constants from 1.0 to 1. · 7038ef52
      mjs@apple.com authored
      Rubber stamped by Dan Bernstein.
      
      * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
      (WebKit::WebFrameLoaderClient::dispatchDidCommitLoad):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76608 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7038ef52
    • rniwa@webkit.org's avatar
      2011-01-25 Ryosuke Niwa <rniwa@webkit.org> · b95d09b6
      rniwa@webkit.org authored
              Unreviewed SVG rebaselines for Chromium.
      
              * platform/chromium-linux/svg/batik/text/textEffect-expected.checksum:
              * platform/chromium-linux/svg/batik/text/textEffect-expected.png:
              * platform/chromium-linux/svg/batik/text/textEffect-expected.txt: Removed.
              * platform/chromium-linux/svg/batik/text/textEffect3-expected.checksum:
              * platform/chromium-linux/svg/batik/text/textEffect3-expected.png:
              * platform/chromium-linux/svg/batik/text/textEffect3-expected.txt: Removed.
              * platform/chromium-linux/svg/batik/text/textPosition2-expected.txt:
              * platform/chromium-linux/svg/custom/svg-fonts-in-html-expected.checksum:
              * platform/chromium-linux/svg/custom/svg-fonts-in-html-expected.png:
              * platform/chromium-linux/svg/custom/svg-fonts-in-html-expected.txt: Added.
              * platform/chromium-linux/svg/custom/svg-fonts-with-no-element-reference-expected.checksum:
              * platform/chromium-linux/svg/custom/svg-fonts-with-no-element-reference-expected.png:
              * platform/chromium-linux/svg/custom/svg-fonts-without-missing-glyph-expected.checksum:
              * platform/chromium-linux/svg/custom/svg-fonts-without-missing-glyph-expected.png:
              * platform/chromium-linux/svg/text/text-text-06-t-expected.checksum:
              * platform/chromium-linux/svg/text/text-text-06-t-expected.png:
              * platform/chromium-mac/svg/custom/svg-fonts-in-html-expected.checksum:
              * platform/chromium-mac/svg/custom/svg-fonts-in-html-expected.png:
              * platform/chromium-mac/svg/text/text-text-06-t-expected.checksum:
              * platform/chromium-mac/svg/text/text-text-06-t-expected.png: Added.
              * platform/chromium-win/svg/W3C-SVG-1.1/fonts-kern-01-t-expected.txt:
              * platform/chromium-win/svg/W3C-SVG-1.1/text-text-05-t-expected.txt:
              * platform/chromium-win/svg/W3C-SVG-1.1/text-text-06-t-expected.txt:
              * platform/chromium-win/svg/batik/text/textEffect-expected.checksum:
              * platform/chromium-win/svg/batik/text/textEffect-expected.png:
              * platform/chromium-win/svg/batik/text/textEffect-expected.txt:
              * platform/chromium-win/svg/batik/text/textEffect3-expected.checksum:
              * platform/chromium-win/svg/batik/text/textEffect3-expected.png:
              * platform/chromium-win/svg/batik/text/textEffect3-expected.txt:
              * platform/chromium-win/svg/batik/text/textPosition2-expected.txt:
              * platform/chromium-win/svg/custom/svg-fonts-with-no-element-reference-expected.checksum:
              * platform/chromium-win/svg/custom/svg-fonts-with-no-element-reference-expected.png:
              * platform/chromium-win/svg/custom/svg-fonts-without-missing-glyph-expected.checksum:
              * platform/chromium-win/svg/custom/svg-fonts-without-missing-glyph-expected.png:
              * platform/chromium-win/svg/custom/svg-fonts-without-missing-glyph-expected.txt:
              * platform/chromium-win/svg/text/text-text-06-t-expected.checksum:
              * platform/chromium-win/svg/text/text-text-06-t-expected.png:
              * platform/chromium-win/svg/text/text-text-06-t-expected.txt:
              * platform/chromium/test_expectations.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76607 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      b95d09b6