Timeline



Nov 28, 2011:

11:59 PM Changeset in webkit [101335] by dgrogan@chromium.org
  • 7 edits
    2 adds in trunk/Source

WebWorkerRunLoop wrapper around WorkerRunLoop
https://bugs.webkit.org/show_bug.cgi?id=71757

Source/WebCore:

Reviewed by Darin Fisher.

No new tests - IndexedDB tests forthcoming.

  • platform/chromium/PlatformSupport.h: Add two methods that allow

WebCore to notify chromium when workers start and stop.

  • workers/WorkerThread.cpp:

(WebCore::WorkerThread::workerThread): Call into PlatformSupport when
the worker's runloop is started and stopped.

Source/WebKit/chromium:

This allows the embedder to post tasks to webcore-created worker
threads. WebWorkerRunLoop is a thin wrapper that just holds a
WorkerRunLoop*. As such, it is not heap allocated and can be copied.

Reviewed by Darin Fisher.

  • WebKit.gyp: Added WebWorkerRunLoop.{cpp,h}
  • public/WebWorkerRunLoop.h: Added. Interface the embedder will use to

post Tasks to worker threads created in WebCore.
(WebKit::WebWorkerRunLoop::Task::~Task):
(WebKit::operator==): These are the operators necessary to allow
WebWorkerRunLoop to be used as a key in a std::map using the value of
the underlying WebCore::WorkerRunLoop* for the meaningful comparisons.
(WebKit::operator<):

  • public/platform/WebKitPlatformSupport.h: Stubs for the embedder to

implement.
(WebKit::WebKitPlatformSupport::didStartWorkerRunLoop):
(WebKit::WebKitPlatformSupport::didStopWorkerRunLoop):

  • src/PlatformSupport.cpp: Wrap incoming WorkerRunLoop objects in

WebWorkerRunLoopImpl objects, forward them to WebKitPlatformSupport.
(WebCore::PlatformSupport::didStartWorkerRunLoop):
(WebCore::PlatformSupport::didStopWorkerRunLoop):

  • src/WebWorkerRunLoop.cpp: Added.

(WebKit::WebWorkerRunLoop::WebWorkerRunLoop): Store incoming
WorkerRunLoop pointer.
(WebKit::WebWorkerRunLoop::postTask): Wrap incoming Task in
ScriptExecutionContext::Task, post to stored WorkerRunLoop.
(WebKit::WebWorkerRunLoop::equals): Support for the operators mentioned
above.
(WebKit::WebWorkerRunLoop::lessThan): Ditto.

11:57 PM Changeset in webkit [101334] by fpizlo@apple.com
  • 2 edits in trunk/Source/JavaScriptCore

DFG debugCall() mechanism only works on X86 and X86-64
https://bugs.webkit.org/show_bug.cgi?id=73282

Reviewed by Oliver Hunt.

  • dfg/DFGAssemblyHelpers.h:

(JSC::DFG::AssemblyHelpers::debugCall):

11:55 PM Changeset in webkit [101333] by Alexandru Chiculita
  • 3 edits
    6 adds in trunk

[CSS Filters] Filters do not render correctly when the layer has a transform
https://bugs.webkit.org/show_bug.cgi?id=73077

Reviewed by Dean Jackson.

Source/WebCore:

Corrected the root layer that was used when no transform was applied.
Using PaintLayerAppliedTransform when calling paintLayer again, to avoid
applying the transform inside the filter's graphics context. Now we apply that
on the result image.

Tests: css3/filters/filter-with-transform.html

css3/filters/nested-filter.html

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paintLayer):

LayoutTests:

  • css3/filters/filter-with-transform-expected.png: Added.
  • css3/filters/filter-with-transform-expected.txt: Added.
  • css3/filters/filter-with-transform.html: Added.
  • css3/filters/nested-filter-expected.png: Added.
  • css3/filters/nested-filter-expected.txt: Added.
  • css3/filters/nested-filter.html: Added.
11:44 PM Changeset in webkit [101332] by fpizlo@apple.com
  • 2 edits in trunk/Source/JavaScriptCore

DFG non-X86 ArithDiv does speculation failure after mutating state,
without a value recovery
https://bugs.webkit.org/show_bug.cgi?id=73286

Reviewed by Gavin Barraclough.

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

11:39 PM Changeset in webkit [101331] by commit-queue@webkit.org
  • 1 edit
    3 adds in trunk/Source/WebCore

[blackberry] Upstream BlackBerry porting of plugin framework
https://bugs.webkit.org/show_bug.cgi?id=73185

Patch by Wei Charles <charles.wei@torchmobile.com.cn> on 2011-11-28
Reviewed by Daniel Bates.

No new tests for now.

  • plugins/blackberry: Added.
  • plugins/blackberry/PluginDataBlackBerry.cpp: Added.
  • plugins/blackberry/PluginPackageBlackBerry.cpp: Added.
11:36 PM Changeset in webkit [101330] by Csaba Osztrogonác
  • 2 edits in trunk/Tools

[Qt][WK2] Unreviewed buildfix after r101307.

  • qmake/mkspecs/features/webkit2.prf: Add missing includepath.
10:36 PM Changeset in webkit [101329] by noel.gordon@gmail.com
  • 2 edits in trunk/Source/WebCore

[chromium] Remove V8MessagePortCustom.h from the gyp projects
https://bugs.webkit.org/show_bug.cgi?id=73281

Reviewed by David Levin.

V8MessagePortCustom.h was removed in r101118

  • WebCore.gypi: remove bindings\v8\custom\V8MessagePortCustom.h
10:33 PM Changeset in webkit [101328] by leo.yang@torchmobile.com.cn
  • 1 edit
    3 adds in trunk/Source/WebCore

Upstream the BlackBerry porting of SocketStream
https://bugs.webkit.org/show_bug.cgi?id=73283

Reviewed by Daniel Bates.

Other main contributors:
Joe Mason <jmason@rim.com>
Lyon Chen <liachen@rim.com>

Initial upstream, can't be built yet, no new tests.

  • platform/network/blackberry/SocketStreamError.h: Added.

(WebCore::SocketStreamError::SocketStreamError):

  • platform/network/blackberry/SocketStreamHandle.h: Added.

(WebCore::SocketStreamHandle::create):

  • platform/network/blackberry/SocketStreamHandleBlackBerry.cpp: Added.

(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::~SocketStreamHandle):
(WebCore::SocketStreamHandle::platformSend):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::didReceiveAuthenticationChallenge):
(WebCore::SocketStreamHandle::receivedCredential):
(WebCore::SocketStreamHandle::receivedRequestToContinueWithoutCredential):
(WebCore::SocketStreamHandle::receivedCancellation):
(WebCore::SocketStreamHandle::notifyStatusReceived):
(WebCore::SocketStreamHandle::notifyDataReceived):
(WebCore::SocketStreamHandle::notifyReadyToSendData):
(WebCore::SocketStreamHandle::notifyClose):

10:25 PM Changeset in webkit [101327] by commit-queue@webkit.org
  • 2 edits in trunk/Source/WebCore

Size of ResourceRequestBase could be reduced by using bitfields.
https://bugs.webkit.org/show_bug.cgi?id=73271

Patch by Yongjun Zhang <yongjun_zhang@apple.com> on 2011-11-28
Reviewed by Alexey Proskuryakov.

Add bitfield for bool members in ResourceRequestBase to reduce its memory size.

  • platform/network/ResourceRequestBase.h:
10:21 PM Changeset in webkit [101326] by yutak@chromium.org
  • 3 edits
    3 adds in trunk

WebSocket: Split Hixie76 length-prefixed frames aren't handled correctly
https://bugs.webkit.org/show_bug.cgi?id=68522

Reviewed by Kent Tamura.

Source/WebCore:

Test: http/tests/websocket/tests/hixie76/split-binary-frame-header.html

  • websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::processFrameHixie76):
Do not consume the data if the length field is not finished.

LayoutTests:

  • http/tests/websocket/tests/hixie76/split-binary-frame-header-expected.txt: Added.
  • http/tests/websocket/tests/hixie76/split-binary-frame-header.html: Added.
  • http/tests/websocket/tests/hixie76/split-binary-frame-header_wsh.py:

Added. Send WebSocket frames that older WebSocketChannel implementation fails to parse.
The client should not receive an empty text message.

9:14 PM Changeset in webkit [101325] by senorblanco@chromium.org
  • 7 edits
    1 add in trunk

[chromium] Fix SVG filters when running in accelerated drawing mode.
https://bugs.webkit.org/show_bug.cgi?id=73249

Reviewed by Kenneth Russell.

Source/WebCore:

Test: platform/chromium/compositing/accelerated-drawing/svg-filters.html

  • platform/graphics/chromium/LayerTextureUpdaterCanvas.cpp:

(WebCore::LayerTextureUpdaterSkPicture::prepareToUpdate):
When doing accelerated drawing, mark the PlatformContextSkia as
deferred.

  • platform/graphics/skia/ImageBufferSkia.cpp:

(WebCore::drawNeedsCopy):
When doing a cross-context draw, if the destination context is
deferred, copy the image. Also refactor conditions under which the
image is copied into a new function.
(WebCore::ImageBuffer::draw):
(WebCore::ImageBuffer::drawPattern):
Use the refactored function for conditional copies.

  • platform/graphics/skia/PlatformContextSkia.cpp:

(WebCore::PlatformContextSkia::PlatformContextSkia):

  • platform/graphics/skia/PlatformContextSkia.h:

(WebCore::PlatformContextSkia::isDeferred):
(WebCore::PlatformContextSkia::setDeferred):
Add m_isDeferred flag, initializer and accessors.

LayoutTests:

  • platform/chromium/compositing/accelerated-drawing/svg-filters.html: Added.

New test to check SVG filters in accelerated drawing.

  • platform/chromium/test_expectations.txt:

Suppress test failures for new test until we get baselines.

8:59 PM Changeset in webkit [101324] by fpizlo@apple.com
  • 3 edits in trunk/Source/JavaScriptCore

Unreviewed build fixes for ARM.

  • assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::readCallTarget):

  • dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::setupArgumentsWithExecState):

8:51 PM Changeset in webkit [101323] by rolandsteiner@chromium.org
  • 18 edits in trunk

<style scoped>: add ENABLE(STYLE_SCOPED) flag to WebKit
https://bugs.webkit.org/show_bug.cgi?id=72848

.:

Add flag and description.

Reviewed by Dimitri Glazkov.

  • configure.ac:

Source/JavaScriptCore:

Add ENABLE_STYLE_SCOPED flag.

Reviewed by Dimitri Glazkov.

  • Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Reviewed by Dimitri Glazkov.

No new tests. (no code)

  • Configurations/FeatureDefines.xcconfig:
  • GNUmakefile.am:

Source/WebKit/chromium:

Reviewed by Dimitri Glazkov.

  • features.gypi:

Source/WebKit/mac:

Reviewed by Dimitri Glazkov.

  • Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

Reviewed by Dimitri Glazkov.

  • Configurations/FeatureDefines.xcconfig:

Tools:

Add option to build-webkit.

Reviewed by Dimitri Glazkov.

  • Scripts/build-webkit:

WebKitLibraries:

Reviewed by Dimitri Glazkov.

  • win/tools/vsprops/FeatureDefines.vsprops:
  • win/tools/vsprops/FeatureDefinesCairo.vsprops:
8:34 PM Changeset in webkit [101322] by vangelis@chromium.org
  • 2 edits in trunk/Source/WebCore

[chromium] Disable compositing for RTL pages even in forceCompositingMode
https://bugs.webkit.org/show_bug.cgi?id=73195

Reviewed by James Robinson.

  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):

8:06 PM Changeset in webkit [101321] by rolandsteiner@chromium.org
  • 3 edits
    2 adds in trunk

From @keyframes rules with the same name, the last rule should be used
https://bugs.webkit.org/show_bug.cgi?id=73113

Source/WebCore:

Have later rules override previously stored rules.

Reviewed by Simon Fraser.

Test: animations/duplicated-keyframes-name.html

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::addKeyframeStyle):

LayoutTests:

Verify that the last @keyframe rule is used.

Reviewed by Simon Fraser.

  • animations/duplicated-keyframes-name-expected.txt: Added.
  • animations/duplicated-keyframes-name.html: Added.
7:48 PM Changeset in webkit [101320] by dgrogan@chromium.org
  • 2 edits in trunk/LayoutTests

js-test-pre: don't try to load stylesheet from a web worker
https://bugs.webkit.org/show_bug.cgi?id=73269

Reviewed by Ojan Vafai.

  • fast/js/resources/js-test-pre.js:
7:39 PM Changeset in webkit [101319] by commit-queue@webkit.org
  • 2 edits
    4 adds in trunk/Source/WebCore

Upstream BlackBerry porting of page.
https://bugs.webkit.org/show_bug.cgi?id=73143

Patch by Jacky Jiang <zhajiang@rim.com> on 2011-11-28
Reviewed by Daniel Bates.

Upstream BlackBerry porting of WebCore/page.
Define DragImageRef for BlackBerry platform.

Initial upstream, can't be built yet, no test cases.

  • page/blackberry/DragControllerBlackBerry.cpp: Added.

(WebCore::DragController::isCopyKeyDown):
(WebCore::DragController::maxDragImageSize):
(WebCore::DragController::cleanupAfterSystemDrag):
(WebCore::DragController::dragOperation):

  • page/blackberry/EventHandlerBlackBerry.cpp: Added.

(WebCore::EventHandler::eventActivatedView):
(WebCore::EventHandler::passMouseMoveEventToSubframe):
(WebCore::EventHandler::passMousePressEventToSubframe):
(WebCore::EventHandler::passMouseReleaseEventToSubframe):
(WebCore::EventHandler::passWheelEventToWidget):
(WebCore::EventHandler::passWidgetMouseDownEventToWidget):
(WebCore::EventHandler::tabsToAllFormControls):
(WebCore::EventHandler::accessKeyModifiers):
(WebCore::EventHandler::focusDocumentView):
(WebCore::EventHandler::createDraggingClipboard):

  • page/blackberry/FrameBlackBerry.cpp: Added.

(WebCore::Frame::dragImageForSelection):

  • platform/DragImage.h:
7:33 PM Changeset in webkit [101318] by commit-queue@webkit.org
  • 16 edits
    4 adds in trunk/Source

[chromium] Create CCDamageTracker class to determine regions of change for a surface.
https://bugs.webkit.org/show_bug.cgi?id=72520

Patch by Shawn Singh <shawnsingh@chromium.org> on 2011-11-28
Reviewed by James Robinson.

Source/WebCore:

Added CCDamageTrackerTest and updated other tests.

  • WebCore.gypi:
  • platform/graphics/chromium/LayerRendererChromium.cpp:

(WebCore::LayerRendererChromium::drawLayersOntoRenderSurfaces):
(WebCore::LayerRendererChromium::drawLayer):

  • platform/graphics/chromium/cc/CCDamageTracker.cpp: Added.

(WebCore::CCDamageTracker::create):
(WebCore::CCDamageTracker::CCDamageTracker):
(WebCore::CCDamageTracker::~CCDamageTracker):
(WebCore::CCDamageTracker::updateDamageRectForNextFrame):
(WebCore::CCDamageTracker::removeRectFromCurrentFrame):
(WebCore::CCDamageTracker::saveRectForNextFrame):
(WebCore::CCDamageTracker::computeDamageFromActiveLayers):
(WebCore::CCDamageTracker::computeDamageFromSurfaceMask):
(WebCore::CCDamageTracker::computeDamageFromLeftoverRects):
(WebCore::CCDamageTracker::extendDamageForLayer):
(WebCore::CCDamageTracker::extendDamageForRenderSurface):

  • platform/graphics/chromium/cc/CCDamageTracker.h: Added.

(WebCore::CCDamageTracker::currentDamageRect):

  • platform/graphics/chromium/cc/CCLayerImpl.cpp:

(WebCore::CCLayerImpl::resetAllChangeTrackingForSubtree):

  • platform/graphics/chromium/cc/CCLayerImpl.h:
  • platform/graphics/chromium/cc/CCLayerTreeHost.cpp:

(WebCore::CCLayerTreeHost::paintLayerContents):
(WebCore::CCLayerTreeHost::updateCompositorResources):

  • platform/graphics/chromium/cc/CCLayerTreeHost.h:

(WebCore::CCSettings::CCSettings):

  • platform/graphics/chromium/cc/CCLayerTreeHostCommon.h:

(WebCore::CCLayerTreeHostCommon::renderSurfaceContributesToTarget):

  • platform/graphics/chromium/cc/CCRenderSurface.cpp:

(WebCore::CCRenderSurface::CCRenderSurface):
(WebCore::CCRenderSurface::dumpSurface):
(WebCore::CCRenderSurface::surfacePropertyChangedOnlyFromDescendant):

  • platform/graphics/chromium/cc/CCRenderSurface.h:

(WebCore::CCRenderSurface::damageTracker):

Source/WebKit/chromium:

  • WebKit.gypi:
  • tests/CCDamageTrackerTest.cpp: Added.

(WebKitTests::executeCalculateDrawTransformsAndVisibility):
(WebKitTests::emulateDrawingOneFrame):
(WebKitTests::createTestTreeWithOneSurface):
(WebKitTests::createTestTreeWithTwoSurfaces):
(WebKitTests::createAndSetUpTestTreeWithOneSurface):
(WebKitTests::createAndSetUpTestTreeWithTwoSurfaces):
(WebKitTests::TEST_F):

  • tests/CCLayerImplTest.cpp:

