1. 20 Mar, 2013 40 commits
    • bfulgham@webkit.org's avatar
      ../ThirdParty: [WinCairo] Build WinCairo port under VS2010. · 89fa3334
      bfulgham@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112861
      
      Reviewed by Tim Horton.
      
      * gtest/msvc/gtest-md.vcxproj: Add WinCairo targets.
      
      ../WebKit: [WinCairo] Top-level solution change to build under VS2010.
      https://bugs.webkit.org/show_bug.cgi?id=112861.
      
      Reviewed by Tim Horton.
      
      * WebKit.vcxproj/WebKit.sln: Add final set of WinCairo build
      targets.
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
      Add #if/def guards around some media-specific exports that
      are not provided by the WinCairo port.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146422 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      89fa3334
    • pkasting@chromium.org's avatar
      [chromium] Update test expectations to more closely match reality. · 53d8f80b
      pkasting@chromium.org authored
      https://bugs.webkit.org/show_bug.cgi?id=106609
      https://code.google.com/p/chromium/issues/detail?id=222140
      
      Unreviewed, test expectations update.
      
      * platform/chromium/TestExpectations:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146421 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      53d8f80b
    • bfulgham@webkit.org's avatar
      [WinCairo] Unreviewed build fix for TestWebKitAPI under VS2010 · 7817f6f4
      bfulgham@webkit.org authored
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPICommonWinCairo.props: Added.
      New property sheet that does not link against CoreFoundation and
      CFNetwork.
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props:
      Use new TestWebKitAPICommonWinCairo property sheet.
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props:
      Ditto.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146420 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7817f6f4
    • abarth@webkit.org's avatar
      HTMLNames should construct strings at compile time · 5f610706
      abarth@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112831
      
      Reviewed by Darin Adler.
      
      Source/WebCore:
      
      This patch teaches make_names how to construct strings at compile time,
      eliminating a large number of startup mallocs.
      
      * WebCore.gyp/WebCore.gyp:
      * WebCore.gyp/scripts/action_makenames.py:
          - Teach the Chromium build how to deal with Perl modules.
      * bindings/scripts/StaticString.pm: Added.
          - A Perl module for constructing static strings.
      (GenerateStrings):
      (GenerateValidateStrings):
      * dom/QualifiedName.cpp:
      (WebCore::createQualifiedName):
          - createQualifiedName now takes an already-constructed StringImpl
            object.
      * dom/QualifiedName.h:
      * dom/make_names.pl:
      (valueForName):
      (namesToStrings):
      (printNamesCppFile):
      (printDefinitions):
          - Teach make_names how to use StaticString.pm.
      
      Source/WTF:
      
      * wtf/text/StringImpl.h:
      (StringImpl):
      (StaticASCIILiteral):
          - This struct lets us construct StringImpl objects at compile time.
      (WTF::StringImpl::assertValidHash):
          - This function lets us sanity check StringImpl objects created from StaticData.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146419 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      5f610706
    • rniwa@webkit.org's avatar
      Remove entires added by r138484 now that these tests pass on Mac. · 6b810a96
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146418 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      6b810a96
    • falken@chromium.org's avatar
      Remove unnecessary calls to Node::disabled for <meter>, <progress>, and <output> · 34f02370
      falken@chromium.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112767
      
      Reviewed by Kent Tamura.
      
      This is part of a refactoring to move Node::disabled to HTMLFormControlElement::disabled.
      The concept of disabled is just a form control element one.
      
      HTMLMeterElement, HTMLOutputElement, and HTMLProgressElement never
      have disabled() return true, so we can remove the call. In addition,
      HTMLMeterElement and HTMLProgressElement no longer inherit from
      HTMLFormControlElement, so we don't need to override supportsFocus.
      
      No new tests because no behavior change.
      
      * html/HTMLMeterElement.cpp:
      * html/HTMLMeterElement.h:
      * html/HTMLOutputElement.cpp:
      (WebCore::HTMLOutputElement::supportsFocus):
      * html/HTMLProgressElement.cpp:
      * html/HTMLProgressElement.h:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146417 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      34f02370
    • bfulgham@webkit.org's avatar
      [WinCairo] Unreviewed build fix for VS2010. · 03db0705
      bfulgham@webkit.org authored
      Had to add WinCairo-specific property sheets to deal with some
      library and path differences with the main Apple port.
      
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props:
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props:
      * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffCommonWinCairo.props: Added.
      * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffDebugWinCairo.props: Added.
      * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffReleaseWinCairo.props: Added.
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146416 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      03db0705
    • rniwa@webkit.org's avatar
      Remove an entry added in r141645 as this test is now passing. · a7a803c2
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146415 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a7a803c2
    • rniwa@webkit.org's avatar
      fast/css/empty-generated-content.html needs to be rebaselined after 104462 · 72c09459
      rniwa@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=104595
      
      * platform/mac/TestExpectations:
      * platform/mac/fast/css/empty-generated-content-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146414 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      72c09459
    • rniwa@webkit.org's avatar
      Rebaseline expected results added in r143389 so that they have alpha values. · d3a2c24c
      rniwa@webkit.org authored
      * platform/mac/svg/dynamic-updates/SVGFEImageElement-dom-preserveAspectRatio-attr-expected.png:
      * platform/mac/svg/dynamic-updates/SVGFEImageElement-svgdom-preserveAspectRatio-prop-expected.png:
      * svg/as-image/image-preserveAspectRatio-all-expected.png:
      * svg/filters/feImage-preserveAspectRatio-all-expected.png:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146413 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d3a2c24c
    • rniwa@webkit.org's avatar
      Remove test expectations added in r133786 as these tests are now passing. · bc206318
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146412 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      bc206318
    • rniwa@webkit.org's avatar
      inspector/debugger/debugger-reload-on-pause.html assertion failure on Mac after r141136 · 3d8bef50
      rniwa@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=109232
      
      Unreviewed. Remove the test expectation entry since this test hasn't been crashing lately.
      
      * platform/mac/TestExpectations:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      3d8bef50
    • rniwa@webkit.org's avatar
      Mac rebaseline intended to be done in r146409 for r144096. · 66fe5816
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      * platform/mac/css2.1/20110323/replaced-elements-001-expected.png:
      * platform/mac/css2.1/20110323/replaced-elements-001-expected.txt: Copied from LayoutTests/css2.1/20110323/replaced-elements-001-expected.txt.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      66fe5816
    • rniwa@webkit.org's avatar
      Mac rebaseline after r144096. · aaeb7a19
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      * platform/mac/css3/flexbox/button-expected.png: Copied from LayoutTests/css3/flexbox/button-expected.png.
      * platform/mac/css3/flexbox/button-expected.txt: Copied from LayoutTests/css3/flexbox/button-expected.txt.
      * platform/mac/svg/custom/foreign-object-skew-expected.png:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146409 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      aaeb7a19
    • commit-queue@webkit.org's avatar
      Source/WebCore: [css3-text] Parsing -webkit-each-line value for text-indent from css3-text · 30809ee8
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=109021
      
      Patch by Jaehun Lim <ljaehun.lim@samsung.com> on 2013-03-20
      Reviewed by Julien Chaffraix.
      
      "each-line" is added for text-indent in CSS3.
      http://dev.w3.org/csswg/css3-text/#each-line
      
      This patch is the parsing part to support each-line value for text-indent.
      
      "each-line" means "Indentation affects the first line of the block
      container as well as each line after a forced line break, but does
      not affect lines after a soft wrap break."
      
      It's prefixed and guarded by CSS3_TEXT flag.
      
      Tests: fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html
             fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html
      
      * css/CSSComputedStyleDeclaration.cpp:
      (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
          style.getPropertyCSSValue(text-indent) returns CSSPrimitiveValue when text-indent has only <length>
          or <percentage> value, but returns CSSValueList when text-indent also has -webkit-each-line.
      
      * css/CSSParser.cpp:
      (WebCore::isSimpleLengthPropertyID): Removed CSSPropertyTextIndent case.
      (WebCore::CSSParser::parseValue):
      (WebCore::CSSParser::parseTextIndent): Added.
      * css/CSSParser.h:
          Parsed <length> or <percentage> with -webkit-each-line for text-indent.
      
      * css/CSSValueKeywords.in: Added new -webkit-each-line keyword.
      * css/StyleBuilder.cpp:
      (ApplyPropertyTextIndent): Added.
      (WebCore::ApplyPropertyTextIndent::applyInheritValue):
      (WebCore::ApplyPropertyTextIndent::applyInitialValue):
      (WebCore::ApplyPropertyTextIndent::applyValue):
      (WebCore::ApplyPropertyTextIndent::createHandler):
      (WebCore::StyleBuilder::StyleBuilder):
          Added codes to handle applying text-indent offset and -webkit-each-line option to our style.
      
      * rendering/style/RenderStyle.cpp:
      (WebCore::RenderStyle::diff):
      * rendering/style/RenderStyle.h:
      * rendering/style/RenderStyleConstants.h: Added enum TextIndentLine.
      * rendering/style/StyleRareInheritedData.cpp:
      (WebCore::StyleRareInheritedData::StyleRareInheritedData):
      (WebCore::StyleRareInheritedData::operator==):
      * rendering/style/StyleRareInheritedData.h: Added m_textIndentLine.
      (StyleRareInheritedData):
          Added the usual getter / setter / initial methods for m_textIndentLine.
      
      LayoutTests: [css3-text] Parsing -webkit-each-line value for text-indent from css3-text
      https://bugs.webkit.org/show_bug.cgi?id=109021
      
      "each-line" is added for text-indent in CSS3.
      http://dev.w3.org/csswg/css3-text/#each-line
      
      Patch by Jaehun Lim <ljaehun.lim@samsung.com> on 2013-03-20
      Reviewed by Julien Chaffraix.
      
      * fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-expected.txt: Added.
      * fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited-expected.txt: Added.
      * fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent-inherited.html: Added.
      * fast/css3-text/css3-text-indent/getComputedStyle/getComputedStyle-text-indent.html: Added.
      * fast/css3-text/css3-text-indent/getComputedStyle/script-tests/getComputedStyle-text-indent-inherited.js: Added.
      (testComputedStyle):
      (ownValueTest):
      (inheritanceTest):
      * fast/css3-text/css3-text-indent/getComputedStyle/script-tests/getComputedStyle-text-indent.js: Added.
      (testElementStyle):
      (testComputedStyle):
      (valueSettingTest):
      (invalidValueSettingTest):
      * platform/chromium/TestExpectations:
      * platform/mac/TestExpectations:
      * platform/qt-mac/TestExpectations:
      * platform/qt/TestExpectations:
      * platform/win/TestExpectations:
      * platform/wincairo/TestExpectations:
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      30809ee8
    • fpizlo@apple.com's avatar
      Fix indentation of JSString.h · 494f2d9a
      fpizlo@apple.com authored
      Rubber stamped by Mark Hahnenberg.
      
      * runtime/JSString.h:
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146407 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      494f2d9a
    • tsepez@chromium.org's avatar
      dialog-enabled.html and dialog-disabled.html don't really test what they think they do · ab4f0db6
      tsepez@chromium.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112848
      
      Reviewed by Adam Barth.
      
      * fast/dom/HTMLDialogElement/dialog-disabled.html:
      * fast/dom/HTMLDialogElement/dialog-enabled.html:
      Set the dialog element enabled setting before parsing <dialog> element.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146406 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      ab4f0db6
    • rniwa@webkit.org's avatar
      Mac rebaseline after r142152. · a02d017e
      rniwa@webkit.org authored
      * platform/mac/TestExpectations:
      * platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.png:
      * platform/mac/fast/text/international/bidi-ignored-for-first-child-inline-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146405 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a02d017e
    • rniwa@webkit.org's avatar
      Mac rebaseline after r140693. · dbf3c0cc
      rniwa@webkit.org authored
      * editing/selection/extend-by-sentence-001-expected.txt:
      * platform/mac/TestExpectations:
      * platform/mac/css2.1/t0505-c16-descendant-01-e-expected.png:
      * platform/mac/css2.1/t0505-c16-descendant-01-e-expected.txt:
      * platform/mac/editing/selection/extend-by-sentence-001-expected.png:
      * platform/mac/fast/inline/drawStyledEmptyInlines-expected.txt:
      * platform/mac/fast/inline/drawStyledEmptyInlinesWithWS-expected.png:
      * platform/mac/fast/inline/drawStyledEmptyInlinesWithWS-expected.txt:
      * platform/mac/fast/text/capitalize-empty-generated-string-expected.png:
      * platform/mac/fast/text/capitalize-empty-generated-string-expected.txt:
      * platform/mac/fast/text/whitespace/006-expected.png:
      * platform/mac/fast/text/whitespace/006-expected.txt:
      * platform/mac/fast/text/whitespace/007-expected.png:
      * platform/mac/fast/text/whitespace/007-expected.txt:
      * platform/mac/svg/batik/text/xmlSpace-expected.png:
      * platform/mac/svg/batik/text/xmlSpace-expected.txt:
      * platform/mac/svg/carto.net/combobox-expected.png:
      * platform/mac/tables/mozilla/bugs/bug113235-3-expected.txt:
      * platform/mac/tables/mozilla/bugs/bug1188-expected.png:
      * platform/mac/tables/mozilla/bugs/bug1188-expected.txt:
      * platform/mac/tables/mozilla/bugs/bug1318-expected.png:
      * platform/mac/tables/mozilla/bugs/bug1318-expected.txt:
      * svg/carto.net/combobox-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      dbf3c0cc
    • rniwa@webkit.org's avatar
      Mac rebaseline after r139282. · 8ea3e719
      rniwa@webkit.org authored
      * fast/repaint/caret-with-transformation-expected.png: Added.
      * fast/repaint/caret-with-transformation-expected.txt: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146403 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8ea3e719
    • benjamin@webkit.org's avatar
      [WK2] Remove VIEW_MODE_CSS_MEDIA from WebKit2 · e4b848ae
      benjamin@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112849
      
      Patch by Benjamin Poulain <bpoulain@apple.com> on 2013-03-20
      Reviewed by Sam Weinig.
      
      Source/WebKit2: 
      
      The code was added in r137148 for the sole purpose of testing,
      and it is not even being properly tested.
      
      Remove the code until someone actually implement the feature in WebKit2.
      
      * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
      (WKBundlePageCanShowMIMEType):
      * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
      * WebProcess/WebPage/WebPage.cpp:
      * WebProcess/WebPage/WebPage.h:
      (WebPage):
      
      Tools: 
      
      * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
      * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
      * WebKitTestRunner/InjectedBundle/TestRunner.h:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146402 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      e4b848ae
    • fpizlo@apple.com's avatar
      "" + x where x is not a string should be optimized by the DFG to some manner of ToString conversion · 78210946
      fpizlo@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112845
      
      Reviewed by Mark Hahnenberg.
      
      * fast/js/regress/empty-string-plus-int-expected.txt: Added.
      * fast/js/regress/empty-string-plus-int.html: Added.
      * fast/js/regress/script-tests/empty-string-plus-int.js: Added.
      (foo):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146401 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      78210946
    • fpizlo@apple.com's avatar
      "" + x where x is not a string should be optimized by the DFG to some manner of ToString conversion · 7e5ed6ed
      fpizlo@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112845
      
      Reviewed by Mark Hahnenberg.
              
      I like to do "" + x. So I decided to make DFG recognize it, and related idioms.
      
      * dfg/DFGFixupPhase.cpp:
      (JSC::DFG::FixupPhase::fixupNode):
      (JSC::DFG::FixupPhase::fixupToPrimitive):
      (FixupPhase):
      (JSC::DFG::FixupPhase::fixupToString):
      (JSC::DFG::FixupPhase::attemptToMakeFastStringAdd):
      * dfg/DFGPredictionPropagationPhase.cpp:
      (JSC::DFG::resultOfToPrimitive):
      (DFG):
      (JSC::DFG::PredictionPropagationPhase::propagate):
      * dfg/DFGPredictionPropagationPhase.h:
      (DFG):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146400 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      7e5ed6ed
    • commit-queue@webkit.org's avatar
      Correct coordinated scrolling for RTL iframe and overflow:scroll · 8201a83c
      commit-queue@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112088
      
      Patch by Tien-Ren Chen <trchen@chromium.org> on 2013-03-20
      Reviewed by James Robinson.
      
      Source/WebCore:
      
      This patch adds appropriate offset in ScrollingCoordinatorChromium to
      adjust impl-side scroll position to the range [0, maxPos - minPos].
      
      This also corrects RenderLayer to return correct scroll position for RTL,
      explained below:
      
      There are 2 commonly used scroll offset coordinate systems in WebCore.
      
      1. The scroll offset is the amount that needs to be translated when painting
         child elements in a RenderBox. The value can be negative when there is
         negative overflow (for RTL). The range will be within
         [overflow_top_left_corner, overflow_bottom_right_corner - client_size].
         This system is mainly used for painting and layer positioning.
      
      2. The scroll offset will be always non-negative, and the range will be within
         [0, content_size - client_size]. This system is mainly used for scrollbars.
      
      scrollOrigin is defined to convert between the two systems. scrollOrigin is always
      non-negative, and equivalent to -overflow_top_left_corner.
      
      The first system is used for ScrollableArea::scrollPosition/minimumScrollPosition/
      maximumScrollPosition function family. So is it implemented in ScrollView/Frameview.
      RenderLayer errorneously implemented scrollPosition in the second system,
      and worse, returned minimumScrollPosition/maximumScrollPosition were totally non-sense.
      This patch corrects RenderLayer to use the first coordinate system.
      
      Test: compositing/rtl/rtl-overflow-scrolling.html
            ScrollingCoordinatorChromiumTest.rtlIframe
      
      * page/scrolling/chromium/ScrollingCoordinatorChromium.cpp:
      (WebCore::ScrollingCoordinatorChromium::scrollableAreaScrollLayerDidChange):
      * rendering/RenderLayer.cpp:
      (WebCore::RenderLayer::scrollPosition):
      (WebCore::RenderLayer::minimumScrollPosition):
      (WebCore::RenderLayer::maximumScrollPosition):
      * rendering/RenderLayerBacking.cpp:
      (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
      
      Source/WebKit/chromium:
      
      Added test to ensure RTL iframe has appropriate impl-side scroll position.
      
      * tests/ScrollingCoordinatorChromiumTest.cpp:
      (WebKit::TEST_F):
      (WebKit):
      * tests/data/rtl-iframe-inner.html: Added.
      * tests/data/rtl-iframe.html: Added.
      
      LayoutTests:
      
      This patch corrects scrollOrigin compensation for composited overflow:scroll.
      
      compositing/rtl/rtl-overflow-scrolling.html is added to verify RTL divs
      can be correctly scrolled to the left under accelerated scrolling mode.
      
      fast/css/sticky/inline-sticky-abspos-child.html is modified to avoid sub-pixel
      issue with Ahem font.
      
      * compositing/rtl/rtl-overflow-scrolling-expected.png: Added.
      * compositing/rtl/rtl-overflow-scrolling-expected.txt: Added.
      * compositing/rtl/rtl-overflow-scrolling.html: Added.
      * fast/css/sticky/inline-sticky-abspos-child-expected.html:
      * fast/css/sticky/inline-sticky-abspos-child.html:
      * platform/chromium/TestExpectations:
      * platform/mac/compositing/rtl/rtl-overflow-scrolling-expected.txt: Added.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146399 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8201a83c
    • bfulgham@webkit.org's avatar
      [WinCairo] Build WebKit Tools under VS2010 · 19fcd5b4
      bfulgham@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112821
      
      Reviewed by Tim Horton.
      
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
      Add WinCairo-specific build target.
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeDebugWinCairo.props: Added.
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj: Add WinCairo-specific build target.
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeReleaseWinCairo.props: Added.
      * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeWinCairo.props: Added.
      * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
      Add WinCairo-specific build target.
      * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
      * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
      Add WinCairo-specific build target.
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: Add
      WinCairo-specific build target.
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIDebugWinCairo.props: Added.
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPIReleaseWinCairo.props: Added.
      * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: Add WinCairo-
      specific build target.
      * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj: Add
      WinCairo-specific build target.
      * win/record-memory/record-memory.vcxproj: Add WinCairo target.
      * win/record-memory/record-memoryDebugWinCairo.props: Added.
      * win/record-memory/record-memoryReleaseWinCairo.props: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      19fcd5b4
    • rniwa@webkit.org's avatar
      Mac rebaseline after r140202. · 9ddc0044
      rniwa@webkit.org authored
      * editing/input/caret-at-the-edge-of-contenteditable-expected.png:
      * editing/input/reveal-caret-of-multiline-contenteditable-expected.png:
      * editing/input/reveal-caret-of-multiline-input-expected.png:
      * fast/spatial-navigation/snav-div-overflow-scrol-hidden-expected.txt:
      * platform/mac/TestExpectations:
      * platform/mac/editing/input/caret-at-the-edge-of-contenteditable-expected.txt:
      * platform/mac/editing/input/reveal-caret-of-multiline-contenteditable-expected.txt:
      * platform/mac/editing/input/reveal-caret-of-multiline-input-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146397 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      9ddc0044
    • zherczeg@webkit.org's avatar
      ARMv7 replaceWithJump ASSERT failure after r135330. · c3cdf5ff
      zherczeg@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=103146
      
      Reviewed by Filip Pizlo.
      
      On Linux, the 24 bit distance range of jumps sometimes does not
      enough to cover all targets addresses. This patch supports jumps
      outside of this range using a mov/movt/bx 10 byte long sequence.
      
      * assembler/ARMv7Assembler.h:
      (ARMv7Assembler):
      (JSC::ARMv7Assembler::revertJumpTo_movT3movtcmpT2):
      (JSC::ARMv7Assembler::nopw):
      (JSC::ARMv7Assembler::label):
      (JSC::ARMv7Assembler::replaceWithJump):
      (JSC::ARMv7Assembler::maxJumpReplacementSize):
      * assembler/MacroAssemblerARMv7.h:
      (JSC::MacroAssemblerARMv7::revertJumpReplacementToBranchPtrWithPatch):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146396 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c3cdf5ff
    • jberlin@webkit.org's avatar
      REGRESSION(r145592): AutodrainedPool.h. RunLoopTimer.h, SchedulePair.h are being copied into · c8928694
      jberlin@webkit.org authored
      the wrong location
      https://bugs.webkit.org/show_bug.cgi?id=112833
      
      Reviewed by Darin Adler.
      
      Source/WebCore:
      
      Fix an incorrect include path.
      
      * loader/DocumentLoader.h:
      RunLoopTimer.h lives in wtf as of r145592.
      
      Source/WTF:
      
      * WTF.xcodeproj/project.pbxproj:
      Make sure those three headers are copied with the rest of the WTF headers.
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c8928694
    • tkent@chromium.org's avatar
      Crash in Document::setFocusedNode if the frame of new focused node is detached... · 04bab40e
      tkent@chromium.org authored
      Crash in Document::setFocusedNode if the frame of new focused node is detached in 'change' event handler
      https://bugs.webkit.org/show_bug.cgi?id=112653
      
      Reviewed by Dimitri Glazkov.
      
      Source/WebCore:
      
      Test: fast/frames/detach-frame-during-focus.html
      
      * page/FocusController.cpp:
      (WebCore::FocusController::setFocusedNode):
      A oldDocument->setFocusedNode call might dispatch a 'change' event for
      an old focused node, and an event handler code might detach the
      newFocusedFrame. So we should check it. Without the check, the following
      newDocument->setFocusedNode call would crash because of null
      Frame::page().
      
      LayoutTests:
      
      * fast/frames/detach-frame-during-focus-expected.txt: Added.
      * fast/frames/detach-frame-during-focus.html: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146393 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      04bab40e
    • mhahnenberg@apple.com's avatar
      Objective-C API: Fix over-releasing in allocateConstructorAndPrototypeWithSuperClassInfo: · 57c522f3
      mhahnenberg@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112832
      
      Reviewed by Geoffrey Garen.
      
      If either the m_constructor or m_prototype (but not both) is collected, we will call 
      allocateConstructorAndPrototypeWithSuperClassInfo, which will create a new object to replace the one 
      that was collected, but at the end of the method we call release on both of them. 
      This is incorrect since we autorelease the JSValue in the case that the object doesn't need to be 
      reallocated. Thus we'll end up overreleasing later during the drain of the autorelease pool.
      
      * API/JSWrapperMap.mm:
      (objectWithCustomBrand): We no longer alloc here. We instead call the JSValue valueWithValue class method,
      which autoreleases for us.
      (-[JSObjCClassInfo allocateConstructorAndPrototypeWithSuperClassInfo:]): We no longer call release on the 
      constructor or prototype JSValues.
      * API/tests/testapi.mm: Added a new test that crashes on ToT due to over-releasing.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146392 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      57c522f3
    • rniwa@webkit.org's avatar
      Assertion in LegacyWebArchive::create() in editing tests · 38651bcf
      rniwa@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112642
      
      Reviewed by Simon Fraser.
      
      Address Simon's review comment. Don't convert String to MIMEType just to convert it back to String.
      
      * platform/mac/PasteboardMac.mm:
      (WebCore::fragmentFromWebArchive):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146391 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      38651bcf
    • zandobersek@gmail.com's avatar
      [GTK] Build ANGLE sources into a separate library from libWebCore.la · 9c5324a1
      zandobersek@gmail.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112778
      
      Reviewed by Martin Robinson.
      
      .: 
      
      * GNUmakefile.am: Include the GNUmakefile.am covering the libANGLE.la library.
      
      Source/ThirdParty/ANGLE: 
      
      * GNUmakefile.am: Added, sets up the libANGLE.la library.
      
      Source/WebCore: 
      
      No new tests - no change in functionality.
      
      * GNUmakefile.list.am: Remove the ANGLE sources listing, it's now placed in the ANGLE-specific GNUmakefile.am.
      
      Source/WebKit/gtk: 
      
      * GNUmakefile.am: Add libLevelDB.la to the libwebkitgtk library if using the OpenGL accelerated backend.
      
      Source/WebKit2: 
      
      * GNUmakefile.am: Add libLevelDB.la to the libwebkit2gtk library if using the OpenGL accelerated backend.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146390 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      9c5324a1
    • rniwa@webkit.org's avatar
      Assertion in LegacyWebArchive::create() in editing tests · 2900215c
      rniwa@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112642
      
      Reviewed by Enrica Casucci.
      
      It's possible for clipboard to be overriden between the time we retrieve clipboard types and the time
      we actually retrieve the Web archive buffer. Add a null check to take this into account.
      
      Also extracted fragmentFromWebArchive for clarity.
      
      * platform/mac/PasteboardMac.mm:
      (WebCore::fragmentFromWebArchive): Extracted.
      (WebCore::Pasteboard::documentFragment):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146389 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      2900215c
    • cfleizach@apple.com's avatar
      WebSpeech: Crash in WebCore::PlatformSpeechSynthesisUtterance::client /... · a39d85ba
      cfleizach@apple.com authored
      WebSpeech: Crash in WebCore::PlatformSpeechSynthesisUtterance::client / WebCore::SpeechSynthesis::didResumeSpeaking
      https://bugs.webkit.org/show_bug.cgi?id=112728
      
      Reviewed by Tim Horton.
      
      When cancel() is called, there was a delay in the platform returning and saying speech was finished, which caused
      the m_currentSpeechUtterance variable to get deallocated but not cleared. 
      
      This patch fixes up the management of the utterances in SpeechSynthesis and the Mac platform given that
      we can't rely on the platform to return immediately on a stop speaking job.
      
      Test: platform/mac/fast/speechsynthesis/speech-synthesis-cancel-crash.html
      
      * Modules/speech/SpeechSynthesis.cpp:
      (WebCore::SpeechSynthesis::cancel):
      (WebCore::SpeechSynthesis::resume):
      * platform/mac/PlatformSpeechSynthesizerMac.mm:
      (-[WebSpeechSynthesisWrapper cancel]):
      (-[WebSpeechSynthesisWrapper speechSynthesizer:didFinishSpeaking:]):
      (-[WebSpeechSynthesisWrapper speechSynthesizer:willSpeakWord:ofString:]):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146387 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      a39d85ba
    • roger_fong@apple.com's avatar
      API test gardening AppleWin port. · 91d0a2d3
      roger_fong@apple.com authored
      The BitmapImageEmptyFrameTest should only be tested on Cairo not on AppleWin port.
      
      * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
      * TestWebKitAPI/win/TestWebKitAPI.vcproj:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146386 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      91d0a2d3
    • eric.carlson@apple.com's avatar
      Unreviewed, fix Mac release build. · 856b74d7
      eric.carlson@apple.com authored
      * page/CaptionUserPreferencesMac.mm:
      (WebCore::languageIdentifier):
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146385 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      856b74d7
    • fpizlo@apple.com's avatar
      It's called "Hash Consing" not "Hash Consting" · 8fa6e667
      fpizlo@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112768
      
      Rubber stamped by Mark Hahnenberg.
              
      See http://en.wikipedia.org/wiki/Hash_consing
      
      * heap/GCThreadSharedData.cpp:
      (JSC::GCThreadSharedData::GCThreadSharedData):
      (JSC::GCThreadSharedData::reset):
      * heap/GCThreadSharedData.h:
      (GCThreadSharedData):
      * heap/SlotVisitor.cpp:
      (JSC::SlotVisitor::SlotVisitor):
      (JSC::SlotVisitor::setup):
      (JSC::SlotVisitor::reset):
      (JSC::JSString::tryHashConsLock):
      (JSC::JSString::releaseHashConsLock):
      (JSC::JSString::shouldTryHashCons):
      (JSC::SlotVisitor::internalAppend):
      * heap/SlotVisitor.h:
      (SlotVisitor):
      * runtime/JSGlobalData.cpp:
      (JSC::JSGlobalData::JSGlobalData):
      * runtime/JSGlobalData.h:
      (JSGlobalData):
      (JSC::JSGlobalData::haveEnoughNewStringsToHashCons):
      (JSC::JSGlobalData::resetNewStringsSinceLastHashCons):
      * runtime/JSString.h:
      (JSC::JSString::finishCreation):
      (JSString):
      (JSC::JSString::isHashConsSingleton):
      (JSC::JSString::clearHashConsSingleton):
      (JSC::JSString::setHashConsSingleton):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146383 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8fa6e667
    • fpizlo@apple.com's avatar
      DFG implementation of op_strcat should inline rope allocations · 4463e44f
      fpizlo@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112780
      
      Reviewed by Oliver Hunt.
              
      This gets rid of the StrCat node and adds a MakeRope node. The MakeRope node can
      take either two or three operands, and allocates a rope string with either two or
      three fibers. (The magic choice of three children for non-VarArg nodes happens to
      match exactly with the magic choice of three fibers for rope strings.)
              
      ValueAdd on KnownString is replaced with MakeRope with two children.
              
      StrCat gets replaced by an appropriate sequence of MakeRope's.
              
      MakeRope does not do the dynamic check to see if its children are empty strings.
      This is replaced by a static check, instead. The downside is that we may use more
      memory if the strings passed to MakeRope turn out to dynamically be empty. The
      upside is that we do fewer checks in the cases where either the strings are not
      empty, or where the strings are statically known to be empty. I suspect both of
      those cases are more common, than the case where the string is dynamically empty.
              
      This also results in some badness for X86. MakeRope needs six registers if it is
      allocating a three-rope. We don't have six registers to spare on X86. Currently,
      the code side-steps this problem by just never usign three-ropes in optimized
      code on X86. All other architectures, including X86_64, don't have this problem.
              
      This is a shocking speed-up. 9% progressions on both V8/splay and
      SunSpider/date-format-xparb. 1% progression on V8v7 overall, and ~0.5% progression
      on SunSpider. 2x speed-up on microbenchmarks that test op_strcat.
      
      * dfg/DFGAbstractState.cpp:
      (JSC::DFG::AbstractState::executeEffects):
      * dfg/DFGAdjacencyList.h:
      (AdjacencyList):
      (JSC::DFG::AdjacencyList::removeEdge):
      * dfg/DFGArgumentsSimplificationPhase.cpp:
      (JSC::DFG::ArgumentsSimplificationPhase::removeArgumentsReferencingPhantomChild):
      * dfg/DFGBackwardsPropagationPhase.cpp:
      (JSC::DFG::BackwardsPropagationPhase::propagate):
      * dfg/DFGByteCodeParser.cpp:
      (JSC::DFG::ByteCodeParser::parseBlock):
      * dfg/DFGCSEPhase.cpp:
      (JSC::DFG::CSEPhase::putStructureStoreElimination):
      (JSC::DFG::CSEPhase::eliminateIrrelevantPhantomChildren):
      (JSC::DFG::CSEPhase::performNodeCSE):
      * dfg/DFGDCEPhase.cpp:
      (JSC::DFG::DCEPhase::eliminateIrrelevantPhantomChildren):
      * dfg/DFGFixupPhase.cpp:
      (JSC::DFG::FixupPhase::fixupNode):
      (JSC::DFG::FixupPhase::createToString):
      (JSC::DFG::FixupPhase::attemptToForceStringArrayModeByToStringConversion):
      (JSC::DFG::FixupPhase::convertStringAddUse):
      (FixupPhase):
      (JSC::DFG::FixupPhase::convertToMakeRope):
      (JSC::DFG::FixupPhase::fixupMakeRope):
      (JSC::DFG::FixupPhase::attemptToMakeFastStringAdd):
      * dfg/DFGNodeType.h:
      (DFG):
      * dfg/DFGOperations.cpp:
      * dfg/DFGOperations.h:
      * dfg/DFGPredictionPropagationPhase.cpp:
      (JSC::DFG::PredictionPropagationPhase::propagate):
      * dfg/DFGSpeculativeJIT.cpp:
      (JSC::DFG::SpeculativeJIT::compileAdd):
      (JSC::DFG::SpeculativeJIT::compileMakeRope):
      (DFG):
      * dfg/DFGSpeculativeJIT.h:
      (JSC::DFG::SpeculativeJIT::callOperation):
      (SpeculativeJIT):
      (JSC::DFG::SpeculateCellOperand::SpeculateCellOperand):
      (JSC::DFG::SpeculateCellOperand::~SpeculateCellOperand):
      (JSC::DFG::SpeculateCellOperand::gpr):
      (JSC::DFG::SpeculateCellOperand::use):
      * dfg/DFGSpeculativeJIT32_64.cpp:
      (JSC::DFG::SpeculativeJIT::compile):
      * dfg/DFGSpeculativeJIT64.cpp:
      (JSC::DFG::SpeculativeJIT::compile):
      * runtime/JSString.h:
      (JSRopeString):
      
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146382 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      4463e44f
    • bfulgham@webkit.org's avatar
      [WinCairo] Build the WebKit.dll under VS2010. · 1b0d0baa
      bfulgham@webkit.org authored
      https://bugs.webkit.org/show_bug.cgi?id=112759
      
      Reviewed by Tim Horton.
      
      * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Update project to
      build WinCairo variant using new property sheets.
      * WebKit.vcxproj/Interfaces/InterfacesDebugWinCairo.props: Added.
      * WebKit.vcxproj/Interfaces/InterfacesReleaseWinCairo.props: Added.
      * WebKit.vcxproj/WebKit.sln: Update solution to use WinCairo
      build targets for WebKit.dll-related projects.
      * WebKit.vcxproj/WebKit/WebKit.vcxproj: Update project to build
      WinCairo variant using new property sheets.
      * WebKit.vcxproj/WebKit/cURL.props: Added.
      * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Added.
      * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Added.
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
      Update project to build WinCairo variant using new property sheets.
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorDebugWinCairo.props: Added.
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorReleaseWinCairo.props: Added.
      * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Update project to
      build WinCairo variant using new property sheets.
      * WebKit.vcxproj/WebKitGUID/WebKitGUIDDebugWinCairo.props: Added.
      * WebKit.vcxproj/WebKitGUID/WebKitGUIDReleaseWinCairo.props: Added.
      * WebKit.vcxproj/WinCairo.props: Added.
      * WebKit.vcxproj/debug_wincairo.props: Added.
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146381 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1b0d0baa
    • eric.carlson@apple.com's avatar
      Allow ports specific text track menu · 62bb7dc9
      eric.carlson@apple.com authored
      https://bugs.webkit.org/show_bug.cgi?id=112800
      
      Reviewed by Dean Jackson.
      
      Source/WebCore: 
      
      No new tests, existing tests updated for changes.
      
      * English.lproj/Localizable.strings: Add localizable strings for text track names.
      
      * html/HTMLMediaElement.cpp:
      (WebCore::HTMLMediaElement::HTMLMediaElement): userPrefersCaptions -> shouldShowCaptions.
      (WebCore::HTMLMediaElement::setSelectedTextTrack): toggleTrackAtIndex -> setSelectedTextTrack.
      (WebCore::HTMLMediaElement::userPrefersCaptions): userPrefersCaptions -> shouldShowCaptions.
      (WebCore::HTMLMediaElement::userIsInterestedInThisTrackKind): Get preferences from CaptionUserPreferences
          instead of from Settings.
      (WebCore::HTMLMediaElement::setSelectedTextTrack): Renamed from toggleTrackAtIndex. Now takes
          a TextTrack* instead of an int.
      (WebCore::HTMLMediaElement::captionPreferencesChanged): Don't force a recalculation unless 
          captions are enabled/disabled to avoid unnecessary thrash.
      * html/HTMLMediaElement.h:
      
      * html/shadow/MediaControlElements.cpp:
      (WebCore::MediaControlClosedCaptionsTrackListElement::defaultEventHandler): Use the menu to track
          map instead of just the track index.
      (WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay): Build and configure the
          menu from the menu to track map.
      (WebCore::MediaControlClosedCaptionsTrackListElement::rebuildTrackListMenu): Start with a list
          of tracks already sorted according to platform specific rules. Build a menu to track map
          so tracks are retained while the menu is visible.
      * html/shadow/MediaControlElements.h:
      
      * html/shadow/MediaControls.cpp:
      (WebCore::MediaControls::textTrackPreferencesChanged): Call closedCaptionTracksChanged so the
          track menu will be rebuilt before it is shown again.
      
      * html/track/InbandTextTrack.cpp:
      (WebCore::InbandTextTrack::containsOnlyForcedSubtitles): New, passthrough to the private track.
      (WebCore::InbandTextTrack::isMainProgramContent): Ditto.
      (WebCore::InbandTextTrack::isEasyToRead): Ditto.
      * html/track/InbandTextTrack.h:
      * html/track/TextTrack.h:
      
      * html/track/TextTrackList.cpp:
      (WebCore::TextTrackList::contains): New.
      * html/track/TextTrackList.h:
      
      * page/CaptionUserPreferences.cpp:
      (WebCore::CaptionUserPreferences::CaptionUserPreferences): Pull in from .h ditto.
      (WebCore::CaptionUserPreferences::~CaptionUserPreferences): Ditto.
      (WebCore::CaptionUserPreferences::shouldShowCaptions): Renamed from userPrefersCaptions. 
      (WebCore::CaptionUserPreferences::setShouldShowCaptions): New.
      (WebCore::CaptionUserPreferences::userPrefersCaptions): Ditto.
      (WebCore::CaptionUserPreferences::setUserPrefersCaptions): Ditto.
      (WebCore::CaptionUserPreferences::userPrefersSubtitles): Ditto.
      (WebCore::CaptionUserPreferences::setUserPrefersSubtitles): Ditto.
      (WebCore::CaptionUserPreferences::userPrefersTextDescriptions): Ditto.
      (WebCore::CaptionUserPreferences::setUserPrefersTextDescriptions): Ditto.
      (WebCore::CaptionUserPreferences::displayNameForTrack): Ditto.
      (WebCore::CaptionUserPreferences::sortedTrackListForMenu): Ditto.
      * page/CaptionUserPreferences.h:
      
      * page/CaptionUserPreferencesMac.h:
      * page/CaptionUserPreferencesMac.mm:
      (WebCore::CaptionUserPreferencesMac::shouldShowCaptions): Renamed from userPrefersCaptions. 
      (WebCore::CaptionUserPreferencesMac::userPrefersCaptions): New.
      (WebCore::CaptionUserPreferences::userPrefersSubtitles): Ditto.
      (WebCore::trackDisplayName): Update logic used to build track title.
      (WebCore::CaptionUserPreferencesMac::displayNameForTrack): Call trackDisplayName.
      (WebCore::textTrackCompare): Text track title sort comparison function.
      (WebCore::CaptionUserPreferencesMac::sortedTrackListForMenu): New. Sort the list of tracks
          according to title, language, and user preferences.
      
      * platform/Language.cpp:
      (WebCore::displayNameForLanguageLocale): Don't leak the CFLocale.
              
      * platform/LocalizedStrings.cpp:
      (WebCore::textTrackCountryAndLanguageMenuItemText): New.
      (WebCore::textTrackLanguageMenuItemText): Ditto.
      (WebCore::closedCaptionTrackMenuItemText): Ditto.
      (WebCore::sdhTrackMenuItemText): Ditto.
      (WebCore::easyReaderTrackMenuItemText): Ditto.
      * platform/LocalizedStrings.h:
      
      * platform/graphics/InbandTextTrackPrivate.h:
      * platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h:
      * platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm:
      (WebCore::InbandTextTrackPrivateAVFObjC::containsOnlyForcedSubtitles): New, return AVFoundation property.
      (WebCore::InbandTextTrackPrivateAVFObjC::isMainProgramContent): Ditto.
      (WebCore::InbandTextTrackPrivateAVFObjC::isEasyToRead): Ditto.
      
      * testing/InternalSettings.cpp:
      (WebCore::InternalSettings::setShouldDisplayTrackKind): Set setting via CaptionUserPreferences
          instead of from Settings.
      (WebCore::InternalSettings::shouldDisplayTrackKind): Get setting from CaptionUserPreferences
          instead of from Settings.
      
      Source/WebKit: 
      
      * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Add new exports.
      * win/WebKit.vcproj/WebKitExports.def.in: Ditto.
      
      LayoutTests: 
      
      * media/track/track-user-preferences-expected.txt:
      * media/track/track-user-preferences.html:
      * media/video-controls-captions-trackmenu-localized.html:
      * media/video-controls-captions-trackmenu-sorted.html:
      * media/video-controls-captions-trackmenu.html:
      * platform/mac/media/video-controls-captions-trackmenu-expected.txt:
      * platform/mac/media/video-controls-captions-trackmenu-localized-expected.txt:
      * platform/mac/media/video-controls-captions-trackmenu-sorted-expected.txt:
      
      
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@146380 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      62bb7dc9