Skip to content

GitLab

W
webkit
Switch branch/tag
  1. 25 Feb, 2012 28 commits
  3. 24 Feb, 2012 12 commits
    • jamesr@google.com's avatar
      [chromium] Replace RefPtr with OwnPtr for CCLayerImpl tree structure · c5642a63
      jamesr@google.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=78404

Patch by Tien-Ren Chen <trchen@chromium.org> on 2012-02-24
Reviewed by James Robinson.

Source/WebCore:

No new tests. Updated existing test to reflect changes.

* platform/graphics/chromium/CanvasLayerChromium.cpp:
(WebCore::CanvasLayerChromium::createCCLayerImpl):
* platform/graphics/chromium/CanvasLayerChromium.h:
(CanvasLayerChromium):
* platform/graphics/chromium/LayerChromium.cpp:
(WebCore::LayerChromium::createCCLayerImpl):
* platform/graphics/chromium/LayerChromium.h:
(LayerChromium):
* platform/graphics/chromium/PluginLayerChromium.cpp:
(WebCore::PluginLayerChromium::createCCLayerImpl):
* platform/graphics/chromium/PluginLayerChromium.h:
(PluginLayerChromium):
* platform/graphics/chromium/SolidColorLayerChromium.cpp:
(WebCore::SolidColorLayerChromium::createCCLayerImpl):
* platform/graphics/chromium/SolidColorLayerChromium.h:
(SolidColorLayerChromium):
* platform/graphics/chromium/TiledLayerChromium.cpp:
(WebCore::TiledLayerChromium::createCCLayerImpl):
* platform/graphics/chromium/TiledLayerChromium.h:
(TiledLayerChromium):
* platform/graphics/chromium/TreeSynchronizer.cpp:
(WebCore::TreeSynchronizer::synchronizeTrees):
(WebCore::TreeSynchronizer::collectExistingCCLayerImplRecursive):
(WebCore):
(WebCore::TreeSynchronizer::reuseOrCreateCCLayerImpl):
(WebCore::TreeSynchronizer::synchronizeTreeRecursive):
* platform/graphics/chromium/TreeSynchronizer.h:
(TreeSynchronizer):
* platform/graphics/chromium/VideoLayerChromium.cpp:
(WebCore::VideoLayerChromium::createCCLayerImpl):
* platform/graphics/chromium/VideoLayerChromium.h:
(VideoLayerChromium):
* platform/graphics/chromium/cc/CCCanvasLayerImpl.h:
(WebCore::CCCanvasLayerImpl::create):
* platform/graphics/chromium/cc/CCDamageTracker.cpp:
(WebCore::CCDamageTracker::updateDamageTrackingState):
(WebCore::CCDamageTracker::trackDamageFromActiveLayers):
* platform/graphics/chromium/cc/CCDamageTracker.h:
(CCDamageTracker):
* platform/graphics/chromium/cc/CCLayerImpl.cpp:
(WebCore::CCLayerImpl::CCLayerImpl):
(WebCore::CCLayerImpl::addChild):
(WebCore::sortLayers):
(WebCore::CCLayerImpl::setMaskLayer):
(WebCore::CCLayerImpl::setReplicaLayer):
* platform/graphics/chromium/cc/CCLayerImpl.h:
(WebCore::CCLayerImpl::create):
(WebCore::CCLayerImpl::children):
(CCLayerImpl):
(WebCore):
* platform/graphics/chromium/cc/CCLayerIterator.cpp:
(WebCore):
(WebCore::CCLayerIteratorActions::BackToFront::begin):
(WebCore::CCLayerIteratorActions::BackToFront::end):
(WebCore::CCLayerIteratorActions::BackToFront::next):
(WebCore::CCLayerIteratorActions::FrontToBack::begin):
(WebCore::CCLayerIteratorActions::FrontToBack::end):
(WebCore::CCLayerIteratorActions::FrontToBack::next):
(WebCore::CCLayerIteratorActions::FrontToBack::goToHighestInSubtree):
* platform/graphics/chromium/cc/CCLayerIterator.h:
(WebCore):
(CCLayerIterator):
(WebCore::CCLayerIterator::begin):
(WebCore::CCLayerIterator::end):
(WebCore::CCLayerIterator::targetRenderSurfaceLayer):
(WebCore::CCLayerIterator::CCLayerIterator):
(WebCore::CCLayerIterator::getRawPtr):
(WebCore::CCLayerIterator::currentLayer):
(WebCore::CCLayerIterator::targetRenderSurfaceChildren):
(BackToFront):
(FrontToBack):
* platform/graphics/chromium/cc/CCLayerSorter.cpp:
(WebCore::CCLayerSorter::createGraphNodes):
* platform/graphics/chromium/cc/CCLayerSorter.h:
(CCLayerSorter):
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::finishCommitOnImplThread):
(WebCore::CCLayerTreeHost::didBecomeInvisibleOnImplThread):
(WebCore::CCLayerTreeHost::reserveTextures):
(WebCore::CCLayerTreeHost::paintLayerContents):
(WebCore::CCLayerTreeHost::updateCompositorResources):
* platform/graphics/chromium/cc/CCLayerTreeHostCommon.cpp:
(WebCore):
(WebCore::calculateDrawTransformsAndVisibilityInternal):
(WebCore::walkLayersAndCalculateVisibleLayerRects):
(WebCore::CCLayerTreeHostCommon::calculateDrawTransformsAndVisibility):
* platform/graphics/chromium/cc/CCLayerTreeHostCommon.h:
(CCLayerTreeHostCommon):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::CCLayerTreeHostImpl):
(WebCore::CCLayerTreeHostImpl::trackDamageForAllSurfaces):
(WebCore::CCLayerTreeHostImpl::calculateRenderPasses):
(WebCore::CCLayerTreeHostImpl::drawLayers):
(WebCore::CCLayerTreeHostImpl::setRootLayer):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
(CCLayerTreeHostImpl):
(WebCore::CCLayerTreeHostImpl::releaseRootLayer):
(WebCore::CCLayerTreeHostImpl::scrollLayer):
* platform/graphics/chromium/cc/CCPluginLayerImpl.h:
(WebCore::CCPluginLayerImpl::create):
* platform/graphics/chromium/cc/CCRenderSurface.h:
(WebCore::CCRenderSurface::layerList):
(CCRenderSurface):
* platform/graphics/chromium/cc/CCSolidColorLayerImpl.h:
(WebCore::CCSolidColorLayerImpl::create):
* platform/graphics/chromium/cc/CCTiledLayerImpl.h:
(WebCore::CCTiledLayerImpl::create):
* platform/graphics/chromium/cc/CCVideoLayerImpl.h:
(WebCore::CCVideoLayerImpl::create):