(WebCore::TEST):

  • tests/CCLayerTreeHostCommonTest.cpp:

(WebCore::TEST):

  • tests/CCLayerTreeTestCommon.h: Added.
  • tests/CCRenderSurfaceTest.cpp:

(WebCore::TEST):

  • tests/LayerChromiumTest.cpp:
7:24 PM Changeset in webkit [101317] by macpherson@chromium.org
  • 4 edits in trunk/Source/WebCore

Implement CSSPropertySize in CSSStyleApplyProperty.
https://bugs.webkit.org/show_bug.cgi?id=73000

Reviewed by Andreas Kling.

This refactoring moves the implementation of the page size calculation into CSSStyleApplyProperty
and removes the existing code from CSSStyleSelector.

No new tests / refactoring only.

  • css/CSSStyleApplyProperty.cpp:

(WebCore::ApplyPropertyPageSize::mmLength):
(WebCore::ApplyPropertyPageSize::inchLength):
(WebCore::ApplyPropertyPageSize::pageSizeFromName):
(WebCore::ApplyPropertyPageSize::applyInheritValue):
(WebCore::ApplyPropertyPageSize::applyInitialValue):
(WebCore::ApplyPropertyPageSize::applyValue):
(WebCore::ApplyPropertyPageSize::createHandler):
(WebCore::CSSStyleApplyProperty::CSSStyleApplyProperty):

  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

  • css/CSSStyleSelector.h:
7:01 PM Changeset in webkit [101316] by jonlee@apple.com
  • 2 edits in trunk/Source/WebKit/chromium

Possible fix for test failures in r101307.

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl):

6:34 PM Changeset in webkit [101315] by timothy@apple.com
  • 2 edits in trunk/Source/WebCore

Add support for knowing when a TreeElement is added or changed anywhere in a TreeOutline.

Reviewed by Brian Weinstein.

  • inspector/front-end/treeoutline.js:

(TreeOutline.prototype.appendChild): Call onadd if it exists.
(TreeOutline.prototype.insertChild): Ditto.
(TreeOutline.prototype._treeElementDidChange): Added. Call onchange if it exists.
(TreeElement.prototype.set title): Call didChange.
(TreeElement.prototype.set titleHTML): Ditto.
(TreeElement.prototype.set tooltip): Ditto.
(TreeElement.prototype.set hasChildren): Ditto.
(TreeElement.prototype._fireDidChange): Added. Call TreeOutline._treeElementDidChange.
(TreeElement.prototype.didChange): Added. Schedule a timeout for _fireDidChange.
(TreeElement.prototype.expand): Move the code that sets the expanded flag to the beginning
which is before onpopulate. Since onpopulate can add elements and call onadd, this makes
sure the expanded flag is true before calling those functions.

6:34 PM Changeset in webkit [101314] by timothy@apple.com
  • 2 edits in trunk/Source/WebCore

Skip selecting TreeElements that are hidden when keyboard navigating.

We already skipped non-selectable tree elements in the common cases, this just makes selectable
take the hidden flag into account.

Reviewed by Brian Weinstein.

  • inspector/front-end/treeoutline.js:

(TreeOutline.prototype._treeKeyDown): Skip non-selectable elements when pressing Left or Right,
similar to what we already do when pressing Up and Down.
(TreeElement): Set _selectable to true.
(TreeElement.prototype.get selectable): Added. Return false when hidden.
(TreeElement.prototype.set selectable): Added. Set _selectable.
(TreeElement.prototype.traverseNextTreeElement): Renamed skipHidden to skipUnrevealed to prevent confusion with
the hidden property of TreeElement.
(TreeElement.prototype.traversePreviousTreeElement): Ditto.

6:34 PM Changeset in webkit [101313] by timothy@apple.com
  • 2 edits in trunk/Source/WebCore

Use classList instead of addStyleClass and removeStyleClass in TreeOutline.

https://webkit.org/b/72803

Reviewed by Dan Bernstein.

  • inspector/front-end/treeoutline.js:

(TreeOutline.prototype.appendChild):
(TreeOutline.prototype.insertChild):
(TreeElement.prototype.set hasChildren):
(TreeElement.prototype.set hidden):
(TreeElement.prototype._attach):
(TreeElement.prototype.collapse):
(TreeElement.prototype.expand):
(TreeElement.prototype.select):
(TreeElement.prototype.deselect):

6:17 PM Changeset in webkit [101312] by leo.yang@torchmobile.com.cn
  • 1 edit
    2 adds in trunk/Source/WebCore

Upstream platform/network/blackberry/AuthenticationChallenge.h
https://bugs.webkit.org/show_bug.cgi?id=73196

Reviewed by Daniel Bates.

This is the BlackBerry implementation of WebCore::AuthenticationChallenge.
Contributed by Torch Team.

Initial upstream, can't be built yet, no new tests.

  • platform/network/blackberry/AuthenticationChallenge.h: Added.

(WebCore::AuthenticationChallenge::AuthenticationChallenge):
(WebCore::AuthenticationChallenge::setStored):
(WebCore::AuthenticationChallenge::isStored):

5:38 PM Changeset in webkit [101311] by commit-queue@webkit.org
  • 2 edits in trunk/Source/WebCore

Synchronization problem in Canvas/WebGLRenderingContext when listener asks for image
https://bugs.webkit.org/show_bug.cgi?id=73228

Patch by Dana Jansens <danakj@chromium.org> on 2011-11-28
Reviewed by Kenneth Russell.

  • html/canvas/WebGLRenderingContext.cpp:

(WebCore::WebGLRenderingContext::markContextChanged):

5:31 PM Changeset in webkit [101310] by commit-queue@webkit.org
  • 3 edits in trunk/Source/WebCore

[MutationObservers] Fix build breakage after CSSInlineDeclaration refactor
https://bugs.webkit.org/show_bug.cgi?id=73243

Patch by Rafael Weinstein <rafaelw@chromium.org> on 2011-11-28
Reviewed by Ryosuke Niwa.

No tests needed. This patch only contains compile fixes.

  • css/CSSMutableStyleDeclaration.cpp:
5:25 PM Changeset in webkit [101309] by jonlee@apple.com
  • 2 edits in trunk/Source/WebCore

Fix Chromium bot build error related to b73253.

  • WebCore.gypi: Added missing references to NotificationController.
5:11 PM Changeset in webkit [101308] by commit-queue@webkit.org
  • 2 edits in trunk/LayoutTests

Suppressing a failing webgl conformance test on Mac.
https://bugs.webkit.org/show_bug.cgi?id=73148

Patch by Jeff Timanus <twiz@chromium.org> on 2011-11-28
Reviewed by Kenneth Russell.

  • platform/mac/Skipped:
5:08 PM Changeset in webkit [101307] by jonlee@apple.com
  • 59 edits
    21 adds in trunk/Source

Create skeleton framework for notifications support in WK2
https://bugs.webkit.org/show_bug.cgi?id=73253
<rdar://problem/10356943>

Source/JavaScriptCore:

  • Configurations/FeatureDefines.xcconfig: Split out ENABLE_NOTIFICATIONS based on platform.

Source/WebCore:

Reviewed by Sam Weinig.

Some refactoring was done to make notifications follow a similar pattern to our other clients, like
geolocation and context menu.

  • Configurations/FeatureDefines.xcconfig: Split out ENABLE_NOTIFICATIONS based on platform.
  • WebCore.xcodeproj/project.pbxproj: Adding new NotificationController class, and exposing

Notification and NotificationController as private headers.

  • Target.pri: Ditto.
  • WebCore.gypi: Ditto.
  • notifications/NotificationContents.h: Converted class to struct. Members need to be accessible

in order to do WK2 argument encoding.
(WebCore::NotificationContents::NotificationContents):

  • notifications/Notification.cpp: Update style of entire file.

(WebCore::Notification::Notification): Added default constructor (for WK2), and minor refactoring
with NotificationContents.

  • notifications/Notification.h: Added set methods for WK2 serialization. Also, update indenting.

(WebCore::Notification::setHTML): Added.
(WebCore::Notification::setURL): Added.
(WebCore::Notification::contents): Added const version for WK2.

  • notifications/NotificationCenter.h: Update style.
  • notifications/NotificationController.cpp: Added.

(WebCore::NotificationController::NotificationController):
(WebCore::NotificationController::~NotificationController):

  • notifications/NotificationController.h: Added.

(WebCore::NotificationController::client):

  • notifications/NotificationPresenter.h: This acts like a client, and should probably be renamed as such.

Removed ifdef for exposure to WK2.
(WebCore::NotificationPresenter::~NotificationPresenter): Moved as protected instead of public.

  • page/DOMWindow.cpp:

(WebCore::DOMWindow::webkitNotifications): We move the request for the notification client from the chrome
to the controller.

  • page/Page.cpp:

(WebCore::Page::Page): The page now owns a notification controller.
(WebCore::Page::PageClients::PageClients): Add notification client as a page client.

  • page/Page.h:

(WebCore::Page::notificationController): Retrieve the notification controller.

  • page/ChromeClient.h: We move the request for the notification client from the chrome to the controller.

Remove notificationPresenter().

  • page/Chrome.cpp: Remove notificationPresenter().
  • page/Chrome.h: Remove notificationPresenter().
  • loader/EmptyClients.h: Remove notificationPresenter().

Source/WebKit:

Reviewed by Sam Weinig.

  • WebKit.xcodeproj/project.pbxproj: Add WebNotificationClient class.

Source/WebKit/chromium:

Reviewed by Sam Weinig.

Remove notificationPresenter() from the chrome client, since it is now managed by
the notification controller.

  • src/ChromeClientImpl.cpp:
  • src/ChromeClientImpl.h:
  • src/WebNotification.cpp:

(WebKit::WebNotification::title): Refactoring with NotificationContents conversion to struct.
(WebKit::WebNotification::body): Ditto.

  • src/WebViewImpl.cpp:

(WebKit::WebViewImpl::WebViewImpl): Set notification client in web view's page clients.

Source/WebKit/mac:

Reviewed by Sam Weinig.

  • Configurations/FeatureDefines.xcconfig: Split out ENABLE_NOTIFICATIONS based on platform.
  • WebCoreSupport/WebNotificationClient.h: Added.

(WebNotificationClient::webView):

  • WebCoreSupport/WebNotificationClient.mm: Added. Implemented as stubs for now.

(WebNotificationClient::WebNotificationClient):
(WebNotificationClient::show):
(WebNotificationClient::cancel):
(WebNotificationClient::notificationObjectDestroyed):
(WebNotificationClient::requestPermission):
(WebNotificationClient::cancelRequestsForPermission):
(WebNotificationClient::checkPermission):

  • WebView/WebView.mm: Set PageClient's notification client to an instance of this stubbed class.

Source/WebKit/qt:

Reviewed by Sam Weinig.

  • Api/qwebpage.cpp: Add notification client to pageClients.

(QWebPagePrivate::QWebPagePrivate):

  • WebCoreSupport/ChromeClientQt.cpp: Remove notification client from ChromeClient implementation.
  • WebCoreSupport/ChromeClientQt.h:
  • WebCoreSupport/NotificationPresenterClientQt.cpp: Refactor with change of NotificationContents to struct

(WebCore::NotificationWrapper::title):
(WebCore::NotificationWrapper::message):
(WebCore::NotificationPresenterClientQt::displayNotification):
(WebCore::NotificationPresenterClientQt::cancel):
(WebCore::NotificationPresenterClientQt::notificationClicked):
(WebCore::NotificationPresenterClientQt::dumpReplacedIdText):
(WebCore::NotificationPresenterClientQt::dumpShowText):

Source/WebKit2:

Reviewed by Sam Weinig.

  • WebKit2.xcodeproj/project.pbxproj: Added classes for notification support.
  • win/WebKit2.vcproj: Ditto.
  • Target.pri: Ditto.
  • Configurations/FeatureDefines.xcconfig: Split out ENABLE_NOTIFICATIONS based on platform.
  • DerivedSources.make: Add Notifications to VPATH.
  • Platform/CoreIPC/MessageID.h: List WebNotificationManagerProxy as a class with messages.
  • Scripts/webkit2/messages.py: Mark WebCore::NotificationContents as a struct.
  • Shared/API/c/WKBase.h: Map opaque types to NotificationProvider, NotificationManager, and Notification.
  • UIProcess/API/C/WKAPICast.h: Map WK types toNotificationProvider, NotificationManager, and Notification.
  • Shared/APIObject.h: Add Notification and NotificationManager as APIObjects.
  • Shared/WebCoreArgumentCoders.cpp: Added coders for KURL.

(CoreIPC::::encode):
(CoreIPC::::decode):

  • Shared/WebCoreArgumentCoders.h:
  • UIProcess/WebNotification.cpp: Added.

(WebKit::WebNotification::WebNotification):
(WebKit::WebNotification::~WebNotification):
(WebKit::WebNotification::encode):
(WebKit::WebNotification::decode):

  • UIProcess/WebNotification.h: Added.

(WebKit::WebNotification::create):
(WebKit::WebNotification::title):
(WebKit::WebNotification::body):
(WebKit::WebNotification::type):

  • UIProcess/API/C/WKNotification.cpp: Added as API.

(WKNotificationGetTypeID):
(WKNotificationCopyTitle):
(WKNotificationCopyBody):

  • UIProcess/API/C/WKNotification.h: Added as API.
  • WebProcess/Notifications/WebNotificationManager.h: Added. Contains for now show() and cancel().

The rest of the notification client methods will be added later. These two functions send messages
to the manager proxy.

  • WebProcess/Notifications/WebNotificationManager.cpp: Added.

(WebKit::WebNotificationManager::WebNotificationManager):
(WebKit::WebNotificationManager::~WebNotificationManager):
(WebKit::WebNotificationManager::show):
(WebKit::WebNotificationManager::cancel):

  • UIProcess/WebNotificationManagerProxy.cpp: Added.

(WebKit::WebNotificationManagerProxy::create):
(WebKit::WebNotificationManagerProxy::WebNotificationManagerProxy):
(WebKit::WebNotificationManagerProxy::~WebNotificationManagerProxy):
(WebKit::WebNotificationManagerProxy::invalidate):
(WebKit::WebNotificationManagerProxy::initializeProvider):
(WebKit::WebNotificationManagerProxy::didReceiveMessage):
(WebKit::WebNotificationManagerProxy::show):
(WebKit::WebNotificationManagerProxy::cancel):

  • UIProcess/WebNotificationManagerProxy.h: Added.

(WebKit::WebNotificationManagerProxy::clearContext):
(WebKit::WebNotificationManagerProxy::type):

  • UIProcess/WebNotificationManagerProxy.messages.in: Added.
  • UIProcess/API/C/WKNotificationManager.cpp: Added.

(WKNotificationManagerGetTypeID):
(WKNotificationManagerSetProvider):

  • UIProcess/API/C/WKNotificationManager.h: Added.
  • UIProcess/WebContext.h: Add the notification manager to the web context.

(WebKit::WebContext::notificationManagerProxy): Access the manager.

  • UIProcess/WebContext.cpp:

(WebKit::WebContext::WebContext): Boilerplate for managers.
(WebKit::WebContext::~WebContext): Boilerplate for managers.
(WebKit::WebContext::disconnectProcess): Boilerplate for managers.
(WebKit::WebContext::didReceiveMessage): Forward messages to the notification manager.

  • UIProcess/API/C/WKContext.cpp: Expose as API.

(WKContextGetNotificationManager):

  • UIProcess/API/C/WKContext.h: Expose as API.
  • UIProcess/API/C/WKNotificationProvider.h: Added.
  • UIProcess/WebNotificationProvider.h: Added as APIClient.
  • UIProcess/WebNotificationProvider.cpp: Added.

(WebKit::WebNotificationProvider::show): Forward call to the client.
(WebKit::WebNotificationProvider::cancel): Forward call to the client.

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::didReceiveMessage): Forward messages for notification manager to the context.

  • WebProcess/WebCoreSupport/WebChromeClient.cpp: Remove notificationPresenter().
  • WebProcess/WebCoreSupport/WebChromeClient.h: Remove notificationPresenter().
  • WebProcess/WebCoreSupport/WebNotificationClient.h: Added. Forwards client methods to manager.
  • WebProcess/WebCoreSupport/WebNotificationClient.cpp: Added. Mostly stub implementation for now.

(WebKit::WebNotificationClient::WebNotificationClient):
(WebKit::WebNotificationClient::~WebNotificationClient):
(WebKit::WebNotificationClient::show):
(WebKit::WebNotificationClient::cancel):
(WebKit::WebNotificationClient::notificationObjectDestroyed):
(WebKit::WebNotificationClient::requestPermission):
(WebKit::WebNotificationClient::cancelRequestsForPermission):
(WebKit::WebNotificationClient::checkPermission):

  • WebProcess/WebPage/WebPage.h: Added WebNotificationClient as one of its page clients.
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage): Set the notification client to WebNotificationClient.

  • WebProcess/WebProcess.h: Added WebNotificationManager.

(WebKit::WebProcess::notificationManager):

  • WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess): Initialize notificaton manager.

5:00 PM Changeset in webkit [101306] by Beth Dakin
  • 3 edits in trunk/Source/WebKit/chromium

Speculative Chromium build fix.

  • src/ScrollbarGroup.cpp:

(WebKit::ScrollbarGroup::scrollbarStyleChanged):

  • src/ScrollbarGroup.h:
4:52 PM Changeset in webkit [101305] by oliver@apple.com
  • 2 edits in trunk/Source/JavaScriptCore

Fix windows build.

4:48 PM Changeset in webkit [101304] by oliver@apple.com
  • 2 edits in trunk/Source/JavaScriptCore

Fix gyp build

4:38 PM Changeset in webkit [101303] by ojan@chromium.org
  • 3 edits in trunk/Tools

gtest normalization in the test results server is sometimes wrong
https://bugs.webkit.org/show_bug.cgi?id=73262

Reviewed by Tony Chang.

If a gtest has it's modified changed (e.g. add FLAKY_) then it will have two
entries in the incremental JSON, one of the entries will have the correct data
from the run and the other will have dummy no-data values. Make sure to
always pick the one with real data.

  • TestResultServer/model/jsonresults.py:

(JsonResults._remove_gtest_modifiers):

  • TestResultServer/model/jsonresults_unittest.py:

(JsonResultsTest.test_remove_gtest_modifiers):

4:22 PM Changeset in webkit [101302] by noel.gordon@gmail.com
  • 2 edits in trunk/Source/WebCore

ImageDecoder setSize() should check for backing store allocation failure
https://bugs.webkit.org/show_bug.cgi?id=72864

Reviewed by Adam Barth.

The backing store of a decoded image is a Vector<PixelData> on the affected
ports. And Vector<> provides a resize capacity member that returns false if
memory allocation fails.

setSize() should be called once only during an image decode - add an ASSERT
for that. Resize the backing store capacity to the requested image size and
return false if memory allocation fails.

ImageDecoder::isOverSize(width, height) is called to check that the decoded
width and height won't overflow 'width x height x sizeof(PixelData)' before
calls to setSize(). Refer to http://webkit.org/b/48634

No new tests. Covered by fast/images/size-failure.html

  • platform/image-decoders/ImageDecoder.cpp:

(WebCore::ImageFrame::setSize):

4:21 PM Changeset in webkit [101301] by oliver@apple.com
  • 11 edits in trunk/Source/WebCore

Fix V8 bindings codegen and add yet more tests for the typed
array bindings.

4:16 PM Changeset in webkit [101300] by commit-queue@webkit.org
  • 4 edits
    1 add in trunk/Source

FloatQuad::isRectilinear() returns false for 180degree rotations
https://bugs.webkit.org/show_bug.cgi?id=73040

Patch by Dana Jansens <danakj@chromium.org> on 2011-11-28
Reviewed by James Robinson.

Source/WebCore:

Added unit test FloatQuadTest.cpp.

  • platform/graphics/FloatQuad.cpp:

(WebCore::withinEpsilon): Check two values are as close as can be represented by floats.
(WebCore::FloatQuad::isRectilinear): Use withinEpsilon().

Source/WebKit/chromium:

  • WebKit.gypi:
  • tests/FloatQuadTest.cpp: Added.

(WebCore::TEST):

4:13 PM Changeset in webkit [101299] by ojan@chromium.org
  • 3 edits in trunk/Tools

Some of the results.json files have results/times entries at the directory level
https://bugs.webkit.org/show_bug.cgi?id=73261

Reviewed by Tony Chang.

This is just a bug that got introduced in a temporary push of the results server.
This patch repairs the broken files. After all the bots have cycled, we can simplify
this code to just assert that results/times are not at the directory level.

Also, when catching exceptions, log the full stacktrace.

  • TestResultServer/model/jsonresults.py:

(_is_directory):
(JsonResults._load_json):
(JsonResults._merge_tests):
(JsonResults.merge):

  • TestResultServer/model/jsonresults_unittest.py:

(JsonResultsTest.test_merge_directory_hierarchy_extra_results_and_times):

3:51 PM Changeset in webkit [101298] by fpizlo@apple.com
  • 7 edits in trunk/Source/JavaScriptCore

GetById should not always speculate cell
https://bugs.webkit.org/show_bug.cgi?id=73181

Reviewed by Gavin Barraclough.

GetById will now speculate cell if the predictions of the base are cell.
Otherwise it will do like the old JIT (and like the old non-speculative
DFG JIT): if not cell, go straight to slow-path but otherwise don't OSR
out. This is a 1% speed-up on SunSpider.

  • dfg/DFGAbstractState.cpp:

(JSC::DFG::AbstractState::execute):

  • dfg/DFGOperations.cpp:
  • dfg/DFGOperations.h:
  • dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::setupArgumentsWithExecState):
(JSC::DFG::SpeculativeJIT::callOperation):

  • dfg/DFGSpeculativeJIT32_64.cpp:

(JSC::DFG::SpeculativeJIT::cachedGetById):
(JSC::DFG::SpeculativeJIT::compile):

  • dfg/DFGSpeculativeJIT64.cpp:

(JSC::DFG::SpeculativeJIT::compile):

3:48 PM Changeset in webkit [101297] by zmo@google.com
  • 1 edit in trunk/LayoutTests/platform/chromium/test_expectations.txt

Webkit gardening: test expectations update.

3:42 PM Changeset in webkit [101296] by Beth Dakin
  • 2 edits in trunk/Source/WebCore

Speculative Chromium build-fix.

  • platform/chromium/ScrollAnimatorChromiumMac.mm:

(WebCore::ScrollAnimatorChromiumMac::updateScrollerStyle):

3:40 PM Changeset in webkit [101295] by oliver@apple.com
  • 71 edits
    1 copy
    13 moves
    10 adds
    9 deletes in trunk/Source

Move typed array implementations into wtf
https://bugs.webkit.org/show_bug.cgi?id=73248

Reviewed by Sam Weinig.

Source/JavaScriptCore:

Move typed array implementation files from WebCore to wtf. Inline the
.cpp files for each of the array views to cut down on unnecessary exports
and function call overhead for trivial operations.

Added files to all the project files.

(WTF::ArrayBuffer::transfer):
(WTF::ArrayBuffer::addView):
(WTF::ArrayBuffer::removeView):

  • wtf/ArrayBuffer.h: Renamed from Source/WebCore/html/canvas/ArrayBuffer.cpp.

(WTF::ArrayBufferContents::ArrayBufferContents):
(WTF::ArrayBufferContents::data):
(WTF::ArrayBufferContents::sizeInBytes):
(WTF::ArrayBufferContents::transfer):
(WTF::ArrayBuffer::~ArrayBuffer):
(WTF::ArrayBuffer::clampValue):
(WTF::ArrayBuffer::create):
(WTF::ArrayBuffer::ArrayBuffer):
(WTF::ArrayBuffer::data):
(WTF::ArrayBuffer::byteLength):
(WTF::ArrayBuffer::slice):
(WTF::ArrayBuffer::sliceImpl):
(WTF::ArrayBuffer::clampIndex):
(WTF::ArrayBufferContents::tryAllocate):
(WTF::ArrayBufferContents::~ArrayBufferContents):

  • wtf/ArrayBufferView.cpp: Copied from Source/WebCore/bindings/js/JSArrayBufferCustom.cpp.

(WTF::ArrayBufferView::ArrayBufferView):
(WTF::ArrayBufferView::~ArrayBufferView):
(WTF::ArrayBufferView::neuter):

  • wtf/ArrayBufferView.h: Renamed from Source/WebCore/html/canvas/ArrayBufferView.h.

(WTF::ArrayBufferView::isByteArray):
(WTF::ArrayBufferView::isUnsignedByteArray):
(WTF::ArrayBufferView::isShortArray):
(WTF::ArrayBufferView::isUnsignedShortArray):
(WTF::ArrayBufferView::isIntArray):
(WTF::ArrayBufferView::isUnsignedIntArray):
(WTF::ArrayBufferView::isFloatArray):
(WTF::ArrayBufferView::isDoubleArray):
(WTF::ArrayBufferView::isDataView):
(WTF::ArrayBufferView::buffer):
(WTF::ArrayBufferView::baseAddress):
(WTF::ArrayBufferView::byteOffset):
(WTF::ArrayBufferView::verifySubRange):
(WTF::ArrayBufferView::clampOffsetAndNumElements):
(WTF::ArrayBufferView::setImpl):
(WTF::ArrayBufferView::setRangeImpl):
(WTF::ArrayBufferView::zeroRangeImpl):
(WTF::ArrayBufferView::calculateOffsetAndLength):

  • wtf/CMakeLists.txt:
  • wtf/Float32Array.h: Renamed from Source/WebCore/html/canvas/Float32Array.h.

(WTF::Float32Array::set):
(WTF::Float32Array::item):
(WTF::Float32Array::isFloatArray):
(WTF::Float32Array::create):
(WTF::Float32Array::Float32Array):
(WTF::Float32Array::subarray):

  • wtf/Float64Array.h: Renamed from Source/WebCore/html/canvas/Float64Array.h.

(WTF::Float64Array::set):
(WTF::Float64Array::item):
(WTF::Float64Array::isDoubleArray):
(WTF::Float64Array::create):
(WTF::Float64Array::Float64Array):
(WTF::Float64Array::subarray):

  • wtf/Int16Array.h: Renamed from Source/WebCore/html/canvas/Int16Array.cpp.

(WTF::Int16Array::set):
(WTF::Int16Array::isShortArray):
(WTF::Int16Array::create):
(WTF::Int16Array::Int16Array):
(WTF::Int16Array::subarray):

  • wtf/Int32Array.h: Renamed from Source/WebCore/html/canvas/Int32Array.cpp.

(WTF::Int32Array::set):
(WTF::Int32Array::isIntArray):
(WTF::Int32Array::create):
(WTF::Int32Array::Int32Array):
(WTF::Int32Array::subarray):

  • wtf/Int8Array.h: Renamed from Source/WebCore/html/canvas/Int8Array.cpp.

(WTF::Int8Array::set):
(WTF::Int8Array::isByteArray):
(WTF::Int8Array::create):
(WTF::Int8Array::Int8Array):
(WTF::Int8Array::subarray):

  • wtf/IntegralTypedArrayBase.h: Renamed from Source/WebCore/html/canvas/IntegralTypedArrayBase.h.

(WTF::IntegralTypedArrayBase::set):
(WTF::IntegralTypedArrayBase::item):
(WTF::IntegralTypedArrayBase::IntegralTypedArrayBase):

  • wtf/TypedArrayBase.h: Renamed from Source/WebCore/html/canvas/TypedArrayBase.h.

(WTF::TypedArrayBase::data):
(WTF::TypedArrayBase::set):
(WTF::TypedArrayBase::setRange):
(WTF::TypedArrayBase::zeroRange):
(WTF::TypedArrayBase::length):
(WTF::TypedArrayBase::byteLength):
(WTF::TypedArrayBase::TypedArrayBase):
(WTF::TypedArrayBase::create):
(WTF::TypedArrayBase::subarrayImpl):

  • wtf/Uint16Array.h: Renamed from Source/WebCore/html/canvas/Uint16Array.cpp.

(WTF::Uint16Array::set):
(WTF::Uint16Array::isUnsignedShortArray):
(WTF::Uint16Array::create):
(WTF::Uint16Array::Uint16Array):
(WTF::Uint16Array::subarray):

  • wtf/Uint32Array.h: Renamed from Source/WebCore/html/canvas/Uint32Array.cpp.

(WTF::Uint32Array::set):
(WTF::Uint32Array::isUnsignedIntArray):
(WTF::Uint32Array::create):
(WTF::Uint32Array::Uint32Array):
(WTF::Uint32Array::subarray):

  • wtf/Uint8Array.h: Renamed from Source/WebCore/html/canvas/Uint8Array.h.

(WTF::Uint8Array::set):
(WTF::Uint8Array::isUnsignedByteArray):
(WTF::Uint8Array::create):
(WTF::Uint8Array::Uint8Array):
(WTF::Uint8Array::subarray):

  • wtf/wtf.pro:

Source/WebCore:

Removed the typed array implementation files from WebCore and
added forwarding headers.

  • CMakeLists.txt:
  • ForwardingHeaders/wtf/ArrayBuffer.h: Added.
  • ForwardingHeaders/wtf/ArrayBufferView.h: Added.
  • ForwardingHeaders/wtf/Float32Array.h: Added.
  • ForwardingHeaders/wtf/Float64Array.h: Added.
  • ForwardingHeaders/wtf/Int16Array.h: Added.
  • ForwardingHeaders/wtf/Int32Array.h: Added.
  • ForwardingHeaders/wtf/Int8Array.h: Added.
  • ForwardingHeaders/wtf/Uint16Array.h: Added.
  • ForwardingHeaders/wtf/Uint32Array.h: Added.
  • ForwardingHeaders/wtf/Uint8Array.h: Added.
  • GNUmakefile.list.am:
  • Target.pri:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • bindings/js/JSArrayBufferCustom.cpp:
  • bindings/js/JSArrayBufferViewHelper.h:
  • bindings/js/JSAudioContextCustom.cpp:
  • bindings/js/JSFileReaderCustom.cpp:
  • bindings/js/JSFloat32ArrayCustom.cpp:
  • bindings/js/JSFloat64ArrayCustom.cpp:
  • bindings/js/JSInt16ArrayCustom.cpp:
  • bindings/js/JSInt32ArrayCustom.cpp:
  • bindings/js/JSInt8ArrayCustom.cpp:
  • bindings/js/JSUint16ArrayCustom.cpp:
  • bindings/js/JSUint32ArrayCustom.cpp:
  • bindings/js/JSUint8ArrayCustom.cpp:
  • bindings/js/JSWaveShaperNodeCustom.cpp:
  • bindings/js/JSWebGLRenderingContextCustom.cpp:
  • bindings/js/JSXMLHttpRequestCustom.cpp:
  • bindings/scripts/CodeGeneratorJS.pm:

(AddIncludesForType):
(GenerateHeader):
(NativeToJSValue):

  • bindings/scripts/test/JS/JSFloat64Array.cpp:
  • bindings/scripts/test/JS/JSFloat64Array.h:
  • dom/MessageEvent.h:
  • fileapi/FileReader.cpp:
  • fileapi/FileReaderLoader.cpp:
  • fileapi/FileReaderSync.cpp:
  • fileapi/WebKitBlobBuilder.cpp:
  • html/HTMLMediaElement.cpp:
  • html/canvas/ArrayBuffer.h: Removed.
  • html/canvas/ArrayBufferView.cpp: Removed.
  • html/canvas/DataView.h:
  • html/canvas/Float64Array.cpp: Removed.
  • html/canvas/Int16Array.h: Removed.
  • html/canvas/Int32Array.h: Removed.
  • html/canvas/Int8Array.h: Removed.
  • html/canvas/Uint16Array.h: Removed.
  • html/canvas/Uint32Array.h: Removed.
  • html/canvas/Uint8Array.cpp: Removed.
  • html/canvas/WebGLBuffer.cpp:
  • html/canvas/WebGLBuffer.h:
  • html/canvas/WebGLGetInfo.cpp:
  • html/canvas/WebGLGetInfo.h:
  • html/canvas/WebGLRenderingContext.cpp:
  • html/canvas/WebGLRenderingContext.h:
  • page/Crypto.cpp:
  • platform/graphics/GraphicsContext3D.cpp:
  • platform/graphics/mac/GraphicsContext3DMac.mm:
  • platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
  • webaudio/AsyncAudioDecoder.cpp:
  • webaudio/AudioBuffer.h:
  • webaudio/AudioContext.cpp:
  • webaudio/AudioParam.h:
  • webaudio/AudioParamTimeline.h:
  • webaudio/JavaScriptAudioNode.cpp:
  • webaudio/RealtimeAnalyser.cpp:
  • webaudio/WaveShaperProcessor.h:
  • websockets/WebSocketChannel.cpp:
  • websockets/WorkerThreadableWebSocketChannel.cpp:
  • xml/XMLHttpRequest.cpp:
3:33 PM Changeset in webkit [101294] by haraken@chromium.org
  • 2 edits in trunk/LayoutTests

Unreviewed, s/SyntaxError/TypeError/ in the flaky test result.

  • platform/chromium-win/fast/workers/worker-constructor-expected.txt:
3:29 PM Changeset in webkit [101293] by bfulgham@webkit.org
  • 3 edits in trunk/Source/WebKit2

[WinCairo] Unreviewed build corrections.

  • UIProcess/BackingStore.h: WinCairo doesn't need the Cairo backing for widgets.
  • win/WebKit2CFLite.def: Update to match WebKit2.def.
3:11 PM Changeset in webkit [101292] by robert@webkit.org
  • 74 edits
    137 deletes in trunk

Unreviewed, rolling out r101202.
http://trac.webkit.org/changeset/101202
https://bugs.webkit.org/show_bug.cgi?id=71244

Caused performance regressions when painting collapsed borders

Source/WebCore:

  • rendering/RenderTableCell.cpp:

(WebCore::compareBorders):
(WebCore::RenderTableCell::collapsedStartBorder):
(WebCore::RenderTableCell::collapsedEndBorder):
(WebCore::RenderTableCell::collapsedBeforeBorder):
(WebCore::RenderTableCell::collapsedAfterBorder):

  • rendering/style/CollapsedBorderValue.h:

(WebCore::CollapsedBorderValue::CollapsedBorderValue):
(WebCore::CollapsedBorderValue::operator==):

  • rendering/style/RenderStyleConstants.h:

LayoutTests:

  • css2.1/20110323/border-conflict-element-001.htm: Removed.
  • css2.1/20110323/border-conflict-element-001a.htm: Removed.
  • css2.1/20110323/border-conflict-element-001b.htm: Removed.
  • css2.1/20110323/border-conflict-element-001c.htm: Removed.
  • css2.1/20110323/border-conflict-element-001d.htm: Removed.
  • css2.1/20110323/border-conflict-element-003.htm: Removed.
  • css2.1/20110323/border-conflict-element-004.htm: Removed.
  • css2.1/20110323/border-conflict-element-005.htm: Removed.
  • css2.1/20110323/border-conflict-element-006.htm: Removed.
  • css2.1/20110323/border-conflict-element-007.htm: Removed.
  • css2.1/20110323/border-conflict-element-008.htm: Removed.
  • css2.1/20110323/border-conflict-element-009.htm: Removed.
  • css2.1/20110323/border-conflict-element-010.htm: Removed.
  • css2.1/20110323/border-conflict-element-011.htm: Removed.
  • css2.1/20110323/border-conflict-element-012.htm: Removed.
  • css2.1/20110323/border-conflict-element-013.htm: Removed.
  • css2.1/20110323/border-conflict-element-014.htm: Removed.
  • css2.1/20110323/border-conflict-element-015.htm: Removed.
  • css2.1/20110323/border-conflict-element-016.htm: Removed.
  • css2.1/20110323/border-conflict-element-017.htm: Removed.
  • css2.1/20110323/border-conflict-element-018.htm: Removed.
  • css2.1/20110323/border-conflict-element-019.htm: Removed.
  • css2.1/20110323/border-conflict-element-020.htm: Removed.
  • css2.1/20110323/border-conflict-element-021.htm: Removed.
  • css2.1/20110323/border-conflict-element-022.htm: Removed.
  • css2.1/20110323/border-conflict-element-023.htm: Removed.
  • css2.1/20110323/border-conflict-element-024.htm: Removed.
  • css2.1/20110323/border-conflict-element-025.htm: Removed.
  • css2.1/20110323/border-conflict-element-026.htm: Removed.
  • css2.1/20110323/border-conflict-element-027.htm: Removed.
  • css2.1/20110323/border-conflict-element-028.htm: Removed.
  • css2.1/20110323/border-conflict-element-029.htm: Removed.
  • css2.1/20110323/border-conflict-element-030.htm: Removed.
  • css2.1/20110323/border-conflict-element-031.htm: Removed.
  • css2.1/20110323/border-conflict-element-032.htm: Removed.
  • css2.1/20110323/border-conflict-element-033.htm: Removed.
  • css2.1/20110323/border-conflict-element-034.htm: Removed.
  • css2.1/20110323/border-conflict-element-035.htm: Removed.
  • css2.1/20110323/border-conflict-element-036.htm: Removed.
  • css2.1/20110323/border-conflict-element-037.htm: Removed.
  • css2.1/20110323/border-conflict-element-038.htm: Removed.
  • css2.1/20110323/border-conflict-element-039.htm: Removed.
  • css2.1/20110323/support/swatch-blue.png: Removed.
  • css2.1/20110323/support/swatch-green.png: Removed.
  • css2.1/20110323/support/swatch-lime.png: Removed.
  • css2.1/20110323/support/swatch-orange.png: Removed.
  • css2.1/20110323/support/swatch-red.png: Removed.
  • css2.1/20110323/support/swatch-teal.png: Removed.
  • css2.1/20110323/support/swatch-white.png: Removed.
  • css2.1/20110323/support/swatch-yellow.png: Removed.
  • fast/css/border-conflict-element-002.htm: Removed.
  • platform/chromium-linux/css2.1/20110323/border-conflict-style-079-expected.png:
  • platform/chromium-linux/css2.1/20110323/border-conflict-style-088-expected.png:
  • platform/chromium-linux/css2.1/20110323/floating-replaced-height-008-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-25-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-26-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-27-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-28-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-35-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-36-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-37-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-38-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-45-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-46-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-47-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-48-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
  • platform/chromium-linux/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
  • platform/chromium-linux/fast/borders/border-antialiasing-expected.png:
  • platform/chromium-linux/tables/mozilla/collapsing_borders/bug41262-4-expected.png:
  • platform/chromium-linux/tables/mozilla/marvin/table_rules_all-expected.png:
  • platform/chromium-linux/tables/mozilla/marvin/table_rules_none-expected.png:
  • platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png:
  • platform/chromium-linux/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-032-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-032-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-033-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-033-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-034-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-034-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-035-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-035-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-036-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-036-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-037-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-037-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-038-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-038-expected.txt: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-039-expected.png: Removed.
  • platform/chromium/css2.1/20110323/border-conflict-element-039-expected.txt: Removed.
  • platform/chromium/fast/css/border-conflict-element-002-expected.png: Removed.
  • platform/chromium/fast/css/border-conflict-element-002-expected.txt: Removed.
3:07 PM Changeset in webkit [101291] by fpizlo@apple.com
  • 4 edits in trunk/Source/JavaScriptCore

Don't try to optimize huge code blocks
https://bugs.webkit.org/show_bug.cgi?id=73187

Reviewed by Oliver Hunt.

This unifies the heuristics used for deciding if a code block is too big
to optimize, and sets this heuristic to 1000, which is intuitively better
than numeric_limits<unsigned>::max(). It also results in what looks like
a speed-up on both SunSpider and V8 (in Tools/Scripts/bencher).

  • dfg/DFGCapabilities.h:

(JSC::DFG::mightCompileEval):
(JSC::DFG::mightCompileProgram):
(JSC::DFG::mightCompileFunctionForCall):
(JSC::DFG::mightCompileFunctionForConstruct):

  • runtime/Heuristics.cpp:

(JSC::Heuristics::initializeHeuristics):

  • runtime/Heuristics.h:
3:06 PM Changeset in webkit [101290] by Beth Dakin
  • 19 edits in trunk/Source

https://bugs.webkit.org/show_bug.cgi?id=72551
When the recommended scrollbar style changes, WKView's tracking options should
adjust accordingly
-and corresponding-
<rdar://problem/10409328>

Reviewed by Darin Adler.

Source/WebCore:

This new ChromeClient function is called when the recommended scrollbar style
changes. This way, WebKit can respond to the change by adjusting its mouse
tracking.

  • page/ChromeClient.h:

(WebCore::ChromeClient::recommendedScrollbarStyleDidChange):

Existing ScrollableArea function scrollbarStyleChanged() now takes an int
indicating the new scrollbar style and a bool indicating whether it is necessary
to force an update. It used to be the case that this function was ONLY used to
force an update (and only called when an updated was needed), but now that it must
also call into the ChromeClient, it is necessary to include a bool tracking
whether we need to force an update. New implementation on FrameView is responsible
for calling ChromeClient, and then that calls into the pre-existing ScrollView
function for the forceUpdate part.

  • page/FrameView.cpp:

(WebCore::FrameView::scrollbarStyleChanged):

  • page/FrameView.h:
  • platform/ScrollView.cpp:

(WebCore::ScrollView:: scrollbarStyleChanged):

  • platform/ScrollView.h:
  • platform/ScrollableArea.h:

(WebCore::ScrollableArea::scrollbarStyleChanged):

  • platform/mac/ScrollAnimatorMac.mm:

(WebCore::ScrollAnimatorMac::updateScrollerStyle):

Source/WebKit2:

These new functions take care of passing along the
recommendedScrollbarStyleDidChange() message that originates in the ChromeClient.

  • UIProcess/API/mac/PageClientImpl.h:
  • UIProcess/PageClient.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::recommendedScrollbarStyleDidChange):

  • UIProcess/WebPageProxy.h:
  • UIProcess/WebPageProxy.messages.in:
  • WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::recommendedScrollbarStyleDidChange):

  • WebProcess/WebCoreSupport/WebChromeClient.h:

This is where we actually respond to the recommendedScrollbarStyleDidChange
message. We remove the existing tracking area and create a new tracking area with
the appropriate tracking options.

  • UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::recommendedScrollbarStyleDidChange):

BuiltInPDFView inherits from WebCore::ScrollableArea, so scrollbarStyleChanged()
must now take two parameters like the one in ScrollableArea.

  • WebProcess/Plugins/PDF/BuiltInPDFView.cpp:

(WebKit::BuiltInPDFView::scrollbarStyleChanged):

  • WebProcess/Plugins/PDF/BuiltInPDFView.h:
3:06 PM Changeset in webkit [101289] by robert@webkit.org
  • 135 edits
    36 moves
    36 adds
    261 deletes in trunk/LayoutTests

Unreviewed, rolling out r101211.
http://trac.webkit.org/changeset/101211

