[webkit-changes] [211348] trunk/Source/WebKit2
Title: [211348] trunk/Source/WebKit2 Revision 211348 Author carlo...@webkit.org Date 2017-01-28 23:16:51 -0800 (Sat, 28 Jan 2017) Log Message [Threaded Compositor] Crash when detaching the CoordinatedGraphicsScene https://bugs.webkit.org/show_bug.cgi?id=167547 Reviewed by Michael Catanzaro. It seems that commitSceneState() can be called after the CoordinatedGraphicsScene has been detached. * Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp: (WebKit::CoordinatedGraphicsScene::commitSceneState): Return early if scene has been detached. (WebKit::CoordinatedGraphicsScene::detach): Take the render queue lock before clearing the render queue. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (211347 => 211348) --- trunk/Source/WebKit2/ChangeLog 2017-01-29 07:15:33 UTC (rev 211347) +++ trunk/Source/WebKit2/ChangeLog 2017-01-29 07:16:51 UTC (rev 211348) @@ -1,5 +1,18 @@ 2017-01-28 Carlos Garcia Campos +[Threaded Compositor] Crash when detaching the CoordinatedGraphicsScene +https://bugs.webkit.org/show_bug.cgi?id=167547 + +Reviewed by Michael Catanzaro. + +It seems that commitSceneState() can be called after the CoordinatedGraphicsScene has been detached. + +* Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp: +(WebKit::CoordinatedGraphicsScene::commitSceneState): Return early if scene has been detached. +(WebKit::CoordinatedGraphicsScene::detach): Take the render queue lock before clearing the render queue. + +2017-01-28 Carlos Garcia Campos + [Threaded Compositor] Crash when deleting the compositor run loop https://bugs.webkit.org/show_bug.cgi?id=167545 Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp (211347 => 211348) --- trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-01-29 07:15:33 UTC (rev 211347) +++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/CoordinatedGraphicsScene.cpp 2017-01-29 07:16:51 UTC (rev 211348) @@ -598,6 +598,9 @@ void CoordinatedGraphicsScene::commitSceneState(const CoordinatedGraphicsState& state) { +if (!m_client) +return; + m_renderedContentsScrollPosition = state.scrollPosition; createLayers(state.layersToCreate); @@ -707,9 +710,10 @@ void CoordinatedGraphicsScene::detach() { ASSERT(isMainThread()); -m_renderQueue.clear(); m_isActive = false; m_client = nullptr; +LockHolder locker(m_renderQueueMutex); +m_renderQueue.clear(); } void CoordinatedGraphicsScene::appendUpdate(std::function&& function) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211347] trunk/Source/WebKit2
Title: [211347] trunk/Source/WebKit2 Revision 211347 Author carlo...@webkit.org Date 2017-01-28 23:15:33 -0800 (Sat, 28 Jan 2017) Log Message [Threaded Compositor] Crash when deleting the compositor run loop https://bugs.webkit.org/show_bug.cgi?id=167545 Reviewed by Michael Catanzaro. The problem is that we are releasing the WorkQueue before the update timer that keeps a reference to the run loop, destroyed by the WorkQueue. So, invalidate the WorkQueue in the next run loop iteration to ensure it happens after the CompositingRunLoop destructor. * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp: (WebKit::CompositingRunLoop::~CompositingRunLoop): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (211346 => 211347) --- trunk/Source/WebKit2/ChangeLog 2017-01-29 07:14:12 UTC (rev 211346) +++ trunk/Source/WebKit2/ChangeLog 2017-01-29 07:15:33 UTC (rev 211347) @@ -1,5 +1,19 @@ 2017-01-28 Carlos Garcia Campos +[Threaded Compositor] Crash when deleting the compositor run loop +https://bugs.webkit.org/show_bug.cgi?id=167545 + +Reviewed by Michael Catanzaro. + +The problem is that we are releasing the WorkQueue before the update timer that keeps a reference to the run +loop, destroyed by the WorkQueue. So, invalidate the WorkQueue in the next run loop iteration to ensure it +happens after the CompositingRunLoop destructor. + +* Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp: +(WebKit::CompositingRunLoop::~CompositingRunLoop): + +2017-01-28 Carlos Garcia Campos + [GTK] ASSERTION FAILED: !m_layerTreeHost in DrawingAreaImpl::display() https://bugs.webkit.org/show_bug.cgi?id=167548 Modified: trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (211346 => 211347) --- trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2017-01-29 07:14:12 UTC (rev 211346) +++ trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2017-01-29 07:15:33 UTC (rev 211347) @@ -119,7 +119,11 @@ CompositingRunLoop::~CompositingRunLoop() { -WorkQueuePool::singleton().invalidate(this); +ASSERT(isMainThread()); +// Make sure the WorkQueue is deleted after the CompositingRunLoop, because m_updateTimer has a reference +// of the WorkQueue run loop. Passing this is not a problem because the pointer will only be used as a +// HashMap key by WorkQueuePool. +RunLoop::main().dispatch([context = this] { WorkQueuePool::singleton().invalidate(context); }); } void CompositingRunLoop::performTask(Function&& function) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211346] trunk/Source/WebKit2
Title: [211346] trunk/Source/WebKit2 Revision 211346 Author carlo...@webkit.org Date 2017-01-28 23:14:12 -0800 (Sat, 28 Jan 2017) Log Message [GTK] ASSERTION FAILED: !m_layerTreeHost in DrawingAreaImpl::display() https://bugs.webkit.org/show_bug.cgi?id=167548 Reviewed by Michael Catanzaro. The problem is that non accelerated compositing forceRepaint implementation is doing a layout and then calling display. The layout makes the drawing area enter in AC mode and display asserts that we have a layer tree host. forceRepaint shouldn't do the layout because display already does that and it correctly handles the case of entering AC mode during the layout. It shouldn't call setNeedsDisplay either, because that schedules a display, but we are going to display synchronously. * WebProcess/WebPage/DrawingAreaImpl.cpp: (WebKit::DrawingAreaImpl::forceRepaint): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (211345 => 211346) --- trunk/Source/WebKit2/ChangeLog 2017-01-29 01:02:22 UTC (rev 211345) +++ trunk/Source/WebKit2/ChangeLog 2017-01-29 07:14:12 UTC (rev 211346) @@ -1,3 +1,19 @@ +2017-01-28 Carlos Garcia Campos + +[GTK] ASSERTION FAILED: !m_layerTreeHost in DrawingAreaImpl::display() +https://bugs.webkit.org/show_bug.cgi?id=167548 + +Reviewed by Michael Catanzaro. + +The problem is that non accelerated compositing forceRepaint implementation is doing a layout and then calling +display. The layout makes the drawing area enter in AC mode and display asserts that we have a layer tree +host. forceRepaint shouldn't do the layout because display already does that and it correctly handles the case +of entering AC mode during the layout. It shouldn't call setNeedsDisplay either, because that schedules a +display, but we are going to display synchronously. + +* WebProcess/WebPage/DrawingAreaImpl.cpp: +(WebKit::DrawingAreaImpl::forceRepaint): + 2017-01-28 Tim Horton Don't flash a tap highlight for the entirety of an editable WKWebView Modified: trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp (211345 => 211346) --- trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2017-01-29 01:02:22 UTC (rev 211345) +++ trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp 2017-01-29 07:14:12 UTC (rev 211346) @@ -152,10 +152,11 @@ return; } -setNeedsDisplay(); -m_webPage.layoutIfNeeded(); m_isWaitingForDidUpdate = false; -display(); +if (m_isPaintingEnabled) { +m_dirtyRegion = m_webPage.bounds(); +display(); +} } void DrawingAreaImpl::mainFrameContentSizeChanged(const WebCore::IntSize& newSize) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211345] trunk
Title: [211345] trunk Revision 211345 Author mattba...@apple.com Date 2017-01-28 17:02:22 -0800 (Sat, 28 Jan 2017) Log Message Web Inspector: Need some limit on Async Call Stacks for async loops (rAF loops) https://bugs.webkit.org/show_bug.cgi?id=165633 Reviewed by Joseph Pecoraro. Source/_javascript_Core: This patch limits the memory used by the Inspector backend to store async stack trace data. Asynchronous stack traces are stored as a disjoint set of parent pointer trees. Tree nodes represent asynchronous operations, and hold a copy of the stack trace at the time the operation was scheduled. Each tree can be regarded as a set of stack traces, stored as singly linked lists that share part of their structure (specifically their tails). Traces belonging to the same tree will at least share a common root. A stack trace begins at a leaf node and follows the chain of parent pointers to the root of of the tree. Leaf nodes always contain pending asynchronous calls. When an asynchronous operation is scheduled with requestAnimationFrame, setInterval, etc, a node is created containing the current call stack and some bookkeeping data for the operation. An unique identifier comprised of an operation type and callback identifier is mapped to the node. If scheduling the callback was itself the result of an asynchronous call, the node becomes a child of the node associated with that call, otherwise it becomes the root of a new tree. A node is either `pending`, `active`, `dispatched`, or `canceled`. Nodes start out as pending. After a callback for a pending node is dispatched the node is marked as such, unless it is a repeating callback such as setInterval, in which case it remains pending. Once a node is no longer pending it is removed, as long as it has no children. Since nodes are reference counted, it is a property of the stack trace tree that nodes that are no longer pending and have no children pointing to them will be automatically pruned from the tree. If an async operation is canceled (e.g. cancelTimeout), the associated node is marked as such. If the callback is not being dispatched at the time, and has no children, it is removed. Because async operations can be chained indefinitely, stack traces are limited to a maximum depth. The depth of a stack trace is equal to the sum of the depths of its nodes, with a node's depth equal to the number of frames in its associated call stack. For any stack trace, S = { s𝟶, s𝟷, …, s𝑘 }, with endpoints s𝟶, s𝑘 depth(S) = depth(s𝟶) + depth(s𝟷) + … + depth(s𝑘) A stack trace is truncated when it exceeds the maximum depth. Truncation occurs on node boundaries, not call frames, consequently the maximum depth is more of a target than a guarantee: d = maximum stack trace depth for all S, depth(S) ≤ d + depth(s𝑘) Because nodes can belong to multiple stack traces, it may be necessary to clone the tail of a stack trace being truncated to prevent other traces from being effected. * CMakeLists.txt: * _javascript_Core.xcodeproj/project.pbxproj: * inspector/AsyncStackTrace.cpp: Added. (Inspector::AsyncStackTrace::create): (Inspector::AsyncStackTrace::AsyncStackTrace): (Inspector::AsyncStackTrace::~AsyncStackTrace): (Inspector::AsyncStackTrace::isPending): (Inspector::AsyncStackTrace::isLocked): (Inspector::AsyncStackTrace::willDispatchAsyncCall): (Inspector::AsyncStackTrace::didDispatchAsyncCall): (Inspector::AsyncStackTrace::didCancelAsyncCall): (Inspector::AsyncStackTrace::buildInspectorObject): (Inspector::AsyncStackTrace::truncate): (Inspector::AsyncStackTrace::remove): * inspector/AsyncStackTrace.h: * inspector/agents/InspectorDebuggerAgent.cpp: (Inspector::InspectorDebuggerAgent::didScheduleAsyncCall): (Inspector::InspectorDebuggerAgent::didCancelAsyncCall): (Inspector::InspectorDebuggerAgent::willDispatchAsyncCall): (Inspector::InspectorDebuggerAgent::didDispatchAsyncCall): (Inspector::InspectorDebuggerAgent::didPause): (Inspector::InspectorDebuggerAgent::clearAsyncStackTraceData): (Inspector::InspectorDebuggerAgent::buildAsyncStackTrace): Deleted. (Inspector::InspectorDebuggerAgent::refAsyncCallData): Deleted. (Inspector::InspectorDebuggerAgent::derefAsyncCallData): Deleted. * inspector/agents/InspectorDebuggerAgent.h: * inspector/protocol/Console.json: Source/WebInspectorUI: * Localizations/en.lproj/localizedStrings.js: Text for "Truncated" marker tree element. * UserInterface/Models/StackTrace.js: (WebInspector.StackTrace): (WebInspector.StackTrace.fromPayload): (WebInspector.StackTrace.prototype.get truncated): Plumbing for new Console.StackTrace property `truncated`. * UserInterface/Views/ThreadTreeElement.css: (.tree-outline > .item.thread + ol > .item.truncated-call-frames): (.tree-outline > .item.thread + ol > .item.truncated-call-frames .icon): Styles for "Truncated" marker tree element. * UserInterface/Views/ThreadTreeElement.js: (WebInspector.ThreadTreeElement.prototype.refresh): Append "Truncated" marker tree element if necess
[webkit-changes] [211344] trunk/Source/JavaScriptCore
Title: [211344] trunk/Source/_javascript_Core Revision 211344 Author commit-qu...@webkit.org Date 2017-01-28 16:39:45 -0800 (Sat, 28 Jan 2017) Log Message Remote Inspector: Listing should be updated when a target gains or loses a debugger session https://bugs.webkit.org/show_bug.cgi?id=167449 Patch by Joseph Pecoraro on 2017-01-28 Reviewed by Brian Burg. * inspector/remote/RemoteInspector.h: * inspector/remote/RemoteInspector.mm: (Inspector::RemoteInspector::setupFailed): (Inspector::RemoteInspector::updateTargetListing): (Inspector::RemoteInspector::receivedSetupMessage): (Inspector::RemoteInspector::receivedDidCloseMessage): (Inspector::RemoteInspector::receivedConnectionDiedMessage): Whenever we add/remove a connection we should update the listing properties for that target that corresponded to that connection. In this way group updating active sessions, the target, and pushing listing together. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm Diff Modified: trunk/Source/_javascript_Core/ChangeLog (211343 => 211344) --- trunk/Source/_javascript_Core/ChangeLog 2017-01-29 00:16:51 UTC (rev 211343) +++ trunk/Source/_javascript_Core/ChangeLog 2017-01-29 00:39:45 UTC (rev 211344) @@ -1,3 +1,21 @@ +2017-01-28 Joseph Pecoraro + +Remote Inspector: Listing should be updated when a target gains or loses a debugger session +https://bugs.webkit.org/show_bug.cgi?id=167449 + +Reviewed by Brian Burg. + +* inspector/remote/RemoteInspector.h: +* inspector/remote/RemoteInspector.mm: +(Inspector::RemoteInspector::setupFailed): +(Inspector::RemoteInspector::updateTargetListing): +(Inspector::RemoteInspector::receivedSetupMessage): +(Inspector::RemoteInspector::receivedDidCloseMessage): +(Inspector::RemoteInspector::receivedConnectionDiedMessage): +Whenever we add/remove a connection we should update the listing properties +for that target that corresponded to that connection. In this way group +updating active sessions, the target, and pushing listing together. + 2017-01-27 Yusuke Suzuki Lift template escape sequence restrictions in tagged templates Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h (211343 => 211344) --- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-01-29 00:16:51 UTC (rev 211343) +++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h 2017-01-29 00:39:45 UTC (rev 211344) @@ -102,6 +102,9 @@ void pushListingsNow(); void pushListingsSoon(); +void updateTargetListing(unsigned targetIdentifier); +void updateTargetListing(const RemoteControllableTarget&); + void updateHasActiveDebugSession(); void updateClientCapabilities(); Modified: trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm (211343 => 211344) --- trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2017-01-29 00:16:51 UTC (rev 211343) +++ trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.mm 2017-01-29 00:39:45 UTC (rev 211344) @@ -319,11 +319,11 @@ m_targetConnectionMap.remove(targetIdentifier); -updateHasActiveDebugSession(); - if (targetIdentifier == m_automaticInspectionCandidateTargetIdentifier) m_automaticInspectionPaused = false; +updateHasActiveDebugSession(); +updateTargetListing(targetIdentifier); pushListingsSoon(); } @@ -615,6 +615,26 @@ }); } +#pragma mark - Update Listing with lock + +void RemoteInspector::updateTargetListing(unsigned targetIdentifier) +{ +auto target = m_targetMap.get(targetIdentifier); +if (!target) +return; + +updateTargetListing(*target); +} + +void RemoteInspector::updateTargetListing(const RemoteControllableTarget& target) +{ +RetainPtr targetListing = listingForTarget(target); +if (!targetListing) +return; + +m_targetListingMap.set(target.targetIdentifier(), targetListing); +} + #pragma mark - Active Debugger Sessions void RemoteInspector::updateHasActiveDebugSession() @@ -629,7 +649,6 @@ // Legacy iOS WebKit 1 had a notification. This will need to be smarter with WebKit2. } - #pragma mark - Received XPC Messages void RemoteInspector::receivedSetupMessage(NSDictionary *userInfo) @@ -666,7 +685,6 @@ return; } m_targetConnectionMap.set(targetIdentifier, WTFMove(connectionToTarget)); -updateHasActiveDebugSession(); } else if (is(target)) { if (!connectionToTarget->setup()) { connectionToTarget->close(); @@ -673,10 +691,11 @@ return; } m_targetConnectionMap.set(targetIdentifier, WTFMove(connectionToTarget)); -updateHasActiveDebugSession(); } else ASSERT_NOT_REACHED(); +updat
[webkit-changes] [211343] trunk/Source
Title: [211343] trunk/Source Revision 211343 Author timothy_hor...@apple.com Date 2017-01-28 16:16:51 -0800 (Sat, 28 Jan 2017) Log Message Don't flash a tap highlight for the entirety of an editable WKWebView https://bugs.webkit.org/show_bug.cgi?id=167486 Reviewed by Dan Bernstein. * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Bail from providing a tap highlight if we are about to highlight the entire body of an editable web view. * dom/Document.h: Export. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/Document.h trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm Diff Modified: trunk/Source/WebCore/ChangeLog (211342 => 211343) --- trunk/Source/WebCore/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342) +++ trunk/Source/WebCore/ChangeLog 2017-01-29 00:16:51 UTC (rev 211343) @@ -1,3 +1,14 @@ +2017-01-28 Tim Horton + +Don't flash a tap highlight for the entirety of an editable WKWebView +https://bugs.webkit.org/show_bug.cgi?id=167486 + + +Reviewed by Dan Bernstein. + +* dom/Document.h: +Export. + 2017-01-28 Wenson Hsieh Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions Modified: trunk/Source/WebCore/dom/Document.h (211342 => 211343) --- trunk/Source/WebCore/dom/Document.h 2017-01-28 23:13:17 UTC (rev 211342) +++ trunk/Source/WebCore/dom/Document.h 2017-01-29 00:16:51 UTC (rev 211343) @@ -889,7 +889,7 @@ static bool hasValidNamespaceForElements(const QualifiedName&); static bool hasValidNamespaceForAttributes(const QualifiedName&); -HTMLBodyElement* body() const; +WEBCORE_EXPORT HTMLBodyElement* body() const; WEBCORE_EXPORT HTMLElement* bodyOrFrameset() const; WEBCORE_EXPORT ExceptionOr setBodyOrFrameset(RefPtr&&); Modified: trunk/Source/WebKit2/ChangeLog (211342 => 211343) --- trunk/Source/WebKit2/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342) +++ trunk/Source/WebKit2/ChangeLog 2017-01-29 00:16:51 UTC (rev 211343) @@ -1,3 +1,16 @@ +2017-01-28 Tim Horton + +Don't flash a tap highlight for the entirety of an editable WKWebView +https://bugs.webkit.org/show_bug.cgi?id=167486 + + +Reviewed by Dan Bernstein. + +* WebProcess/WebPage/ios/WebPageIOS.mm: +(WebKit::WebPage::sendTapHighlightForNodeIfNecessary): +Bail from providing a tap highlight if we are about to highlight +the entire body of an editable web view. + 2017-01-28 Wenson Hsieh Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (211342 => 211343) --- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-28 23:13:17 UTC (rev 211342) +++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-01-29 00:16:51 UTC (rev 211343) @@ -68,6 +68,7 @@ #import #import #import +#import #import #import #import @@ -633,6 +634,9 @@ if (!node) return; +if (m_page->isEditable() && node == m_page->mainFrame().document()->body()) +return; + if (is(*node)) { ASSERT(m_page); m_page->mainFrame().loader().client().prefetchDNS(downcast(*node).absoluteLinkURL().host()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211342] trunk/Source
Title: [211342] trunk/Source Revision 211342 Author wenson_hs...@apple.com Date 2017-01-28 15:13:17 -0800 (Sat, 28 Jan 2017) Log Message Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions https://bugs.webkit.org/show_bug.cgi?id=167555 Reviewed by Dan Bernstein. Instead of guarding #import on the existence of the imported file, consult USE(APPLE_INTERNAL_SDK) instead. Source/WebCore: * page/ios/EventHandlerIOS.mm: * platform/ios/DragImageIOS.mm: * platform/ios/PasteboardIOS.mm: * platform/mac/DragDataMac.mm: Source/WebKit2: * UIProcess/Cocoa/WebPageProxyCocoa.mm: * UIProcess/ios/WKContentViewInteraction.h: * UIProcess/ios/WKContentViewInteraction.mm: * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm: Source/WTF: * wtf/Platform.h: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/ios/EventHandlerIOS.mm trunk/Source/WebCore/platform/ios/DragImageIOS.mm trunk/Source/WebCore/platform/ios/PasteboardIOS.mm trunk/Source/WebCore/platform/mac/DragDataMac.mm trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Cocoa/WebPageProxyCocoa.mm trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm Diff Modified: trunk/Source/WTF/ChangeLog (211341 => 211342) --- trunk/Source/WTF/ChangeLog 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WTF/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342) @@ -1,3 +1,15 @@ +2017-01-28 Wenson Hsieh + +Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions +https://bugs.webkit.org/show_bug.cgi?id=167555 + +Reviewed by Dan Bernstein. + +Instead of guarding #import on the existence of the imported file, consult +USE(APPLE_INTERNAL_SDK) instead. + +* wtf/Platform.h: + 2017-01-26 Saam Barati Harden how the compiler references GC objects Modified: trunk/Source/WTF/wtf/Platform.h (211341 => 211342) --- trunk/Source/WTF/wtf/Platform.h 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WTF/wtf/Platform.h 2017-01-28 23:13:17 UTC (rev 211342) @@ -669,7 +669,7 @@ /* Include feature macros */ #include -#if defined(__has_include) && __has_include() +#if USE(APPLE_INTERNAL_SDK) #include #endif Modified: trunk/Source/WebCore/ChangeLog (211341 => 211342) --- trunk/Source/WebCore/ChangeLog 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 23:13:17 UTC (rev 211342) @@ -1,3 +1,18 @@ +2017-01-28 Wenson Hsieh + +Check USE(APPLE_INTERNAL_SDK) instead of specific headers when importing from WebKitAdditions +https://bugs.webkit.org/show_bug.cgi?id=167555 + +Reviewed by Dan Bernstein. + +Instead of guarding #import on the existence of the imported file, consult +USE(APPLE_INTERNAL_SDK) instead. + +* page/ios/EventHandlerIOS.mm: +* platform/ios/DragImageIOS.mm: +* platform/ios/PasteboardIOS.mm: +* platform/mac/DragDataMac.mm: + 2017-01-28 Yoav Weiss Add Link Preload as an off-by-default experimental feature menu item. Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (211341 => 211342) --- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2017-01-28 23:13:17 UTC (rev 211342) @@ -49,7 +49,7 @@ #import #endif -#if USE(APPLE_INTERNAL_SDK) && __has_include() +#if USE(APPLE_INTERNAL_SDK) #import #endif Modified: trunk/Source/WebCore/platform/ios/DragImageIOS.mm (211341 => 211342) --- trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WebCore/platform/ios/DragImageIOS.mm 2017-01-28 23:13:17 UTC (rev 211342) @@ -28,7 +28,7 @@ #import -#if USE(APPLE_INTERNAL_SDK) && __has_include() +#if USE(APPLE_INTERNAL_SDK) #import Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (211341 => 211342) --- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2017-01-28 23:13:17 UTC (rev 211342) @@ -58,7 +58,7 @@ - (BOOL)containsAttachments; @end -#if USE(APPLE_INTERNAL_SDK) && __has_include() +#if USE(APPLE_INTERNAL_SDK) #import #endif Modified: trunk/Source/WebCore/platform/mac/DragDataMac.mm (211341 => 211342) --- trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-28 22:53:54 UTC (rev 211341) +++ trunk/Source/WebCore/platform/mac/DragDataMac.mm 2017-01-28 23:13:17 UTC (rev 211342) @@ -33,7 +33,7 @@ #import "PlatformStrategies.h" #import "WebCoreNSURLExtras.h" -#if USE(APPLE_INTERNAL_SDK) && __has_include() +#if USE(APPLE_INTERNAL_SDK) #import Modified: trunk/Source/WebKit2/ChangeLog (211341
[webkit-changes] [211341] trunk
Title: [211341] trunk Revision 211341 Author y...@yoav.ws Date 2017-01-28 14:53:54 -0800 (Sat, 28 Jan 2017) Log Message Add Link Preload as an off-by-default experimental feature menu item. https://bugs.webkit.org/show_bug.cgi?id=167201 Reviewed by Ryosuke Niwa. Source/WebCore: Removed the explicit setting of the Link Preload experimental feature, as it is now on by default for testing. No new tests as this just removes methods from settings. * testing/InternalSettings.cpp: (WebCore::InternalSettings::Backup::Backup): (WebCore::InternalSettings::Backup::restoreTo): * testing/InternalSettings.h: * testing/InternalSettings.idl: Source/WebKit/mac: * WebView/WebPreferenceKeysPrivate.h: * WebView/WebPreferences.mm: (-[WebPreferences linkPreloadEnabled]): (-[WebPreferences setLinkPreloadEnabled:]): * WebView/WebPreferencesPrivate.h: * WebView/WebView.mm: (-[WebView _preferencesChanged:]): Source/WebKit/win: * WebPreferenceKeysPrivate.h: * WebPreferences.cpp: (WebPreferences::initializeDefaultSettings): (WebPreferences::valueForKey): (WebPreferences::setLinkPreloadEnabled): (WebPreferences::linkPreloadEnabled): * WebPreferences.h: * Interfaces/IWebPreferencesPrivate.idl: Source/WebKit2: * Shared/WebPreferencesDefinitions.h: * UIProcess/API/C/WKPreferences.cpp: (WKPreferencesSetLinkPreloadEnabled): (WKPreferencesGetLinkPreloadEnabled): * UIProcess/API/C/WKPreferencesRefPrivate.h: * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updatePreferences): Tools: * DumpRenderTree/mac/DumpRenderTree.mm: (resetWebPreferencesToConsistentValues): * DumpRenderTree/win/DumpRenderTree.cpp: (resetWebPreferencesToConsistentValues): Websites/webkit.org: * experimental-features.html: Added Link Preload. LayoutTests: Removed code explicitly enabling Link preload from the tests, as it is now turned on by default for testing. Corrected expectation files accordingly. * http/tests/fetch/redirectmode-and-preload.html: * http/tests/preload/delaying_onload_link_preload_after_discovery.html: * http/tests/preload/delaying_onload_link_preload_after_discovery_image.html: * http/tests/preload/download_resources-expected.txt: * http/tests/preload/download_resources.html: * http/tests/preload/download_resources_from_header_iframe.html: * http/tests/preload/download_resources_from_invalid_headers.html: * http/tests/preload/dynamic_adding_preload.html: * http/tests/preload/dynamic_remove_preload_href-expected.txt: * http/tests/preload/dynamic_remove_preload_href.html: * http/tests/preload/not_delaying_window_onload_before_discovery.html: * http/tests/preload/onerror_event-expected.txt: * http/tests/preload/onerror_event.html: * http/tests/preload/onload_event-expected.txt: * http/tests/preload/onload_event.html: * http/tests/preload/resources/download_resources_from_header.php: * http/tests/preload/resources/invalid_resources_from_header.php: * http/tests/preload/single_download_preload-expected.txt: * http/tests/preload/single_download_preload.html: * http/tests/security/cached-cross-origin-preloaded-css-stylesheet.html: * http/tests/security/cached-cross-origin-preloading-css-stylesheet.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/http/tests/fetch/redirectmode-and-preload.html trunk/LayoutTests/http/tests/preload/delaying_onload_link_preload_after_discovery.html trunk/LayoutTests/http/tests/preload/delaying_onload_link_preload_after_discovery_image.html trunk/LayoutTests/http/tests/preload/download_resources-expected.txt trunk/LayoutTests/http/tests/preload/download_resources.html trunk/LayoutTests/http/tests/preload/download_resources_from_header_iframe.html trunk/LayoutTests/http/tests/preload/download_resources_from_invalid_headers.html trunk/LayoutTests/http/tests/preload/dynamic_adding_preload.html trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href-expected.txt trunk/LayoutTests/http/tests/preload/dynamic_remove_preload_href.html trunk/LayoutTests/http/tests/preload/not_delaying_window_onload_before_discovery.html trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt trunk/LayoutTests/http/tests/preload/onerror_event.html trunk/LayoutTests/http/tests/preload/onload_event-expected.txt trunk/LayoutTests/http/tests/preload/onload_event.html trunk/LayoutTests/http/tests/preload/resources/download_resources_from_header.php trunk/LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php trunk/LayoutTests/http/tests/preload/single_download_preload-expected.txt trunk/LayoutTests/http/tests/preload/single_download_preload.html trunk/LayoutTests/http/tests/security/cached-cross-origin-preloaded-css-stylesheet.html trunk/LayoutTests/http/tests/security/cached-cross-origin-preloading-css-stylesheet.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/testing/InternalSettings.cpp trunk/Source/WebCore/testing/InternalSettings.h trunk/Source/WebCore/testing/InternalSettings.idl trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/WebView/WebPreferenceKeys
[webkit-changes] [211340] trunk/Source/WebCore
Title: [211340] trunk/Source/WebCore Revision 211340 Author commit-qu...@webkit.org Date 2017-01-28 14:35:17 -0800 (Sat, 28 Jan 2017) Log Message Fix typo in error message https://bugs.webkit.org/show_bug.cgi?id=167554 Patch by Joseph Pecoraro on 2017-01-28 Reviewed by Sam Weinig. * bindings/scripts/CodeGenerator.pm: (GetEnumByType): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm Diff Modified: trunk/Source/WebCore/ChangeLog (211339 => 211340) --- trunk/Source/WebCore/ChangeLog 2017-01-28 18:16:41 UTC (rev 211339) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 22:35:17 UTC (rev 211340) @@ -1,3 +1,13 @@ +2017-01-28 Joseph Pecoraro + +Fix typo in error message +https://bugs.webkit.org/show_bug.cgi?id=167554 + +Reviewed by Sam Weinig. + +* bindings/scripts/CodeGenerator.pm: +(GetEnumByType): + 2017-01-28 Antoine Quint [Modern Media Controls] REGRESSION: Video stops playing after going into Full Screen in media documents Modified: trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm (211339 => 211340) --- trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2017-01-28 18:16:41 UTC (rev 211339) +++ trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm 2017-01-28 22:35:17 UTC (rev 211340) @@ -440,7 +440,7 @@ my $name = $type->name; -die "GetEnumByName() was called with an undefined enumeration name" unless defined($name); +die "GetEnumByType() was called with an undefined enumeration name" unless defined($name); for my $enumeration (@{$useDocument->enumerations}) { return $enumeration if $enumeration->type->name eq $name; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211339] trunk
Title: [211339] trunk Revision 211339 Author commit-qu...@webkit.org Date 2017-01-28 10:16:41 -0800 (Sat, 28 Jan 2017) Log Message [Modern Media Controls] REGRESSION: Video stops playing after going into Full Screen in media documents https://bugs.webkit.org/show_bug.cgi?id=167552 Patch by Antoine Quint on 2017-01-28 Reviewed by Eric Carlson. Source/WebCore: In the case of media documents, there is a built-in behavior, implemented in MediaDocument::defaultEventHandler(), that toggles playback when clicking or double-clicking the video. We disable this behavior by adding a "click" event handler on the entire media shadow root and calling "preventDefault()". Test: media/modern-media-controls/media-documents/click-on-video-should-not-pause.html * Modules/modern-media-controls/media/media-controller.js: (MediaController): (MediaController.prototype.handleEvent): (MediaController.prototype._containerWasClicked): LayoutTests: Add a new test that checks that clicking on a within a media document does not paused after being clicked. Since this behavior uses click events, we use window.eventSender and skip this test on iOS. * media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt: Added. * media/modern-media-controls/media-documents/click-on-video-should-not-pause.html: Added. * platform/ios-simulator/TestExpectations: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/ios-simulator/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js Added Paths trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html Diff Modified: trunk/LayoutTests/ChangeLog (211338 => 211339) --- trunk/LayoutTests/ChangeLog 2017-01-28 18:05:17 UTC (rev 211338) +++ trunk/LayoutTests/ChangeLog 2017-01-28 18:16:41 UTC (rev 211339) @@ -1,3 +1,18 @@ +2017-01-28 Antoine Quint + +[Modern Media Controls] REGRESSION: Video stops playing after going into Full Screen in media documents +https://bugs.webkit.org/show_bug.cgi?id=167552 + + +Reviewed by Eric Carlson. + +Add a new test that checks that clicking on a within a media document does not paused after being clicked. +Since this behavior uses click events, we use window.eventSender and skip this test on iOS. + +* media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt: Added. +* media/modern-media-controls/media-documents/click-on-video-should-not-pause.html: Added. +* platform/ios-simulator/TestExpectations: + 2017-01-28 Zalan Bujtas Resolve beforeChild's render tree position before calling addChildIgnoringContinuation. Added: trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt (0 => 211339) --- trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt (rev 0) +++ trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause-expected.txt 2017-01-28 18:16:41 UTC (rev 211339) @@ -0,0 +1,14 @@ +Testing that clicking on a video in a media document does not pause it. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS video.paused is false + +Clicking on video +PASS video.paused is false + +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html (0 => 211339) --- trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html (rev 0) +++ trunk/LayoutTests/media/modern-media-controls/media-documents/click-on-video-should-not-pause.html 2017-01-28 18:16:41 UTC (rev 211339) @@ -0,0 +1,48 @@ + + + + + +description("Testing that clicking on a video in a media document does not pause it."); + +window.jsTestIsAsync = true; + +let video; +(function runTestIfReady() { +const iframe = document.querySelector("iframe"); +video = iframe.contentDocument.querySelector("video"); + +if (!video) { +setTimeout(runTestIfReady) +return; +} + +if (!video.paused) +videoIsPlaying(); +else +video.addEventListener("play", videoIsPlaying); + +function videoIsPlaying() +{ +shouldBeFalse("video.paused"); + +const bounds = video.getBoundingClientRect(); +debug(""); +debug("Clicking on video"); +window.eventSender.mouseMoveTo(bounds.left + 10, bounds.top + 10); +window.eventSender.mouseDown(); +window.eventSender.mouseUp(); + +shouldBeFalse("video.paused"); + +debug(""); +iframe.remove(); +
[webkit-changes] [211338] trunk/Source/WebCore
Title: [211338] trunk/Source/WebCore Revision 211338 Author m...@apple.com Date 2017-01-28 10:05:17 -0800 (Sat, 28 Jan 2017) Log Message [Xcode] Clean up PAL and WebCore’s build settings a little https://bugs.webkit.org/show_bug.cgi?id=167292 Reviewed by Sam Weinig. Source/WebCore: * Configurations/Base.xcconfig: Simplified the definition of GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific to OS X versions that are no longer supported. * Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions that are no longer supported. Source/WebCore/PAL: * ChangeLog: Created this file. * Configurations/Base.xcconfig: Simplified the definition of GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific to OS X versions that are no longer supported. * Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions that are no longer supported. * Configurations/PAL.xcconfig: Removed header search paths that do not exist or do not make sense. Simplified the definitions of INSTALL_PATH and SKIP_INSTALL. Removed the unusued build settings PRODUCT_BUNDLE_IDENTIFIER and WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET. Removed the redundant definition of EXECUTABLE_PREFIX. * PAL.xcodeproj/project.pbxproj: Sorted the Configurations group. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/Base.xcconfig trunk/Source/WebCore/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/PAL/Configurations/Base.xcconfig trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj Added Paths trunk/Source/WebCore/PAL/ChangeLog Diff Modified: trunk/Source/WebCore/ChangeLog (211337 => 211338) --- trunk/Source/WebCore/ChangeLog 2017-01-28 16:26:48 UTC (rev 211337) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 18:05:17 UTC (rev 211338) @@ -1,3 +1,18 @@ +2017-01-28 Dan Bernstein + +[Xcode] Clean up PAL and WebCore’s build settings a little +https://bugs.webkit.org/show_bug.cgi?id=167292 + +Reviewed by Sam Weinig. + +* Configurations/Base.xcconfig: Simplified the definition of + GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed + a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific + to OS X versions that are no longer supported. + +* Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions + that are no longer supported. + 2017-01-28 Zalan Bujtas Resolve beforeChild's render tree position before calling addChildIgnoringContinuation. Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (211337 => 211338) --- trunk/Source/WebCore/Configurations/Base.xcconfig 2017-01-28 16:26:48 UTC (rev 211337) +++ trunk/Source/WebCore/Configurations/Base.xcconfig 2017-01-28 18:05:17 UTC (rev 211338) @@ -61,14 +61,9 @@ GCC_TREAT_WARNINGS_AS_ERRORS = YES; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; // FIXME: WebCore should build with -Wshorten-64-to-32 -GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH)); -GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES; -GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES; -GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES; -GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES; -GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO; -GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES; -GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO; +GCC_WARN_64_TO_32_BIT_CONVERSION = YES; +GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO; +GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -78,7 +73,6 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; -PREBINDING = NO; WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option; TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)); @@ -110,10 +104,6 @@ DEAD_CODE_STRIPPING_normal = YES; DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT)); -GCC_GENERATE_DEBUGGING_SYMBOLS = YES; -CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only; -CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = li
[webkit-changes] [211337] trunk
Title: [211337] trunk Revision 211337 Author za...@apple.com Date 2017-01-28 08:26:48 -0800 (Sat, 28 Jan 2017) Log Message Resolve beforeChild's render tree position before calling addChildIgnoringContinuation. https://bugs.webkit.org/show_bug.cgi?id=167540 Reviewed by Simon Fraser. Source/WebCore: Use the actual render tree position for the beforeChild when inside a flow thread. Test: fast/multicol/assert-on-continuation-with-spanner.html * rendering/RenderBlockFlow.cpp: (WebCore::RenderBlockFlow::addChild): * rendering/RenderInline.cpp: (WebCore::RenderInline::addChild): * rendering/RenderMultiColumnFlowThread.cpp: (WebCore::RenderMultiColumnFlowThread::resolveMovedChild): LayoutTests: * fast/multicol/assert-on-continuation-with-spanner-expected.txt: Added. * fast/multicol/assert-on-continuation-with-spanner.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderBlockFlow.cpp trunk/Source/WebCore/rendering/RenderInline.cpp trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp Added Paths trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html Diff Modified: trunk/LayoutTests/ChangeLog (211336 => 211337) --- trunk/LayoutTests/ChangeLog 2017-01-28 15:19:59 UTC (rev 211336) +++ trunk/LayoutTests/ChangeLog 2017-01-28 16:26:48 UTC (rev 211337) @@ -1,3 +1,14 @@ +2017-01-28 Zalan Bujtas + +Resolve beforeChild's render tree position before calling addChildIgnoringContinuation. +https://bugs.webkit.org/show_bug.cgi?id=167540 + + +Reviewed by Simon Fraser. + +* fast/multicol/assert-on-continuation-with-spanner-expected.txt: Added. +* fast/multicol/assert-on-continuation-with-spanner.html: Added. + 2017-01-28 Joseph Pecoraro Add User Timing Experimental Feature Added: trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt (0 => 211337) --- trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt (rev 0) +++ trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner-expected.txt 2017-01-28 16:26:48 UTC (rev 211337) @@ -0,0 +1 @@ +PASS if no crash or assert in debug. Added: trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html (0 => 211337) --- trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html (rev 0) +++ trunk/LayoutTests/fast/multicol/assert-on-continuation-with-spanner.html 2017-01-28 16:26:48 UTC (rev 211337) @@ -0,0 +1,32 @@ + + + +This tests that we can insert element when beforeChild has a spanner placeholder + +#spanner { +column-span: all; +} + +.multicol { +display: inline-block; +-webkit-columns: 80px 5; +} + + + +PASS if no crash or assert in debug. + + +if (window.testRunner) { +testRunner.waitUntilDone(); +testRunner.dumpAsText(); +} +setTimeout(function() { +inner.style.content = "close-quote"; +spanner.style.float = "left"; +if (window.testRunner) +testRunner.notifyDone(); +}, 0); + + + Modified: trunk/Source/WebCore/ChangeLog (211336 => 211337) --- trunk/Source/WebCore/ChangeLog 2017-01-28 15:19:59 UTC (rev 211336) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 16:26:48 UTC (rev 211337) @@ -1,3 +1,22 @@ +2017-01-28 Zalan Bujtas + +Resolve beforeChild's render tree position before calling addChildIgnoringContinuation. +https://bugs.webkit.org/show_bug.cgi?id=167540 + + +Reviewed by Simon Fraser. + +Use the actual render tree position for the beforeChild when inside a flow thread. + +Test: fast/multicol/assert-on-continuation-with-spanner.html + +* rendering/RenderBlockFlow.cpp: +(WebCore::RenderBlockFlow::addChild): +* rendering/RenderInline.cpp: +(WebCore::RenderInline::addChild): +* rendering/RenderMultiColumnFlowThread.cpp: +(WebCore::RenderMultiColumnFlowThread::resolveMovedChild): + 2017-01-28 Andreas Kling Avoid synchronous style recalc in dispatchUnloadEvents(). Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (211336 => 211337) --- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-01-28 15:19:59 UTC (rev 211336) +++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-01-28 16:26:48 UTC (rev 211337) @@ -3894,11 +3894,10 @@ { if (multiColumnFlowThread()) return multiColumnFlowThread()->addChild(newChild, beforeChild); -if (beforeChild) { -if (RenderFlowThread* containingFlowThread = flowThreadContainingBlock()) -beforeChild = containingFlowThread->resolveMovedChild(beforeChild); -} -RenderBlock::addChild(newChild, beforeChild); +auto* beforeChildOrPlaceholder = beforeChild; +if (auto* containingFlowThread = flowThreadContainingBlock()) +
[webkit-changes] [211336] trunk/Source/WebCore
Title: [211336] trunk/Source/WebCore Revision 211336 Author akl...@apple.com Date 2017-01-28 07:19:59 -0800 (Sat, 28 Jan 2017) Log Message Avoid synchronous style recalc in dispatchUnloadEvents(). Reviewed by Antti Koivisto. It shouldn't be necessary to force a synchronous style resolution in an unloading document. This call has been here since the import of KHTMLPart. * loader/FrameLoader.cpp: (WebCore::FrameLoader::dispatchUnloadEvents): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/FrameLoader.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (211335 => 211336) --- trunk/Source/WebCore/ChangeLog 2017-01-28 12:16:23 UTC (rev 211335) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 15:19:59 UTC (rev 211336) @@ -1,5 +1,18 @@ 2017-01-28 Andreas Kling +Avoid synchronous style recalc in dispatchUnloadEvents(). + + +Reviewed by Antti Koivisto. + +It shouldn't be necessary to force a synchronous style resolution in an unloading document. +This call has been here since the import of KHTMLPart. + +* loader/FrameLoader.cpp: +(WebCore::FrameLoader::dispatchUnloadEvents): + +2017-01-28 Andreas Kling + REGRESSION(r196383): Automatic shrink-to-fit of RuleSet no longer works. Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (211335 => 211336) --- trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-28 12:16:23 UTC (rev 211335) +++ trunk/Source/WebCore/loader/FrameLoader.cpp 2017-01-28 15:19:59 UTC (rev 211336) @@ -2941,8 +2941,6 @@ } } m_pageDismissalEventBeingDispatched = PageDismissalType::None; -if (m_frame.document()) -m_frame.document()->updateStyleIfNeeded(); m_wasUnloadEventEmitted = true; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211335] trunk/Source/WebCore
Title: [211335] trunk/Source/WebCore Revision 211335 Author akl...@apple.com Date 2017-01-28 04:16:23 -0800 (Sat, 28 Jan 2017) Log Message REGRESSION(r196383): Automatic shrink-to-fit of RuleSet no longer works. Reviewed by Antti Koivisto. Re-enable the automatic shrink-to-fit optimization in RuleSet. This was disabled accidentally, which I discovered while investigating the memory footprint of extension stylesheets. * css/RuleSet.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/RuleSet.h Diff Modified: trunk/Source/WebCore/ChangeLog (211334 => 211335) --- trunk/Source/WebCore/ChangeLog 2017-01-28 12:04:43 UTC (rev 211334) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 12:16:23 UTC (rev 211335) @@ -1,3 +1,16 @@ +2017-01-28 Andreas Kling + +REGRESSION(r196383): Automatic shrink-to-fit of RuleSet no longer works. + + +Reviewed by Antti Koivisto. + +Re-enable the automatic shrink-to-fit optimization in RuleSet. +This was disabled accidentally, which I discovered while investigating +the memory footprint of extension stylesheets. + +* css/RuleSet.h: + 2017-01-28 Antti Koivisto Give scripts 'high' load priority Modified: trunk/Source/WebCore/css/RuleSet.h (211334 => 211335) --- trunk/Source/WebCore/css/RuleSet.h 2017-01-28 12:04:43 UTC (rev 211334) +++ trunk/Source/WebCore/css/RuleSet.h 2017-01-28 12:16:23 UTC (rev 211335) @@ -210,7 +210,7 @@ RuleDataVector m_universalRules; Vector m_pageRules; unsigned m_ruleCount { 0 }; -bool m_autoShrinkToFitEnabled { false }; +bool m_autoShrinkToFitEnabled { true }; RuleFeatureSet m_features; Vector m_regionSelectorsAndRuleSets; }; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211334] trunk/Source/WebCore
Title: [211334] trunk/Source/WebCore Revision 211334 Author an...@apple.com Date 2017-01-28 04:04:43 -0800 (Sat, 28 Jan 2017) Log Message Give scripts 'high' load priority https://bugs.webkit.org/show_bug.cgi?id=167550 Reviewed by Andreas Kling. For historical reasons it is currently 'medium', same as web fonts and some other non-parsing blocking things. * loader/cache/CachedResource.cpp: (WebCore::CachedResource::defaultPriorityForResourceType): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/cache/CachedResource.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (211333 => 211334) --- trunk/Source/WebCore/ChangeLog 2017-01-28 09:26:27 UTC (rev 211333) +++ trunk/Source/WebCore/ChangeLog 2017-01-28 12:04:43 UTC (rev 211334) @@ -1,3 +1,15 @@ +2017-01-28 Antti Koivisto + +Give scripts 'high' load priority +https://bugs.webkit.org/show_bug.cgi?id=167550 + +Reviewed by Andreas Kling. + +For historical reasons it is currently 'medium', same as web fonts and some other non-parsing blocking things. + +* loader/cache/CachedResource.cpp: +(WebCore::CachedResource::defaultPriorityForResourceType): + 2017-01-28 Joseph Pecoraro Add User Timing Experimental Feature Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (211333 => 211334) --- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-01-28 09:26:27 UTC (rev 211333) +++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-01-28 12:04:43 UTC (rev 211334) @@ -70,8 +70,8 @@ case CachedResource::MainResource: return ResourceLoadPriority::VeryHigh; case CachedResource::CSSStyleSheet: +case CachedResource::Script: return ResourceLoadPriority::High; -case CachedResource::Script: #if ENABLE(SVG_FONTS) case CachedResource::SVGFontResource: #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211332] trunk
Title: [211332] trunk Revision 211332 Author joep...@webkit.org Date 2017-01-28 01:26:14 -0800 (Sat, 28 Jan 2017) Log Message Add User Timing Experimental Feature https://bugs.webkit.org/show_bug.cgi?id=167542 Reviewed by Ryosuke Niwa. Source/WebCore: * page/RuntimeEnabledFeatures.h: (WebCore::RuntimeEnabledFeatures::performanceTimelineEnabled): * page/Performance.idl: * page/PerformanceEntry.idl: Make a better RuntimeEnabledFeature named "PerformanceTiming" which is enabled if either UserTiming or ResourceTiming is enabled. This will then expose the APIs that are only useful when at least one of the APIs are available. * page/PerformanceEntry.cpp: (WebCore::PerformanceEntry::name): Deleted. (WebCore::PerformanceEntry::entryType): Deleted. (WebCore::PerformanceEntry::startTime): Deleted. (WebCore::PerformanceEntry::duration): Deleted. * page/PerformanceEntry.h: (WebCore::PerformanceEntry::name): (WebCore::PerformanceEntry::entryType): (WebCore::PerformanceEntry::startTime): (WebCore::PerformanceEntry::duration): Inline simple accessors. * page/PerformanceUserTiming.cpp: (WebCore::UserTiming::measure): Fix a bug introduced by ExceptionOr refactoring. (WebCore::UserTiming::clearMarks): (WebCore::UserTiming::clearMeasures): (WebCore::clearPerformanceEntries): (WebCore::clearPeformanceEntries): Deleted. Fix method name typo. Source/WebKit/mac: * WebView/WebPreferenceKeysPrivate.h: * WebView/WebPreferences.mm: (+[WebPreferences initialize]): (-[WebPreferences userTimingEnabled]): (-[WebPreferences setUserTimingEnabled:]): * WebView/WebPreferencesPrivate.h: * WebView/WebView.mm: (-[WebView _preferencesChanged:]): Add setting for User Timing runtime enabled feature. Source/WebKit/win: * Interfaces/IWebPreferencesPrivate.idl: * WebPreferenceKeysPrivate.h: * WebPreferences.cpp: (WebPreferences::initializeDefaultSettings): (WebPreferences::setUserTimingEnabled): (WebPreferences::userTimingEnabled): * WebPreferences.h: * WebView.cpp: (WebView::notifyPreferencesChanged): Add setting for User Timing runtime enabled feature. Source/WebKit2: * Shared/WebPreferencesDefinitions.h: * UIProcess/API/C/WKPreferences.cpp: (WKPreferencesSetUserTimingEnabled): (WKPreferencesGetUserTimingEnabled): * UIProcess/API/C/WKPreferencesRefPrivate.h: * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updatePreferences): Experimental feature. Off for now while we update ResourceTiming and NavigationTiming to be compatible with Performance Timing 2. Tools: * DumpRenderTree/mac/DumpRenderTree.mm: (enableExperimentalFeatures): (resetWebPreferencesToConsistentValues): * DumpRenderTree/win/DumpRenderTree.cpp: (enableExperimentalFeatures): Websites/webkit.org: * experimental-features.html: LayoutTests: * platform/efl/js/dom/global-constructors-attributes-expected.txt: * platform/gtk/js/dom/global-constructors-attributes-expected.txt: * platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt: * platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt: * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt: * platform/mac/js/dom/global-constructors-attributes-expected.txt: * platform/win/js/dom/global-constructors-attributes-expected.txt: Update results now that experimental User Timing feature is enabled in tests. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/efl/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/gtk/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/mac-elcapitan/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/mac-wk1/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/win/js/dom/global-constructors-attributes-expected.txt trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/Performance.idl trunk/Source/WebCore/page/PerformanceEntry.cpp trunk/Source/WebCore/page/PerformanceEntry.h trunk/Source/WebCore/page/PerformanceEntry.idl trunk/Source/WebCore/page/PerformanceUserTiming.cpp trunk/Source/WebCore/page/RuntimeEnabledFeatures.h trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h trunk/Source/WebKit/mac/WebView/WebPreferences.mm trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h trunk/Source/WebKit/mac/WebView/WebView.mm trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl trunk/Source/WebKit/win/WebPreferenceKeysPrivate.h trunk/Source/WebKit/win/WebPreferences.cpp trunk/Source/WebKit/win/WebPreferences.h trunk/Source/WebKit/win/WebView.cpp trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h trunk/Source/WebK
[webkit-changes] [211331] trunk
Title: [211331] trunk Revision 211331 Author joep...@webkit.org Date 2017-01-28 01:25:59 -0800 (Sat, 28 Jan 2017) Log Message Patch Review: EWS Bubbles wrap to multiple lines but can fit on one line https://bugs.webkit.org/show_bug.cgi?id=167519 Reviewed by Ryosuke Niwa. Tools: * QueueStatusServer/templates/statusbubble.html: To measure the bubbleContainer's width, it must not be wrapping based on its parent container. So when measuring the width temporarily set the parent to a very large width so as to not artificially wrap us. Restore the parent's width after measuring. Websites/bugs.webkit.org: While we do post message to determine the size, the fact that we have constrained the iframe to a size of 450px meant its body is 450px and the div containing the bubbles wraps at 450px. Its full size (~458px) is not returned. Although we solve this artifical constraint problem inside of the bubble containerMetrics measuring, up this default value from 450 to 460 to reduce UI jitter (the current measurement on my machine is 458px). * PrettyPatch/PrettyPatch.rb: Modified Paths trunk/Tools/ChangeLog trunk/Tools/QueueStatusServer/templates/statusbubble.html trunk/Websites/bugs.webkit.org/ChangeLog trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb Diff Modified: trunk/Tools/ChangeLog (211330 => 211331) --- trunk/Tools/ChangeLog 2017-01-28 08:19:19 UTC (rev 211330) +++ trunk/Tools/ChangeLog 2017-01-28 09:25:59 UTC (rev 211331) @@ -1,3 +1,16 @@ +2017-01-28 Joseph Pecoraro + +Patch Review: EWS Bubbles wrap to multiple lines but can fit on one line +https://bugs.webkit.org/show_bug.cgi?id=167519 + +Reviewed by Ryosuke Niwa. + +* QueueStatusServer/templates/statusbubble.html: +To measure the bubbleContainer's width, it must not be wrapping based +on its parent container. So when measuring the width temporarily set +the parent to a very large width so as to not artificially wrap us. +Restore the parent's width after measuring. + 2017-01-27 Andy Estes [iOS] Add a test for _WKNSFileManagerExtras Modified: trunk/Tools/QueueStatusServer/templates/statusbubble.html (211330 => 211331) --- trunk/Tools/QueueStatusServer/templates/statusbubble.html 2017-01-28 08:19:19 UTC (rev 211330) +++ trunk/Tools/QueueStatusServer/templates/statusbubble.html 2017-01-28 09:25:59 UTC (rev 211331) @@ -54,7 +54,11 @@
[webkit-changes] [211330] tags/Safari-604.1.5.0.1/Source/WebKit2
Title: [211330] tags/Safari-604.1.5.0.1/Source/WebKit2 Revision 211330 Author bshaf...@apple.com Date 2017-01-28 00:19:19 -0800 (Sat, 28 Jan 2017) Log Message Merged r211329. rdar://problem/30247736 Modified Paths tags/Safari-604.1.5.0.1/Source/WebKit2/ChangeLog tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm Diff Modified: tags/Safari-604.1.5.0.1/Source/WebKit2/ChangeLog (211329 => 211330) --- tags/Safari-604.1.5.0.1/Source/WebKit2/ChangeLog 2017-01-28 08:02:16 UTC (rev 211329) +++ tags/Safari-604.1.5.0.1/Source/WebKit2/ChangeLog 2017-01-28 08:19:19 UTC (rev 211330) @@ -1,3 +1,15 @@ +2017-01-28 Babak Shafiei + +Merge r211329. + +2017-01-28 Dan Bernstein + + WebKit2-7604.1.5 has failed to build: error: only virtual member functions can be marked 'override' + +* UIProcess/ios/PageClientImplIOS.h: Guard the declaration of requestPasswordForQuickLookDocument + with USE(QUICK_LOOK) to match the base class. +* UIProcess/ios/PageClientImplIOS.mm: Guard the implementation as well. + 2017-01-26 Chris Dumez Crash when navigating back to a page in PacheCache when one of its frames has been removed Modified: tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (211329 => 211330) --- tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-28 08:02:16 UTC (rev 211329) +++ tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-28 08:19:19 UTC (rev 211330) @@ -197,7 +197,9 @@ void handleActiveNowPlayingSessionInfoResponse(bool hasActiveSession, const String& title, double duration, double elapsedTime) override; +#if USE(QUICK_LOOK) void requestPasswordForQuickLookDocument(const String& fileName, std::function&&) override; +#endif #if ENABLE(DATA_INTERACTION) void didPerformDataInteractionControllerOperation() override; Modified: tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (211329 => 211330) --- tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-28 08:02:16 UTC (rev 211329) +++ tags/Safari-604.1.5.0.1/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-28 08:19:19 UTC (rev 211330) @@ -779,6 +779,7 @@ [m_webView _handleActiveNowPlayingSessionInfoResponse:hasActiveSession title:nsStringFromWebCoreString(title) duration:duration elapsedTime:elapsedTime]; } +#if USE(QUICK_LOOK) void PageClientImpl::requestPasswordForQuickLookDocument(const String& fileName, std::function&& completionHandler) { auto passwordHandler = [completionHandler = WTFMove(completionHandler)](NSString *password) { @@ -792,6 +793,7 @@ } else [m_webView _showPasswordViewWithDocumentName:fileName passwordHandler:passwordHandler]; } +#endif } // namespace WebKit ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [211329] trunk/Source/WebKit2
Title: [211329] trunk/Source/WebKit2 Revision 211329 Author m...@apple.com Date 2017-01-28 00:02:16 -0800 (Sat, 28 Jan 2017) Log Message WebKit2-7604.1.5 has failed to build: error: only virtual member functions can be marked 'override' * UIProcess/ios/PageClientImplIOS.h: Guard the declaration of requestPasswordForQuickLookDocument with USE(QUICK_LOOK) to match the base class. * UIProcess/ios/PageClientImplIOS.mm: Guard the implementation as well. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (211328 => 211329) --- trunk/Source/WebKit2/ChangeLog 2017-01-28 07:08:08 UTC (rev 211328) +++ trunk/Source/WebKit2/ChangeLog 2017-01-28 08:02:16 UTC (rev 211329) @@ -1,3 +1,11 @@ +2017-01-28 Dan Bernstein + + WebKit2-7604.1.5 has failed to build: error: only virtual member functions can be marked 'override' + +* UIProcess/ios/PageClientImplIOS.h: Guard the declaration of requestPasswordForQuickLookDocument + with USE(QUICK_LOOK) to match the base class. +* UIProcess/ios/PageClientImplIOS.mm: Guard the implementation as well. + 2017-01-27 Dan Bernstein [Cocoa] No way to get the text from a WKWebProcessPlugInRangeHandle Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (211328 => 211329) --- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-28 07:08:08 UTC (rev 211328) +++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2017-01-28 08:02:16 UTC (rev 211329) @@ -197,7 +197,9 @@ void handleActiveNowPlayingSessionInfoResponse(bool hasActiveSession, const String& title, double duration, double elapsedTime) override; +#if USE(QUICK_LOOK) void requestPasswordForQuickLookDocument(const String& fileName, std::function&&) override; +#endif #if ENABLE(DATA_INTERACTION) void didPerformDataInteractionControllerOperation() override; Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (211328 => 211329) --- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-28 07:08:08 UTC (rev 211328) +++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2017-01-28 08:02:16 UTC (rev 211329) @@ -779,6 +779,7 @@ [m_webView _handleActiveNowPlayingSessionInfoResponse:hasActiveSession title:nsStringFromWebCoreString(title) duration:duration elapsedTime:elapsedTime]; } +#if USE(QUICK_LOOK) void PageClientImpl::requestPasswordForQuickLookDocument(const String& fileName, std::function&& completionHandler) { auto passwordHandler = [completionHandler = WTFMove(completionHandler)](NSString *password) { @@ -792,6 +793,7 @@ } else [m_webView _showPasswordViewWithDocumentName:fileName passwordHandler:passwordHandler]; } +#endif } // namespace WebKit ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes