⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Timeline



Jan 6, 2019:

10:42 PM Changeset in webkit [239667] by zandobersek@gmail.com
  • 5 edits
    12 adds
    1 delete in trunk/Source/WebCore

[Nicosia] Take over CoordinatedGraphics-named implementation of async scrolling classes
​https://bugs.webkit.org/show_bug.cgi?id=193133

Reviewed by Michael Catanzaro.

Move the CoordinatedGraphics-specific files under
page/scrolling/coordinatedgraphics/ to page/scrolling/nicosia/, along
with renaming the files and classes accordingly. Implementation will
only depend on the Nicosia-specific layer structure and is not specific
to the CoordinatedGraphics system.

  • PlatformPlayStation.cmake:
  • SourcesGTK.txt:
  • SourcesWPE.txt:
  • page/scrolling/nicosia/ScrollingCoordinatorNicosia.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp.
  • page/scrolling/nicosia/ScrollingCoordinatorNicosia.h: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h.
  • page/scrolling/nicosia/ScrollingStateNodeNicosia.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp.
  • page/scrolling/nicosia/ScrollingTreeFixedNode.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp.
  • page/scrolling/nicosia/ScrollingTreeFixedNode.h: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.h.
  • page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFrameScrollingNodeCoordinatedGraphics.cpp.
  • page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.h: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFrameScrollingNodeCoordinatedGraphics.h.
  • page/scrolling/nicosia/ScrollingTreeNicosia.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.cpp.
  • page/scrolling/nicosia/ScrollingTreeNicosia.h: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.h.
  • page/scrolling/nicosia/ScrollingTreeStickyNode.cpp: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp.
  • page/scrolling/nicosia/ScrollingTreeStickyNode.h: Renamed from Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.h.
  • platform/TextureMapper.cmake:
7:27 PM Changeset in webkit [239666] by Fujii Hironori
  • 7 edits in trunk/Tools

[Win][Clang] Fix compilation warnings of MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=193029

Reviewed by Ross Kirsling.

  • MiniBrowser/win/MiniBrowserWebHost.h: Removed unused m_oldFont

and m_URLBarFont. Reorder member variables to fix -Wreorder
warning.

  • MiniBrowser/win/PageLoadTestClient.cpp:

(PageLoadTestClient::PageLoadTestClient): Reorder the member initializer list.

  • MiniBrowser/win/PageLoadTestClient.h: Removed 'virtual' of

pageLoadStartedAtTime and pageLoadEndedAtTime. Removed unused
m_currentURLIndex.

  • MiniBrowser/win/WebKitBrowserWindow.cpp:

(WebKitBrowserWindow::WebKitBrowserWindow): Initialize
navigationClient with '{ }' to fix the missing field warning.

  • MiniBrowser/win/WebKitLegacyBrowserWindow.cpp:

(initDocStruct): Changed the argument type docname to const.

6:08 PM Changeset in webkit [239665] by jiewen_tan@apple.com
  • 18 edits
    1 copy
    1 move
    6 adds in trunk

[WebAuthN] Import U2F command/response converters from Chromium
​https://bugs.webkit.org/show_bug.cgi?id=193150
<rdar://problem/47054028>

Reviewed by Brent Fulgham.

Source/WebCore:

This patch imports Chromium's U2F command/response converters:
​https://fidoalliance.org/specs/fido-v2.0-id-20180227/fido-client-to-authenticator-protocol-v2.0-id-20180227.html#u2f-interoperability

  1. It directly imports the following files and suit them to WebKit's coding style:

​https://cs.chromium.org/chromium/src/device/fido/u2f_command_constructor.cc?l=1&rcl=db624110317d01efa78cd32e7be1524190e1beb0
​https://cs.chromium.org/chromium/src/device/fido/u2f_command_constructor.h?rcl=db624110317d01efa78cd32e7be1524190e1beb0
​https://cs.chromium.org/chromium/src/device/fido/u2f_command_constructor_unittest.cc?rcl=db624110317d01efa78cd32e7be1524190e1beb0

  1. It gathers the following methods into U2fResponseConverter:

AuthenticatorMakeCredentialResponse::CreateFromU2fRegisterResponse()
AuthenticatorGetAssertionResponse::CreateFromU2fSignResponse()

  1. It also updates FidoConstants.h, FidoTestData.h and CtapResponseTest.cpp accordingly.

Besides importing stuff from Chroimum, it also gathers a bunch of constants and helper functions into WebAuthenticationConstants.h
and WebAuthenticationUtils.h. It also fixes Bug 183534: 2) and 7).

Covered by API tests.

  • Modules/webauthn/AuthenticatorCoordinator.cpp:

(WebCore::AuthenticatorCoordinatorInternal::produceClientDataJsonHash):

  • Modules/webauthn/WebAuthenticationConstants.h: Copied from Source/WebCore/Modules/webauthn/COSEConstants.h.
  • Modules/webauthn/WebAuthenticationUtils.cpp: Added.

(WebCore::convertBytesToVector):
(WebCore::produceRpIdHash):
(WebCore::encodeES256PublicKeyAsCBOR):
(WebCore::buildAttestedCredentialData):
(WebCore::buildAuthData):
(WebCore::buildAttestationObject):

  • Modules/webauthn/WebAuthenticationUtils.h: Renamed from Source/WebCore/Modules/webauthn/COSEConstants.h.
  • Modules/webauthn/fido/DeviceResponseConverter.cpp:

(fido::getCredentialId):
(fido::readCTAPGetInfoResponse):

  • Modules/webauthn/fido/FidoConstants.h:
  • Modules/webauthn/fido/U2fCommandConstructor.cpp: Added.

(fido::WebCore::constructU2fRegisterCommand):
(fido::WebCore::constructU2fSignCommand):
(fido::isConvertibleToU2fRegisterCommand):
(fido::isConvertibleToU2fSignCommand):
(fido::convertToU2fRegisterCommand):
(fido::convertToU2fCheckOnlySignCommand):
(fido::convertToU2fSignCommand):
(fido::constructBogusU2fRegistrationCommand):

  • Modules/webauthn/fido/U2fCommandConstructor.h: Added.
  • Modules/webauthn/fido/U2fResponseConverter.cpp: Added.

(fido::WebCore::extractECPublicKeyFromU2fRegistrationResponse):
(fido::WebCore::extractCredentialIdFromU2fRegistrationResponse):
(fido::WebCore::createAttestedCredentialDataFromU2fRegisterResponse):
(fido::WebCore::parseX509Length):
(fido::WebCore::createFidoAttestationStatementFromU2fRegisterResponse):
(fido::readU2fRegisterResponse):
(fido::readFromU2fSignResponse):

  • Modules/webauthn/fido/U2fResponseConverter.h: Added.
  • Modules/webgpu/WebGPUCommandBuffer.cpp:
  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:

Source/WebKit:

Moves helper functions to WebAuthenticationUtils.

  • UIProcess/WebAuthentication/Cocoa/LocalAuthenticator.mm:

(WebKit::LocalAuthenticatorInternal::produceHashSet):
(WebKit::LocalAuthenticator::continueMakeCredentialAfterAttested):
(): Deleted.
(WebKit::LocalAuthenticatorInternal::buildAuthData): Deleted.

  • UIProcess/WebAuthentication/Mock/MockHidConnection.cpp:

(WebKit::MockHidConnection::feedReports):

Tools:

Adds API tests.

  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebCore/CtapResponseTest.cpp:

(TestWebKitAPI::getTestAttestedCredentialDataBytes):
(TestWebKitAPI::getTestAuthenticatorDataBytes):
(TestWebKitAPI::getTestAttestationObjectBytes):
(TestWebKitAPI::getTestSignResponse):
(TestWebKitAPI::getTestU2fRegisterResponse):
(TestWebKitAPI::TEST):
(TestWebKitAPI::convertToVector): Deleted.

  • TestWebKitAPI/Tests/WebCore/FidoTestData.h:
  • TestWebKitAPI/Tests/WebCore/U2fCommandConstructorTest.cpp: Added.

(TestWebKitAPI::constructMakeCredentialRequest):
(TestWebKitAPI::constructGetAssertionRequest):
(TestWebKitAPI::TEST):

LayoutTests:

Fixes Bug 183534:
7) Change little endian bytes (ARM and x86 default) to big endian as requested by the spec.

  • http/wpt/webauthn/public-key-credential-create-success-hid.https.html:
  • http/wpt/webauthn/public-key-credential-get-success-hid.https.html:
  • http/wpt/webauthn/resources/util.js:
6:05 PM Changeset in webkit [239664] by ddkilzer@apple.com
  • 2 edits in trunk/Source/WebCore

Leak of WTF::Function objects in WebCore::CryptoKeyRSA::generatePair() (64-80 bytes each) in com.apple.WebKit.WebContent running WebKit layout tests
<​https://webkit.org/b/193177>
<rdar://problem/47072196>

Reviewed by Saam Barati.

  • crypto/mac/CryptoKeyRSAMac.cpp:

(WebCore::CryptoKeyRSA::generatePair): Fix the leak by changing
raw pointers to heap-allocated block variables to hold the
WTF::Function objects until they are consumed within the block
passed to dispatch_async(). The block variables act like
captured variables in a C++ lambda and have the same lifetime as
the block that they are captured in. Note that we would have to
convert the source file from C++ to Objective-C++ to use a C++
lambda functor with dispatch_async(), which creates its own
issue because the comipiler requires a copy constructor to
convert the C++ lambda to a block functor, but the copy
constructor for the C++ lambda is implicitly deleted because the
WTF::Function copy constructor is explicitly deleted. Whew!

9:15 AM Changeset in webkit [239663] by commit-queue@webkit.org
  • 2 edits in trunk/Source/WebCore

[WPE][GTK] Building with ENABLE_VIDEO=OFF fails trying to use Document MediaPlayback functions.
​https://bugs.webkit.org/show_bug.cgi?id=193174

Patch by Pablo Saavedra <Pablo Saavedra> on 2019-01-06
Reviewed by Michael Catanzaro.

  • page/Page.cpp:

(WebCore::Page::stopAllMediaPlayback):
(WebCore::Page::suspendAllMediaPlayback):
(WebCore::Page::resumeAllMediaPlayback):

Jan 5, 2019:

9:05 PM Changeset in webkit [239662] by ddkilzer@apple.com
  • 4 edits in trunk/Source/WebCore

Leak of two CCRSACryptorRef (4.0 Kbytes/1 page each) in com.apple.WebKit.WebContent running WebKit layout tests
<​https://webkit.org/b/193154>
<rdar://problem/47052993>

Reviewed by Brent Fulgham.

Broadly:

  • Fix leaks by switching from using raw pointers to using std::unique_ptr<>.
  • Introduce PlatformRSAKeyContainer type to handle different std::unique_ptr<> on each platform.
  • Get rid of custom CryptoKeyRSA destructors since the std::unique_ptr<> handles that with a Deleter.
  • Initialize stack variables to nullptr.
  • crypto/gcrypt/CryptoKeyRSAGCrypt.cpp:

(WebCore::CryptoKeyRSA::create):
(WebCore::CryptoKeyRSA::CryptoKeyRSA):
(WebCore::CryptoKeyRSA::keySizeInBits const):
(WebCore::CryptoKeyRSA::generatePair):
(WebCore::CryptoKeyRSA::importSpki):
(WebCore::CryptoKeyRSA::importPkcs8):
(WebCore::CryptoKeyRSA::exportSpki const):
(WebCore::CryptoKeyRSA::exportPkcs8 const):
(WebCore::CryptoKeyRSA::algorithm const):
(WebCore::CryptoKeyRSA::exportData const):
(WebCore::CryptoKeyRSA::~CryptoKeyRSA): Deleted.

  • crypto/keys/CryptoKeyRSA.h:

(WebCore::CCRSACryptorRefDeleter::operator() const):

  • crypto/mac/CryptoKeyRSAMac.cpp:

(WebCore::getPublicKeyComponents):
(WebCore::getPrivateKeyComponents):
(WebCore::CryptoKeyRSA::CryptoKeyRSA):
(WebCore::CryptoKeyRSA::create):
(WebCore::CryptoKeyRSA::exportData const):
(WebCore::CryptoKeyRSA::generatePair):
(WebCore::CryptoKeyRSA::importSpki):
(WebCore::CryptoKeyRSA::importPkcs8):
(WebCore::CryptoKeyRSA::~CryptoKeyRSA): Deleted.

