webkit-patch rebaseline-expectations wrongly touches other platforms' TestExpectations
https://bugs.webkit.org/show_bug.cgi?id=95222

Reviewed by Adam Barth.

The code we had to remove REBASELINE lines from the
TestExpectations files did not handle multiple files (in a
cascade) correctly; we weren't limiting lines to a particular
file correctly in without_rebaseline_modifier(). This patch
fixes that and corrects the tests (which weren't correct and
didn't cover things very well).

Note also that the webkit-patch rebaseline-commands are still
using the include_overrides=False option in a couple places;
this is never correct or needed at this point. This patch fixes
the usage for webkit-patch rebaseline-expectations, but I still
need to fix rebaseline-test-internal, which I will do in a
separate patch (see bug 95268).

* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectations.remove_rebaselined_tests.without_rebaseline_modifier):
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
(RebaseliningTest.assertRemove):
(RebaseliningTest.test_remove):
* Scripts/webkitpy/tool/commands/rebaseline.py:
(RebaselineExpectations._update_expectations_files):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127058 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Fix check-webkit-style (and probably others) when WebKit is in a git submodule
https://bugs.webkit.org/show_bug.cgi?id=95177

Patch by Kevin Funk <kevin.funk@kdab.com> on 2012-08-29
Reviewed by Dirk Pranke.

Find the real checkout root by using 'git rev-parse --show-toplevel' instead of '--git-dir'

* Scripts/webkitpy/common/checkout/scm/git.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Unreviewed Gardening: editing/delete/br-004(5)(6) failing on Windows (old run webkit tests)
https://bugs.webkit.org/show_bug.cgi?id=95391

Looks like NRWT expects different results for these tests than ORWT, as per http://trac.webkit.org/changeset/90490.
Adding these three failing tests to skip list to get bots greener.

* platform/win/Skipped:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[chromium] Support high DIP pixel tests with DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=94935

Patch by Alex Sakhartchouk <alexst@chromium.org> on 2012-08-29
Reviewed by James Robinson.

Tools:

Adding device scale factor into the drt image dumping code

* DumpRenderTree/chromium/DRTTestRunner.cpp:
(DRTTestRunner::reset):
(DRTTestRunner::setBackingScaleFactor):
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::setDeviceScaleFactor):
(WebViewHost::paintInvalidatedRegion):
(WebViewHost::canvas):
* DumpRenderTree/chromium/WebViewHost.h:
(WebViewHost):

LayoutTests:

Introducing new expected test results in full resolution and temporarily
marking the files on other platforms as expected to fail until I can update them later

* platform/chromium-linux/fast/hidpi/broken-image-icon-hidpi-expected.png:
* platform/chromium-linux/fast/hidpi/broken-image-with-size-hidpi-expected.png:
* platform/chromium-linux/fast/hidpi/clip-text-in-hidpi-expected.png:
* platform/chromium-linux/fast/hidpi/device-scale-factor-paint-expected.png:
* platform/chromium-linux/fast/hidpi/focus-rings-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-as-background-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-background-dynamic-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-background-repeat-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-background-repeat-without-size-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-border-image-comparison-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-border-image-dynamic-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-border-image-simple-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-in-content-dynamic-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-out-of-order-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-simple-expected.png:
* platform/chromium-linux/fast/hidpi/image-set-without-specified-width-expected.png:
* platform/chromium-linux/fast/hidpi/resize-corner-hidpi-expected.png:
* platform/chromium-linux/fast/hidpi/video-controls-in-hidpi-expected.png:
* platform/chromium/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127061 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Convert more static Strings to use ASCIILiteral
https://bugs.webkit.org/show_bug.cgi?id=95313

Reviewed by Eric Seidel.

This patch converts another swath of static strings to use ASCIILiteral
as recommended by http://trac.webkit.org/wiki/EfficientStrings.

* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::openKeyword):
(WebCore):
(WebCore::MediaSource::closedKeyword):
(WebCore::MediaSource::endedKeyword):
* Modules/mediasource/MediaSource.h:
(MediaSource):
* Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
(WebCore::customHandlersStateString):
* Modules/notifications/Notification.cpp:
(WebCore::Notification::permissionString):
* accessibility/AccessibilityMediaControls.cpp:
(WebCore::AccessibilityMediaControl::controlTypeName):
(WebCore::AccessibilityMediaControl::title):
(WebCore::AccessibilityMediaControlsContainer::elementTypeName):
(WebCore::AccessibilityMediaTimeline::helpText):
* bindings/js/JSInspectorFrontendHostCustom.cpp:
(WebCore::JSInspectorFrontendHost::platform):
(WebCore::JSInspectorFrontendHost::port):
* bindings/js/ScriptEventListener.cpp:
(WebCore::eventParameterName):
* bindings/v8/ScriptEventListener.cpp:
(WebCore::eventParameterName):
* css/CSSWrapShapes.cpp:
(WebCore::CSSWrapShapeRectangle::cssText):
(WebCore::CSSWrapShapeCircle::cssText):
(WebCore::CSSWrapShapeEllipse::cssText):
(WebCore::CSSWrapShapePolygon::cssText):
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::parseAuthorStyleSheet):
* dom/Document.cpp:
(WebCore::Document::readyState):
* editing/MarkupAccumulator.cpp:
(WebCore::appendCharactersReplacingEntities):
* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::appendStyleNodeOpenTag):
(WebCore::StyledMarkupAccumulator::styleNodeCloseTag):
(WebCore::StyledMarkupAccumulator::appendElement):
(WebCore::createMarkup):
* html/track/TextTrackCue.cpp:
(WebCore::startKeyword):
(WebCore::middleKeyword):
(WebCore::endKeyword):
(WebCore::verticalGrowingLeftKeyword):
(WebCore::verticalGrowingRightKeyword):
(WebCore::TextTrackCue::updateDisplayTree):
(WebCore::TextTrackCue::settingName):
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::mediaLoadedKey):
(WebCore::DiagnosticLoggingKeys::mediaLoadingFailedKey):
(WebCore::DiagnosticLoggingKeys::pluginLoadedKey):
(WebCore::DiagnosticLoggingKeys::pluginLoadingFailedKey):
(WebCore::DiagnosticLoggingKeys::pageContainsPluginKey):
(WebCore::DiagnosticLoggingKeys::pageContainsAtLeastOnePluginKey):
(WebCore::DiagnosticLoggingKeys::passKey):
(WebCore::DiagnosticLoggingKeys::failKey):
(WebCore::DiagnosticLoggingKeys::noopKey):
* page/PageVisibilityState.cpp:
(WebCore::pageVisibilityStateString):
* page/UserContentURLPattern.cpp:
(WebCore::UserContentURLPattern::parse):
* platform/KURLWTFURL.cpp:
(WebCore::KURL::string):
* platform/MIMETypeRegistry.cpp:
(WebCore::defaultMIMEType):
(WebCore::mimeTypeAssociationMap):
* platform/network/ContentTypeParser.cpp:
(WebCore::ContentTypeParser::parse):
* platform/network/win/DownloadBundleWin.cpp:
(WebCore::DownloadBundle::fileExtension):
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase):
* svg/SVGAnimatedBoolean.cpp:
(WebCore::SVGAnimatedBooleanAnimator::constructFromString):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127062 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[Texmap] Move TextureMapperGL to use GraphicsContext3D
https://bugs.webkit.org/show_bug.cgi?id=78672

Patch by Roland Takacs  <rtakacs@inf.u-szeged.hu>, Helder Correia <helder.correia@nokia.com> on 2012-08-29
Reviewed by Noam Rosenthal.

It is based on a previous patch by Helder Correia.

TextureMapperGL (TMGL) includes direct GL calls and
GraphicsContext3D (GC3D) offers many conveniences over the
former approach: using existing CSS shader code, ANGLE for
shader compilation, reusing WebCore::Texture, having shaders and
textures that can delete themselves.

A GC3D object is created by TMGL with the newly introduced
builder createForCurrentGLContext(), which in turn uses
the new RenderToCurrentGLContext flag underneath.

TMGL's dependency on OpenGLShims.h was completely removed.
However, GC3D does not map every single GL constant. Thus, it's
important to document the following:
    - GL_FALSE was mapped to false.
    - GL_UNPACK_ROW_LENGTH, GL_UNPACK_SKIP_PIXELS,
    GL_UNPACK_SKIP_ROWS, GL_TEXTURE_RECTANGLE_ARB, and
    GL_UNSIGNED_INT_8_8_8_8_REV were locally defined in TMGL.

The patch was originally developed by Helder Correia and finished
by Roland Takacs.

No new tests, refactoring.

* platform/graphics/GraphicsContext3D.h:
* platform/graphics/texmap/TextureMapperGL.cpp:
(SharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::currentSharedGLData):
(WebCore::TextureMapperGLData::SharedGLData::SharedGLData):
(WebCore::TextureMapperGLData::sharedGLData):
(WebCore::TextureMapperGLData::TextureMapperGLData):
(TextureMapperGLData):
(WebCore::scissorClip):
(WebCore::TextureMapperGL::ClipStack::apply):
(WebCore::TextureMapperGLData::initializeStencil):
(WebCore::TextureMapperGL::TextureMapperGL):
(WebCore::TextureMapperGL::beginPainting):
(WebCore::TextureMapperGL::endPainting):
(WebCore::TextureMapperGL::drawQuad):
(WebCore::TextureMapperGL::drawBorder):
(WebCore):
(WebCore::TextureMapperGL::drawTextureRectangleARB):
(WebCore::TextureMapperGL::drawTexture):
(WebCore::viewportMatrix):
(WebCore::TextureMapperGL::drawTextureWithAntialiasing):
(WebCore::TextureMapperGL::drawTexturedQuadWithProgram):
(WebCore::BitmapTextureGL::didReset):
(WebCore::BitmapTextureGL::updateContents):
(WebCore::TextureMapperGL::drawFiltered):
(WebCore::BitmapTextureGL::initializeStencil):
(WebCore::BitmapTextureGL::clearIfNeeded):
(WebCore::BitmapTextureGL::createFboIfNeeded):
(WebCore::BitmapTextureGL::bind):
(WebCore::BitmapTextureGL::~BitmapTextureGL):
(WebCore::TextureMapperGL::bindDefaultSurface):
(WebCore::TextureMapperGL::beginScissorClip):
(WebCore::TextureMapperGL::beginClip):
(WebCore::TextureMapperGL::endClip):
(WebCore::TextureMapperGL::createTexture):
* platform/graphics/texmap/TextureMapperGL.h:
(WebCore::TextureMapperGL::graphicsContext3D):
(TextureMapperGL):
(ClipStack):
(WebCore::BitmapTextureGL::textureTarget):
(BitmapTextureGL):
(WebCore::BitmapTextureGL::BitmapTextureGL):
* platform/graphics/texmap/TextureMapperShaderManager.cpp:
(WebCore):
(WebCore::TextureMapperShaderManager::getShaderProgram):
(WebCore::TextureMapperShaderProgram::TextureMapperShaderProgram):
(WebCore::TextureMapperShaderProgram::initializeProgram):
(WebCore::TextureMapperShaderProgram::getUniformLocation):
(WebCore::TextureMapperShaderProgram::~TextureMapperShaderProgram):
(WebCore::TextureMapperShaderProgramSimple::TextureMapperShaderProgramSimple):
(WebCore::TextureMapperShaderProgramSolidColor::TextureMapperShaderProgramSolidColor):
(WebCore::TextureMapperShaderProgramRectSimple::TextureMapperShaderProgramRectSimple):
(WebCore::TextureMapperShaderProgramOpacityAndMask::TextureMapperShaderProgramOpacityAndMask):
(WebCore::TextureMapperShaderProgramRectOpacityAndMask::TextureMapperShaderProgramRectOpacityAndMask):
(WebCore::TextureMapperShaderProgramAntialiasingNoMask::TextureMapperShaderProgramAntialiasingNoMask):
(WebCore::TextureMapperShaderManager::TextureMapperShaderManager):
(WebCore::StandardFilterProgram::~StandardFilterProgram):
(WebCore::StandardFilterProgram::StandardFilterProgram):
(WebCore::StandardFilterProgram::create):
(WebCore::StandardFilterProgram::prepare):
(WebCore::TextureMapperShaderManager::getShaderForFilter):
* platform/graphics/texmap/TextureMapperShaderManager.h:
(WebCore::TextureMapperShaderProgram::id):
(WebCore::TextureMapperShaderProgram::vertexAttrib):
(TextureMapperShaderProgram):
(WebCore::TextureMapperShaderProgram::matrixLocation):
(WebCore::TextureMapperShaderProgram::flipLocation):
(WebCore::TextureMapperShaderProgram::textureSizeLocation):
(WebCore::TextureMapperShaderProgram::sourceTextureLocation):
(WebCore::TextureMapperShaderProgram::maskTextureLocation):
(WebCore::TextureMapperShaderProgram::opacityLocation):
(WebCore::TextureMapperShaderProgram::isValidUniformLocation):
(StandardFilterProgram):
(WebCore::StandardFilterProgram::vertexAttrib):
(WebCore::StandardFilterProgram::texCoordAttrib):
(WebCore::StandardFilterProgram::textureUniform):
(WebCore::TextureMapperShaderProgramSimple::create):
(TextureMapperShaderProgramSimple):
(WebCore::TextureMapperShaderProgramRectSimple::create):
(TextureMapperShaderProgramRectSimple):
(WebCore::TextureMapperShaderProgramOpacityAndMask::create):
(TextureMapperShaderProgramOpacityAndMask):
(WebCore::TextureMapperShaderProgramRectOpacityAndMask::create):
(TextureMapperShaderProgramRectOpacityAndMask):
(WebCore::TextureMapperShaderProgramSolidColor::create):
(WebCore::TextureMapperShaderProgramSolidColor::colorLocation):
(TextureMapperShaderProgramSolidColor):
(WebCore::TextureMapperShaderProgramAntialiasingNoMask::create):
(WebCore::TextureMapperShaderProgramAntialiasingNoMask::expandedQuadVerticesInTextureCoordinatesLocation):
(WebCore::TextureMapperShaderProgramAntialiasingNoMask::expandedQuadEdgesInScreenSpaceLocation):
(TextureMapperShaderProgramAntialiasingNoMask):
(WebCore::TextureMapperShaderManager::TextureMapperShaderManager):
(TextureMapperShaderManager):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127063 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[chromium] Remove HUD layer when rootLayer is set to null
https://bugs.webkit.org/show_bug.cgi?id=95257