Source/WebKit/chromium:

* tests/CCDamageTrackerTest.cpp:
(WebKitTests::executeCalculateDrawTransformsAndVisibility):
(WebKitTests::emulateDrawingOneFrame):
(WebKitTests::createTestTreeWithOneSurface):
(WebKitTests::createTestTreeWithTwoSurfaces):
(WebKitTests::createAndSetUpTestTreeWithOneSurface):
(WebKitTests::createAndSetUpTestTreeWithTwoSurfaces):
(WebKitTests::TEST_F):
* tests/CCLayerImplTest.cpp:
(WebCore::TEST):
* tests/CCLayerIteratorTest.cpp:
* tests/CCLayerSorterTest.cpp:
(WebCore::TEST):
* tests/CCLayerTreeHostCommonTest.cpp:
(WebCore::TEST):
* tests/CCLayerTreeHostImplTest.cpp:
(WebKit::CCLayerTreeHostImplTest::setupScrollAndContentsLayers):
(WebKit::TEST_F):
(WebKit::DidDrawCheckLayer::create):
(WebKit::BlendStateCheckLayer::create):
* tests/CCRenderSurfaceTest.cpp:
(WebCore::TEST):
* tests/CCSolidColorLayerImplTest.cpp:
(CCLayerTestCommon::TEST):
* tests/CCTiledLayerImplTest.cpp:
(CCLayerTestCommon::createLayer):
(CCLayerTestCommon::TEST):
(CCLayerTestCommon::getQuads):
* tests/Canvas2DLayerChromiumTest.cpp:
(WebCore::Canvas2DLayerChromiumTest::fullLifecycleTest):
* tests/TiledLayerChromiumTest.cpp:
(WTF::TEST):
* tests/TreeSynchronizerTest.cpp:
(WebKitTests::MockCCLayerImpl::create):
(WebKitTests::MockLayerChromium::createCCLayerImpl):
(WebKitTests::expectTreesAreIdentical):
(WebKitTests::TEST):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      c5642a63
    • kling@webkit.org's avatar
      Don't pass constant strings to CSSParser for presentation attributes. · 426642ff
      kling@webkit.org authored 
      <http://webkit.org/b/79530>

Reviewed by Anders Carlsson.

"both" -> CSSValueBoth.
"center" -> CSSValueCenter.

* html/HTMLBRElement.cpp:
(WebCore::HTMLBRElement::collectStyleForAttribute):
* html/HTMLElement.cpp:
(WebCore::HTMLElement::collectStyleForAttribute):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108885 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      426642ff
    • enne@google.com's avatar
      Unreviewed, rename mispelled expectation files. · 90b96b73
      enne@google.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=79457

WebKit is no abode for poor spelling.

* fast/images/rgb-jpeg-with-adobe-marker-only-expected.txt: Renamed from LayoutTests/fast/images/rgb-jpeg-with-abode-marker-only-expected.txt.
* fast/images/rgb-jpeg-with-adobe-marker-only.html: Renamed from LayoutTests/fast/images/rgb-jpeg-with-abode-marker-only.html.
* platform/chromium-mac-snowleopard/fast/images/rgb-jpeg-with-adobe-marker-only-expected.png: Renamed from LayoutTests/platform/chromium-mac-snowleopard/fast/images/rgb-jpeg-with-abode-marker-only-expected.png.
* platform/chromium-mac-snowleopard/fast/images/rgb-jpeg-with-adobe-marker-only-expected.txt: Renamed from LayoutTests/platform/chromium-mac-snowleopard/fast/images/rgb-jpeg-with-abode-marker-only-expected.txt.
* platform/mac-snowleopard/fast/images/rgb-jpeg-with-adobe-marker-only-expected.png: Renamed from LayoutTests/platform/mac-snowleopard/fast/images/rgb-jpeg-with-abode-marker-only-expected.png.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108884 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      90b96b73
    • jamesr@google.com's avatar
      [chromium] Make WebViewImpl depend on WebLayerTreeView instead of CCLayerTreeHost · 34c89f0e
      jamesr@google.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=75591

Reviewed by Kenneth Russell.

This converts WebViewImpl from depending on CCLayerTreeHost to WebLayerTreeView in order to provide better
isolation and allow for future refactorings. The changes to WebViewImpl are mostly mechanical. The
WebLayerTreeView and WebLayerTreeViewClient interfaces have both grown and changed slightly:

- Setup path for WebLayerTreeView changed to expose an initialize() function instead of a create() factory
function. The new model is that a WebLayerTreeView when constructed is in a null state. Calling initialize()
attempts to re-initialize the WLTV, which can either fail or succeed.  All other functions must be called on a
successfully initialized view.

- WebLayerTreeView expanded to include functionality that CCLayerTreeHost exposes but WebLayerTreeView did not.
Some of this is only valid for the single thread case and will be removed when we invert the scheduling control
logic, these bits are commented.

- WebLayerTreeViewClient expanded with some flow-control related APIs.

Refactor only, no change in behavior.