7:54 PM Changeset in webkit [239661] by Alan Bujtas
  • 3 edits
    2 adds in trunk

Incorrect clipping across compositing boundary.
​https://bugs.webkit.org/show_bug.cgi?id=193172
<rdar://problem/44693008>

Reviewed by Simon Fraser.

Source/WebCore:

Use temporary cliprect type when crossing compositing boundary to prevent cliprect caching.

The issue here is that RenderLayer::backgroundClipRect() could cross compositing boundary by calling parentClipRects() which triggers
clip rect update using the wrong painting root. This happens when the layer hierarchy and the compositing context do not match.
For clip rect computation, we need to climb up on the layer hierarchy (calling parent layer's cliprect functions)
but we also need to make sure that the computed cliprects on any given layer are cached only when the painting root is correct.
It ensures that when we paint a layer (with the painting root as entry point), the cached cliprects are always based on its onw painting root.

Test: compositing/clipping/cached-cliprect-with-compositing-boundary.html

  • rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects const):

LayoutTests:

  • compositing/clipping/cached-cliprect-with-compositing-boundary-expected.html: Added.
  • compositing/clipping/cached-cliprect-with-compositing-boundary.html: Added.
5:19 PM Changeset in webkit [239660] by commit-queue@webkit.org
  • 2 edits in trunk/Tools

[GTK] Add python3-setuptools, libunistring-dev, bison and flex dependencies
​https://bugs.webkit.org/show_bug.cgi?id=193136

Patch by Oriol Brufau <Oriol Brufau> on 2019-01-05
Reviewed by Michael Catanzaro.

  • gtk/install-dependencies:

Add python3-setuptools, libunistring-dev, bison and flex to install-dependencies,
they are needed by update-webkitgtk-libs.

12:51 PM Changeset in webkit [239659] by youenn@apple.com
  • 21 edits in trunk

Service Worker fetch should obey its referrer policy
​https://bugs.webkit.org/show_bug.cgi?id=193152

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

  • web-platform-tests/fetch/api/policies/referrer-origin-service-worker.https-expected.txt:
  • web-platform-tests/service-workers/service-worker/referrer-policy-header.https-expected.txt:

Source/WebCore:

Pass referrer policy retrieved when fetching the service worker script to the SWServer.
The SWServer then stores it persistently and sends it to the manager creating service workers.
This manager will then set the referrer policy on the dummy Document of the corresponding service worker.

Covered by rebased test.

  • workers/WorkerScriptLoader.cpp:

(WebCore::WorkerScriptLoader::didReceiveResponse):

  • workers/WorkerScriptLoader.h:

(WebCore::WorkerScriptLoader::referrerPolicy const):

  • workers/service/SWClientConnection.cpp:

(WebCore::SWClientConnection::failedFetchingScript):

  • workers/service/ServiceWorkerContainer.cpp:

(WebCore::ServiceWorkerContainer::jobFinishedLoadingScript):

  • workers/service/ServiceWorkerContainer.h:
  • workers/service/ServiceWorkerContextData.cpp:

(WebCore::ServiceWorkerContextData::isolatedCopy const):

  • workers/service/ServiceWorkerContextData.h:

(WebCore::ServiceWorkerContextData::encode const):
(WebCore::ServiceWorkerContextData::decode):

  • workers/service/ServiceWorkerFetchResult.h:

(WebCore::ServiceWorkerFetchResult::encode const):
(WebCore::ServiceWorkerFetchResult::decode):

  • workers/service/ServiceWorkerJob.cpp:

(WebCore::ServiceWorkerJob::notifyFinished):

  • workers/service/ServiceWorkerJobClient.h:
  • workers/service/context/ServiceWorkerThreadProxy.cpp:

(WebCore::createPageForServiceWorker):

  • workers/service/server/RegistrationDatabase.cpp:

(WebCore::recordsTableSchema):
(WebCore::RegistrationDatabase::doPushChanges):
(WebCore::RegistrationDatabase::importRecords):

  • workers/service/server/SWServer.cpp:

(WebCore::SWServer::addRegistrationFromStore):
(WebCore::SWServer::updateWorker):
(WebCore::SWServer::installContextData):

  • workers/service/server/SWServer.h:
  • workers/service/server/SWServerJobQueue.cpp:

(WebCore::SWServerJobQueue::scriptFetchFinished):

  • workers/service/server/SWServerWorker.cpp:

(WebCore::SWServerWorker::SWServerWorker):
(WebCore::SWServerWorker::contextData const):

  • workers/service/server/SWServerWorker.h:
10:40 AM Changeset in webkit [239658] by Simon Fraser
  • 9 edits in trunk/Source

Factor legacy WK1 code for fixed and scrolling layers into their own helper class
​https://bugs.webkit.org/show_bug.cgi?id=193165

Reviewed by Frédéric Wang.

Source/WebCore:

RenderLayerCompositor has some code to handle registration of viewport-constrained
and scrolling layers which is specific to iOS WK1. To reduce pollution, move this
into its own helper class called LegacyWebKitScrollingLayerCoordinator, which is only
allocated for iOS WK1.

iOS WK1 never has a ScrollingCoordinator, so rather than the check for scrollingCoordinator(),
we know that we only made a LegacyWebKitScrollingLayerCoordinator when there's a platform widget
(i.e. WK1).

  • page/ChromeClient.h:
  • rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::RenderLayerCompositor):
(WebCore::RenderLayerCompositor::updateCustomLayersAfterFlush):
(WebCore::RenderLayerCompositor::didFlushChangesForLayer):
(WebCore::RenderLayerCompositor::setIsInWindow):
(WebCore::RenderLayerCompositor::willRemoveScrollingLayerWithBacking): No longer check the page cache state; now we
destroy the render tree of pages in the page cache, so we should never hit this code path.
(WebCore::RenderLayerCompositor::didAddScrollingLayer):
(WebCore::LegacyWebKitScrollingLayerCoordinator::registerAllViewportConstrainedLayers):
(WebCore::LegacyWebKitScrollingLayerCoordinator::unregisterAllViewportConstrainedLayers):
(WebCore::scrollbarHasDisplayNone):
(WebCore::LegacyWebKitScrollingLayerCoordinator::updateScrollingLayer):
(WebCore::LegacyWebKitScrollingLayerCoordinator::registerAllScrollingLayers):
(WebCore::LegacyWebKitScrollingLayerCoordinator::registerScrollingLayersNeedingUpdate):
(WebCore::LegacyWebKitScrollingLayerCoordinator::unregisterAllScrollingLayers):
(WebCore::LegacyWebKitScrollingLayerCoordinator::addScrollingLayer):
(WebCore::LegacyWebKitScrollingLayerCoordinator::removeScrollingLayer):
(WebCore::LegacyWebKitScrollingLayerCoordinator::didFlushChangesForLayer):
(WebCore::updateScrollingLayerWithClient): Deleted.
(WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers): Deleted.
(WebCore::RenderLayerCompositor::unregisterAllViewportConstrainedLayers): Deleted.
(WebCore::RenderLayerCompositor::registerAllScrollingLayers): Deleted.
(WebCore::RenderLayerCompositor::unregisterAllScrollingLayers): Deleted.

  • rendering/RenderLayerCompositor.h:

(WebCore::LegacyWebKitScrollingLayerCoordinator::LegacyWebKitScrollingLayerCoordinator):

  • workers/service/ServiceWorkerContainer.cpp:

(WebCore::ServiceWorkerContainer::~ServiceWorkerContainer):

Source/WebKitLegacy/ios:

Make the stickyContainerMap argument const. We WTFMove() values out of the first
argument, so it can't be const.

  • WebCoreSupport/WebChromeClientIOS.h:
  • WebCoreSupport/WebChromeClientIOS.mm:

(WebChromeClientIOS::updateViewportConstrainedLayers):

  • WebCoreSupport/WebFixedPositionContent.mm:

(-[WebFixedPositionContent setViewportConstrainedLayers:stickyContainerMap:]):

  • WebCoreSupport/WebFixedPositionContentInternal.h:
4:01 AM Changeset in webkit [239657] by aakash_jain@apple.com
  • 2 edits in trunk/Tools