Reviewed by James Robinson.

Source/WebCore:

When the rootLayer changes, remove the HUD layer from the old
root layer immediately. Then, during commit, set the hud layer
on the impl side only if there is a HUD layer present, and if
there is a rootLayer present for it to be a child of.

Tests: CCHudWithRootLayerChange

* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::finishCommitOnImplThread):
(WebCore::CCLayerTreeHost::willCommit):
(WebCore::CCLayerTreeHost::setRootLayer):
* platform/graphics/chromium/cc/CCLayerTreeHost.h:
(WebCore::CCLayerTreeHost::hudLayer):
(CCLayerTreeHost):

Source/WebKit/chromium:

* WebKit.gypi:
* tests/CCHeadsUpDisplayTest.cpp: Added.
(CCHeadsUpDisplayTest):
(DrawsContentLayerChromium):
(DrawsContentLayerChromium::create):
(DrawsContentLayerChromium::DrawsContentLayerChromium):
(CCHudWithRootLayerChange):
(CCHudWithRootLayerChange::CCHudWithRootLayerChange):
(TEST_F):
* tests/CCLayerTreeHostTest.cpp:
* tests/CCThreadedTest.cpp:
(WebKitTests::CCThreadedTest::runTest):
* tests/CCThreadedTest.h:
(WebKitTests::CCThreadedTest::initializeSettings):
(CCThreadedTest):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127064 268f45cc-cd09-0410-ab3c-d52691b4dbfc
       Unreviewed rebaseline after r127035

       Updated base expectations:
       * platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.txt:
       * platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.txt:
       * platform/chromium-mac/media/track/track-cue-rendering-vertical-expected.txt:
       * platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.txt:
* platform/chromium-win/media/track/track-cue-rendering-vertical-expected.txt:

Removed unnecessary expectations:
* platform/chromium-mac-snowleopard/media/track/track-cue-rendering-horizontal-expected.txt: Removed.
* platform/chromium-mac-snowleopard/media/track/track-cue-rendering-vertical-expected.txt: Removed.

Updated expectations and added mime types:
* platform/chromium-linux/media/track/track-cue-rendering-horizontal-expected.png: Added property svn:mime-type.
* platform/chromium-linux/media/track/track-cue-rendering-vertical-expected.png: Added property svn:mime-type.
* platform/chromium-mac-snowleopard/media/track/track-cue-rendering-horizontal-expected.png: Added property svn:mime-type.
* platform/chromium-mac-snowleopard/media/track/track-cue-rendering-vertical-expected.png: Added property svn:mime-type.
* platform/chromium-mac/media/track/track-cue-rendering-horizontal-expected.png: Added property svn:mime-type.
* platform/chromium-win-xp/media/track/track-cue-rendering-vertical-expected.png: Added property svn:mime-type.
* platform/chromium-win/media/track/track-cue-rendering-horizontal-expected.png: Added property svn:mime-type.
* platform/chromium-win/media/track/track-cue-rendering-vertical-expected.png: Added property svn:mime-type.

Updated TestExpectations:
* platform/chromium/TestExpectations:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127065 268f45cc-cd09-0410-ab3c-d52691b4dbfc