Caused performance regressions when painting collapsed borders

  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-001-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-001a-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-001b-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-001c-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-001d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-003-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-004-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-005-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-006-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-007-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-008-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-009-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-010-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-011-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-012-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-013-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-014-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-015-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-016-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-017-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-018-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-019-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-020-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-021-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-022-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-023-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-024-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-025-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-026-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-027-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-028-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-029-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-030-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-031-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-032-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-033-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-034-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-035-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-036-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-037-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-038-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-element-039-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-style-079-expected.png:
  • platform/chromium-cg-mac-leopard/css2.1/20110323/border-conflict-style-088-expected.png:
  • platform/chromium-cg-mac-leopard/css2.1/20110323/floating-replaced-height-008-expected.png:
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-05-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-06-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-07-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-08-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-15-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-16-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-17-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-18-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-25-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-27-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-28-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-45-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-51-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-52-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-53-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-54-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-55-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-56-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-57-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-58-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-59-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-61-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-62-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-63-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-64-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-65-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-66-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-67-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-68-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-69-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-71-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-72-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-73-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-74-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-75-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-76-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-77-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-78-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-79-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-81-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-82-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-83-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-84-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-85-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-86-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-87-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-88-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-89-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-95-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-96-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-97-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/css2.1/t170602-bdr-conflct-w-98-d-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/fast/borders/border-antialiasing-expected.png:
  • platform/chromium-cg-mac-leopard/fast/css/border-conflict-element-002-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/fast/repaint/table-cell-collapsed-border-expected.png:
  • platform/chromium-cg-mac-leopard/tables/mozilla/collapsing_borders/bug41262-4-expected.png:
  • platform/chromium-cg-mac-leopard/tables/mozilla/marvin/table_rules_all-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/tables/mozilla/marvin/table_rules_none-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png: Removed.
  • platform/chromium-cg-mac-leopard/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/20110323/border-conflict-element-001d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/20110323/border-conflict-style-079-expected.png:
  • platform/chromium-cg-mac-snowleopard/css2.1/20110323/border-conflict-style-088-expected.png:
  • platform/chromium-cg-mac-snowleopard/css2.1/20110323/floating-replaced-height-008-expected.png:
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-06-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-16-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-45-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-53-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-54-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-56-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-61-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-62-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-63-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-64-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-65-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-66-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-67-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-68-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-69-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-73-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-74-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-76-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-83-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-84-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-86-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/css2.1/t170602-bdr-conflct-w-96-d-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/fast/borders/border-antialiasing-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/fast/repaint/table-cell-collapsed-border-expected.png:
  • platform/chromium-cg-mac-snowleopard/tables/mozilla/collapsing_borders/bug41262-4-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/tables/mozilla/marvin/table_rules_all-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/tables/mozilla/marvin/table_rules_none-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png: Removed.
  • platform/chromium-cg-mac-snowleopard/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/20110323/border-conflict-element-001d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/20110323/border-conflict-style-079-expected.png:
  • platform/chromium-mac-snowleopard/css2.1/20110323/border-conflict-style-088-expected.png:
  • platform/chromium-mac-snowleopard/css2.1/20110323/floating-replaced-height-008-expected.png:
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-06-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-16-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-53-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-54-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-56-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-61-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-62-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-63-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-64-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-65-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-66-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-67-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-68-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-69-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-73-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-74-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-76-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-83-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-84-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-86-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-96-d-expected.png: Removed.
  • platform/chromium-mac-snowleopard/fast/borders/border-antialiasing-expected.png: Removed.
  • platform/chromium-mac-snowleopard/fast/repaint/table-cell-collapsed-border-expected.png:
  • platform/chromium-mac-snowleopard/tables/mozilla/collapsing_borders/bug41262-4-expected.png: Removed.
  • platform/chromium-mac-snowleopard/tables/mozilla/marvin/table_rules_all-expected.png: Removed.
  • platform/chromium-mac-snowleopard/tables/mozilla/marvin/table_rules_none-expected.png: Removed.
  • platform/chromium-mac-snowleopard/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png: Removed.
  • platform/chromium-mac-snowleopard/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png: Removed.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-06-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-16-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-26-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-35-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-36-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-37-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-38-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-45-d-expected.png: Renamed from LayoutTests/platform/chromium-mac-snowleopard/css2.1/t170602-bdr-conflct-w-45-d-expected.png.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-46-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-47-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-48-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-53-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-54-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-56-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-61-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-62-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-63-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-64-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-65-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-66-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-67-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-68-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-69-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-73-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-74-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-76-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-83-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-84-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-86-d-expected.png: Added.
  • platform/chromium-mac/css2.1/t170602-bdr-conflct-w-96-d-expected.png: Added.
  • platform/chromium-mac/fast/borders/border-antialiasing-expected.png: Added.
  • platform/chromium-mac/tables/mozilla/collapsing_borders/bug41262-4-expected.png: Added.
  • platform/chromium-mac/tables/mozilla/marvin/table_rules_all-expected.png: Added.
  • platform/chromium-mac/tables/mozilla/marvin/table_rules_none-expected.png: Added.
  • platform/chromium-mac/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png: Added.
  • platform/chromium-mac/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png: Added.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-001-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-001a-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-001b-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-001c-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-001d-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-003-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-004-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-005-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-006-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-007-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-008-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-009-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-010-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-011-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-012-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-013-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-014-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-015-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-015-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-016-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-016-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-017-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-017-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-018-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-019-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-020-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-020-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-021-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-022-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-023-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-024-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-025-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-026-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-027-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-027-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-028-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-029-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-030-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-031-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-032-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-033-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-034-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-035-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-036-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-036-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-037-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-037-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-038-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-038-expected.txt: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-element-039-expected.png: Removed.
  • platform/chromium-win/css2.1/20110323/border-conflict-style-079-expected.png:
  • platform/chromium-win/css2.1/20110323/border-conflict-style-088-expected.png:
  • platform/chromium-win/css2.1/20110323/floating-replaced-height-008-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-05-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-06-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-07-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-08-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-15-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-16-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-17-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-18-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-25-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-26-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-27-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-28-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-35-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-36-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-37-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-38-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-45-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-46-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-47-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-48-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-51-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-52-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-53-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-54-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-55-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-56-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-57-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-58-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-59-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-61-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-62-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-63-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-64-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-65-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-66-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-67-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-68-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-69-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-71-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-72-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-73-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-74-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-75-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-76-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-77-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-78-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-79-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-81-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-82-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-83-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-84-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-85-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-86-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-87-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-88-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-89-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-95-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-96-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-97-d-expected.png:
  • platform/chromium-win/css2.1/t170602-bdr-conflct-w-98-d-expected.png:
  • platform/chromium-win/fast/borders/border-antialiasing-expected.png:
  • platform/chromium-win/fast/css/border-conflict-element-002-expected.png: Removed.
  • platform/chromium-win/fast/repaint/table-cell-collapsed-border-expected.png:
  • platform/chromium-win/tables/mozilla/collapsing_borders/bug41262-4-expected.png:
  • platform/chromium-win/tables/mozilla/marvin/table_rules_all-expected.png:
  • platform/chromium-win/tables/mozilla/marvin/table_rules_none-expected.png:
  • platform/chromium-win/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png:
  • platform/chromium-win/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-001-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001a-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-001a-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001b-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-001b-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-001c-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-001c-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.png: Added.
  • platform/chromium/css2.1/20110323/border-conflict-element-001d-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-001d-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-003-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-003-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-003-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-004-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-004-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-004-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-005-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-005-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-005-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-006-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-006-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-006-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-007-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-007-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-007-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-008-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-008-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-008-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-009-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-009-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-009-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-010-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-010-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-010-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-011-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-011-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-011-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-012-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-012-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-012-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-013-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-013-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-013-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-014-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-014-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-014-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-015-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-015-expected.txt:
  • platform/chromium/css2.1/20110323/border-conflict-element-016-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-016-expected.txt:
  • platform/chromium/css2.1/20110323/border-conflict-element-017-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-017-expected.txt:
  • platform/chromium/css2.1/20110323/border-conflict-element-018-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-018-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-018-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-019-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-019-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-019-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-020-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-020-expected.txt:
  • platform/chromium/css2.1/20110323/border-conflict-element-021-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-021-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-021-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-022-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-022-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-022-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-023-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-023-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-023-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-024-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-024-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-024-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-025-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-025-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-025-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-026-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-026-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-026-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-027-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-027-expected.txt:
  • platform/chromium/css2.1/20110323/border-conflict-element-028-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-028-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-028-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-029-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-029-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-029-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-030-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-030-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-030-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-031-expected.png:
  • platform/chromium/css2.1/20110323/border-conflict-element-031-expected.txt: Renamed from LayoutTests/platform/chromium-win/css2.1/20110323/border-conflict-element-031-expected.txt.
  • platform/chromium/css2.1/20110323/border-conflict-element-032-expected.