* public/platform/WebLayerTreeView.h:
(WebKit::WebLayerTreeView::Settings::Settings):
(WebKit::WebLayerTreeView::isNull):
* public/platform/WebLayerTreeViewClient.h:
* src/ChromeClientImpl.cpp:
(WebKit::ChromeClientImpl::scheduleCompositingLayerSync):
* src/WebLayerTreeView.cpp:
(WebKit::WebLayerTreeView::initialize):
(WebKit::WebLayerTreeView::compositorIdentifier):
(WebKit::WebLayerTreeView::setVisible):
(WebKit::WebLayerTreeView::setNeedsAnimate):
(WebKit::WebLayerTreeView::updateAnimations):
(WebKit::WebLayerTreeView::setNeedsRedraw):
(WebKit::WebLayerTreeView::setPageScaleFactorAndLimits):
(WebKit::WebLayerTreeView::startPageScaleAnimation):
(WebKit::WebLayerTreeView::finishAllRendering):
(WebKit::WebLayerTreeView::context):
(WebKit::WebLayerTreeView::loseCompositorContext):
* src/WebLayerTreeViewImpl.cpp:
(WebKit::WebLayerTreeViewImpl::didRecreateGraphicsContext):
(WebKit::WebLayerTreeViewImpl::didCommitAndDrawFrame):
(WebKit::WebLayerTreeViewImpl::didCompleteSwapBuffers):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::animate):
(WebKit::WebViewImpl::doPixelReadbackToCanvas):
(WebKit::WebViewImpl::paint):
(WebKit::WebViewImpl::composite):
(WebKit::WebViewImpl::loseCompositorContext):
(WebKit::WebViewImpl::computePageScaleFactorLimits):
(WebKit::WebViewImpl::addPageOverlay):
(WebKit::WebViewImpl::removePageOverlay):
(WebKit::WebViewImpl::setRootGraphicsLayer):
(WebKit::WebViewImpl::scheduleCompositingLayerSync):
(WebKit::WebViewImpl::scrollRootLayerRect):
(WebKit::WebViewImpl::invalidateRootLayerRect):
(WebKit::WebViewImpl::scheduleAnimation):
(WebKit::WebViewImpl::setIsAcceleratedCompositingActive):
(WebKit::WebViewImpl::createContext3D):
(WebKit::WebViewImpl::applyScrollAndScale):
(WebKit::WebViewImpl::didRebindGraphicsContext):
(WebKit::WebViewImpl::updateLayerTreeViewport):
(WebKit::WebViewImpl::graphicsContext3D):
(WebKit::WebViewImpl::setVisibilityState):
* src/WebViewImpl.h:
* tests/WebLayerTest.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108883 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      34c89f0e
    • yael.aharon@nokia.com's avatar
      [Texmap] Add const-ness to TextureMapperShaderManager · 156f9ba5
      yael.aharon@nokia.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=79545

Reviewed by Noam Rosenthal.

Add const to new methods.
No new tests.

* platform/graphics/texmap/TextureMapperShaderManager.cpp:
(WebCore::TextureMapperShaderProgramSimple::vertexShaderSource):
(WebCore::TextureMapperShaderProgramSimple::fragmentShaderSource):
(WebCore::TextureMapperShaderProgramOpacityAndMask::vertexShaderSource):
(WebCore::TextureMapperShaderProgramOpacityAndMask::fragmentShaderSource):
* platform/graphics/texmap/TextureMapperShaderManager.h:
(WebCore::TextureMapperShaderProgram::matrixVariable):
(WebCore::TextureMapperShaderProgram::sourceMatrixVariable):
(WebCore::TextureMapperShaderProgram::sourceTextureVariable):
(WebCore::TextureMapperShaderProgram::opacityVariable):
(TextureMapperShaderProgram):
(TextureMapperShaderProgramSimple):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskMatrixVariable):
(WebCore::TextureMapperShaderProgramOpacityAndMask::maskTextureVariable):
(TextureMapperShaderProgramOpacityAndMask):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108882 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      156f9ba5
    • tsepez@chromium.org's avatar
      XSS Auditor targeting legitimate frames as false positives. · 8bf71931
      tsepez@chromium.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=79397

Reviewed by Adam Barth.

Source/WebCore:

Test: http/tests/security/xssAuditor/script-tag-safe4.html

* html/parser/XSSAuditor.cpp:
(WebCore::XSSAuditor::filterCharacterToken):
(WebCore::XSSAuditor::filterScriptToken):
(WebCore::XSSAuditor::filterObjectToken):
(WebCore::XSSAuditor::filterEmbedToken):
(WebCore::XSSAuditor::filterAppletToken):
(WebCore::XSSAuditor::filterIframeToken):
(WebCore::XSSAuditor::decodedSnippetForToken):
(WebCore):
(WebCore::XSSAuditor::decodedSnippetForName):
(WebCore::XSSAuditor::decodedSnippetForAttribute):
(WebCore::XSSAuditor::decodedSnippetForJavascript):
(WebCore::XSSAuditor::isContainedInRequest):
(WebCore::XSSAuditor::isSameOriginResource):
* html/parser/XSSAuditor.h:

LayoutTests:

* http/tests/security/xssAuditor/resources/script-tag-safe4-frame.html: Added.
* http/tests/security/xssAuditor/script-tag-safe4-expected.txt: Added.
* http/tests/security/xssAuditor/script-tag-safe4.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      8bf71931
    • commit-queue@webkit.org's avatar
      [chromium] Plumb animation started notifications from CCLayerTreeHost to GraphicsLayerChromium · 1d3e800d
      commit-queue@webkit.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=77646

Patch by Ian Vollick <vollick@chromium.org> on 2012-02-24
Reviewed by James Robinson.

Source/WebCore:

* WebCore.gypi:
* platform/graphics/chromium/GraphicsLayerChromium.cpp:
(std):
(WebCore::GraphicsLayerChromium::~GraphicsLayerChromium):
(WebCore::GraphicsLayerChromium::addAnimation):
(WebCore::GraphicsLayerChromium::pauseAnimation):
(WebCore::GraphicsLayerChromium::removeAnimation):
(WebCore::GraphicsLayerChromium::suspendAnimations):
(WebCore::GraphicsLayerChromium::resumeAnimations):
(WebCore::GraphicsLayerChromium::updateLayerPreserves3D):
(WebCore::GraphicsLayerChromium::mapAnimationNameToId):
(WebCore):
(WebCore::GraphicsLayerChromium::notifyAnimationStarted):
(WebCore::GraphicsLayerChromium::notifyAnimationFinished):
* platform/graphics/chromium/GraphicsLayerChromium.h:
(GraphicsLayerChromium):
* platform/graphics/chromium/LayerChromium.cpp:
(WebCore::LayerChromium::LayerChromium):
(WebCore::LayerChromium::setAnimationEvent):
(WebCore):
* platform/graphics/chromium/LayerChromium.h:
(WebCore):
(LayerChromium):
(WebCore::LayerChromium::setLayerAnimationDelegate):
* platform/graphics/chromium/cc/CCAnimationEvents.cpp: Added.
(WebCore):
(WebCore::CCAnimationEvent::CCAnimationEvent):
(WebCore::CCAnimationEvent::~CCAnimationEvent):
(WebCore::CCAnimationEvent::toAnimationStartedEvent):
(WebCore::CCAnimationEvent::toAnimationFinishedEvent):
(WebCore::CCAnimationStartedEvent::create):
(WebCore::CCAnimationStartedEvent::CCAnimationStartedEvent):
(WebCore::CCAnimationStartedEvent::~CCAnimationStartedEvent):
(WebCore::CCAnimationStartedEvent::type):
(WebCore::CCAnimationFinishedEvent::create):
(WebCore::CCAnimationFinishedEvent::CCAnimationFinishedEvent):
(WebCore::CCAnimationFinishedEvent::~CCAnimationFinishedEvent):
(WebCore::CCAnimationFinishedEvent::type):
* platform/graphics/chromium/cc/CCAnimationEvents.h:
(WebCore):
(CCAnimationEvent):
(WebCore::CCAnimationEvent::layerId):
(CCAnimationStartedEvent):
(WebCore::CCAnimationStartedEvent::startTime):
(CCAnimationFinishedEvent):
(WebCore::CCAnimationFinishedEvent::animationId):
* platform/graphics/chromium/cc/CCLayerAnimationControllerImpl.cpp:
(WebCore::CCLayerAnimationControllerImpl::animate):
(WebCore::CCLayerAnimationControllerImpl::startAnimationsWaitingForNextTick):
(WebCore::CCLayerAnimationControllerImpl::startAnimationsWaitingForStartTime):
(WebCore::CCLayerAnimationControllerImpl::startAnimationsWaitingForTargetAvailability):
(WebCore::CCLayerAnimationControllerImpl::purgeFinishedAnimations):
(WebCore::CCLayerAnimationControllerImpl::tickAnimations):
* platform/graphics/chromium/cc/CCLayerAnimationControllerImpl.h:
(CCLayerAnimationControllerImpl):
* platform/graphics/chromium/cc/CCLayerAnimationDelegate.h: Copied from Source/WebCore/platform/graphics/chromium/cc/CCAnimationEvents.h.
(WebCore):
(CCLayerAnimationDelegate):
* platform/graphics/chromium/cc/CCLayerTreeHost.cpp:
(WebCore::CCLayerTreeHost::setAnimationEvents):
(WebCore::CCLayerTreeHost::setAnimationEventsRecursive):
(WebCore):
* platform/graphics/chromium/cc/CCLayerTreeHost.h:

Source/WebKit/chromium:

* tests/CCLayerTreeHostTest.cpp:
(TestHooks):
(WTF::TestHooks::notifyAnimationStarted):
(WTF::TestHooks::notifyAnimationFinished):
(WTF::MockLayerTreeHost::create):
(WTF::CCLayerTreeHostTestAddAnimation::CCLayerTreeHostTestAddAnimation):
(WTF::CCLayerTreeHostTestAddAnimation::animateLayers):
(WTF::CCLayerTreeHostTestAddAnimation::notifyAnimationStarted):
(CCLayerTreeHostTestAddAnimation):
(WTF::CCLayerTreeHostTestAddAnimation::notifyAnimationFinished):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108880 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1d3e800d
    • darin@chromium.org's avatar
      Add watchlist for ChromiumPlatformApi matching Source/Platform/chromium/public/ · d9bc9337
      darin@chromium.org authored 
      Reviewed by James Robinson.

* Scripts/webkitpy/common/config/watchlist:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108879 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      d9bc9337
    • inferno@chromium.org's avatar
      Regression(r107477): Crash in StaticNodeList::itemWithName. · 4b743b41
      inferno@chromium.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=79532

Reviewed by Andreas Kling.

Source/WebCore:

Make sure that node is an element node before checking its id attribute.

Test: fast/mutation/mutation-callback-non-element-crash.html

* dom/StaticNodeList.cpp:
(WebCore::StaticNodeList::itemWithName):

LayoutTests:

* fast/mutation/mutation-callback-non-element-crash-expected.txt: Added.
* fast/mutation/mutation-callback-non-element-crash.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      4b743b41
    • jamesr@google.com's avatar
      [chromium] WebKit::setColorNames is a client API · 2989da64
      jamesr@google.com authored 
      https://bugs.webkit.org/show_bug.cgi?id=79539

Reviewed by Darin Fisher.

Source/Platform:

* Platform.gypi:
* chromium/public/WebColor.h:
(WebKit):

Source/WebKit/chromium:

* WebKit.gyp:
* public/WebColorName.h: Renamed from Source/Platform/chromium/public/WebColorName.h.
(WebKit):
* public/platform/WebColorName.h:
* src/WebColor.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108877 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      2989da64
    • tony@chromium.org's avatar
      More refactoring in RenderFlexibleBox · 1e800860
      tony@chromium.org authored 
      https://bugs.webkit.org/show_bug.cgi?id=79533

Reviewed by Ojan Vafai.

No new tests, just refactoring.

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutFlexItems): Move the flipping of RTL+column positions to its own method.
This might be a tiny bit slower, but it's clearer since it's not related to alignment.
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren): Move the logical height calculation out of the loop.  We only need the final height.
(WebCore::RenderFlexibleBox::alignChildren):
(WebCore::RenderFlexibleBox::flipForRightToLeftColumn):
* rendering/RenderFlexibleBox.h:
(RenderFlexibleBox):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108876 268f45cc-cd09-0410-ab3c-d52691b4dbfc
      1e800860
    • inferno@chromium.org's avatar
      Positioned objects not cleared when moving children · 2a68e0d9
      inferno@chromium.org authored 
      to clone block in multi-column layout.
https://bugs.webkit.org/show_bug.cgi?id=78416

Reviewed by Eric Seidel.

Source/WebCore:

Test: fast/multicol/span/positioned-child-not-removed-crash.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::splitBlocks):

LayoutTests:

* fast/multicol/span/positioned-child-not-removed-crash-expected.txt: Added.
* fast/multicol/span/positioned-child-not-removed-crash.html: Added.


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