Unreviewed follow-up fix to r239650
​https://bugs.webkit.org/show_bug.cgi?id=193140
<rdar://problem/47063037>

Typecast patch_id to string.

  • BuildSlaveSupport/ews-build/steps.py:

(ValidatePatch._is_patch_obsolete):

3:30 AM Changeset in webkit [239656] by commit-queue@webkit.org
  • 2 edits in trunk/LayoutTests

Unreviewed, rolling out r239607.
​https://bugs.webkit.org/show_bug.cgi?id=193169

This change makes the test even more flaky (Requested by fredw
on #webkit).

Reverted changeset:

"Flaky Test: http/wpt/css/css-animations/start-
animation-001.html"
​https://bugs.webkit.org/show_bug.cgi?id=190903
​https://trac.webkit.org/changeset/239607

12:38 AM Changeset in webkit [239655] by Alan Bujtas
  • 14 edits in trunk/Source/WebCore

[LFC] VerticalMargin should only have the used values.
​https://bugs.webkit.org/show_bug.cgi?id=193168

Reviewed by Antti Koivisto.

Split VerticalMargin into ComputedVerticalMargin and UsedVerticalMargin.
ComputedVerticalMargin holds the computed (optional) values while UsedVerticalMargin holds both the
collapsed (optional) and the non-collapsed values.

  • layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::computeOutOfFlowVerticalGeometry const):

  • layout/FormattingContext.h:
  • layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::outOfFlowNonReplacedVerticalGeometry):
(WebCore::Layout::FormattingContext::Geometry::outOfFlowReplacedVerticalGeometry):
(WebCore::Layout::FormattingContext::Geometry::complicatedCases):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedHeightAndMargin):
(WebCore::Layout::FormattingContext::Geometry::inlineReplacedWidthAndMargin):
(WebCore::Layout::FormattingContext::Geometry::computedVerticalMargin):
(WebCore::Layout::FormattingContext::Geometry::computedNonCollapsedVerticalMarginValue): Deleted.

  • layout/FormattingContextQuirks.cpp:

(WebCore::Layout::FormattingContext::Quirks::heightValueOfNearestContainingBlockWithFixedHeight):

  • layout/LayoutUnits.h:
  • layout/MarginTypes.h:

(WebCore::Layout::UsedVerticalMargin::before const):
(WebCore::Layout::UsedVerticalMargin::after const):
(WebCore::Layout::UsedVerticalMargin::nonCollapsedValues const):
(WebCore::Layout::UsedVerticalMargin::collapsedValues const):
(WebCore::Layout::UsedVerticalMargin::hasCollapsedValues const):
(WebCore::Layout::UsedVerticalMargin::setCollapsedValues):
(WebCore::Layout::UsedVerticalMargin::UsedVerticalMargin):
(WebCore::Layout::VerticalMargin::nonCollapsedValues const): Deleted.
(WebCore::Layout::VerticalMargin::collapsedValues const): Deleted.
(WebCore::Layout::VerticalMargin::setCollapsedValues): Deleted.
(WebCore::Layout::VerticalMargin::VerticalMargin): Deleted.
(WebCore::Layout::VerticalMargin::usedValues const): Deleted.

  • layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::computeHeightAndMargin const):

  • layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
(WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):

  • layout/blockformatting/BlockFormattingContextQuirks.cpp:

(WebCore::Layout::BlockFormattingContext::Quirks::stretchedHeight):

  • layout/blockformatting/BlockMarginCollapse.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::MarginCollapse::computedNonCollapsedMarginBefore):
(WebCore::Layout::BlockFormattingContext::Geometry::MarginCollapse::computedNonCollapsedMarginAfter):

  • layout/displaytree/DisplayBox.h:

(WebCore::Display::Box::setVerticalMargin):
(WebCore::Display::Box::verticalMargin const):
(WebCore::Display::Box::marginBefore const):
(WebCore::Display::Box::marginAfter const):

  • layout/floats/FloatingContext.cpp:

(WebCore::Layout::FloatingContext::verticalPositionWithClearance const):

  • layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computeHeightAndMargin const):

Note: See TracTimeline for information about the timeline view.