[webkit-changes] [166348] trunk/Source/WebCore
Title: [166348] trunk/Source/WebCore Revision 166348 Author simon.fra...@apple.com Date 2014-03-26 23:50:40 -0700 (Wed, 26 Mar 2014) Log Message Fix failing scrolling tests by reverting to previous behavior where the scrolling geometry for the main frame scrolling node was only updated from frameViewLayoutUpdated() and no-where else. * WebCore.exp.in: * page/scrolling/AsyncScrollingCoordinator.cpp: (WebCore::AsyncScrollingCoordinator::updateScrollingNode): * page/scrolling/AsyncScrollingCoordinator.h: * page/scrolling/ScrollingCoordinator.h: (WebCore::ScrollingCoordinator::updateScrollingNode): * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Deleted. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166347 => 166348) --- trunk/Source/WebCore/ChangeLog 2014-03-27 06:22:48 UTC (rev 166347) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 06:50:40 UTC (rev 166348) @@ -1,3 +1,19 @@ +2014-03-26 Simon Fraser + +Fix failing scrolling tests by reverting to previous behavior where +the scrolling geometry for the main frame scrolling node was only +updated from frameViewLayoutUpdated() and no-where else. + +* WebCore.exp.in: +* page/scrolling/AsyncScrollingCoordinator.cpp: +(WebCore::AsyncScrollingCoordinator::updateScrollingNode): +* page/scrolling/AsyncScrollingCoordinator.h: +* page/scrolling/ScrollingCoordinator.h: +(WebCore::ScrollingCoordinator::updateScrollingNode): +* rendering/RenderLayerCompositor.cpp: +(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): +(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Deleted. + 2014-03-26 Ryosuke Niwa HTMLConverter::_processText is slow because it walks up ancestor elements Modified: trunk/Source/WebCore/WebCore.exp.in (166347 => 166348) --- trunk/Source/WebCore/WebCore.exp.in 2014-03-27 06:22:48 UTC (rev 166347) +++ trunk/Source/WebCore/WebCore.exp.in 2014-03-27 06:50:40 UTC (rev 166348) @@ -251,12 +251,12 @@ __ZN7WebCore12gcControllerEv __ZN7WebCore12iconDatabaseEv __ZN7WebCore13AXObjectCache10rootObjectEv -__ZN7WebCore13AXObjectCache37setEnhancedUserInterfaceAccessibilityEb __ZN7WebCore13AXObjectCache18rootObjectForFrameEPNS_5FrameE __ZN7WebCore13AXObjectCache19enableAccessibilityEv __ZN7WebCore13AXObjectCache20disableAccessibilityEv __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE __ZN7WebCore13AXObjectCache23focusedUIElementForPageEPKNS_4PageE +__ZN7WebCore13AXObjectCache37setEnhancedUserInterfaceAccessibilityEb __ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE __ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi __ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi @@ -2756,7 +2756,7 @@ __ZN7WebCore25AsyncScrollingCoordinator17attachToStateTreeENS_17ScrollingNodeTypeEyy __ZN7WebCore25AsyncScrollingCoordinator18syncChildPositionsERKNS_10LayoutRectE __ZN7WebCore25AsyncScrollingCoordinator19detachFromStateTreeEy -__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_RKNS_20ScrollingCoordinator17ScrollingGeometryE +__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_PKNS_20ScrollingCoordinator17ScrollingGeometryE __ZN7WebCore25AsyncScrollingCoordinator22frameViewLayoutUpdatedEPNS_9FrameViewE __ZN7WebCore25AsyncScrollingCoordinator27frameViewRootLayerDidChangeEPNS_9FrameViewE __ZN7WebCore25AsyncScrollingCoordinator27requestScrollPositionUpdateEPNS_9FrameViewERKNS_8IntPointE Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (166347 => 166348) --- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-27 06:22:48 UTC (rev 166347) +++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-27 06:50:40 UTC (rev 166348) @@ -287,7 +287,7 @@ attachToStateTree(FrameScrollingNode, frameView->scrollLayerID(), 0); } -void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry& scrollingGeometry) +void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry* scrollingGeometry) { ScrollingStateScrollingNode* node = toScrollingStateScrollingNode(m_scrollingStateTree->stateNodeForID(nodeID)); ASSERT(node); @
[webkit-changes] [166347] trunk/Source/WebCore
Title: [166347] trunk/Source/WebCore Revision 166347 Author rn...@webkit.org Date 2014-03-26 23:22:48 -0700 (Wed, 26 Mar 2014) Log Message HTMLConverter::_processText is slow because it walks up ancestor elements https://bugs.webkit.org/show_bug.cgi?id=130820 Reviewed by Sam Weinig. Avoid walking up the tree from each text node by caching the aggregated attributed strings for each element. Also compute the attributed strings top-down to avoid calling mutableCopy in every iteration. This reduces the runtime of Interactive/CopyAll.html from 15s to 13s (15%). * editing/cocoa/HTMLConverter.mm: (HTMLConverter::_attributesForElement): (HTMLConverter::attributesForElement): (HTMLConverter::aggregatedAttributesForAncestors): (HTMLConverter::_processText): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166346 => 166347) --- trunk/Source/WebCore/ChangeLog 2014-03-27 06:13:33 UTC (rev 166346) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 06:22:48 UTC (rev 166347) @@ -1,3 +1,21 @@ +2014-03-26 Ryosuke Niwa + +HTMLConverter::_processText is slow because it walks up ancestor elements +https://bugs.webkit.org/show_bug.cgi?id=130820 + +Reviewed by Sam Weinig. + +Avoid walking up the tree from each text node by caching the aggregated attributed strings for each element. +Also compute the attributed strings top-down to avoid calling mutableCopy in every iteration. + +This reduces the runtime of Interactive/CopyAll.html from 15s to 13s (15%). + +* editing/cocoa/HTMLConverter.mm: +(HTMLConverter::_attributesForElement): +(HTMLConverter::attributesForElement): +(HTMLConverter::aggregatedAttributesForAncestors): +(HTMLConverter::_processText): + 2014-03-26 Sam Weinig Fix iOS build. Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (166346 => 166347) --- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 06:13:33 UTC (rev 166346) +++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 06:22:48 UTC (rev 166347) @@ -454,7 +454,8 @@ private: HashMap, RetainPtr> m_attributesForElements; - +HashMap, RetainPtr> m_aggregatedAttributesForElements; + NSMutableAttributedString *_attrStr; NSMutableDictionary *_documentAttrs; NSURL *_baseURL; @@ -497,6 +498,8 @@ NSDictionary *_computedAttributesForElement(Element&); NSDictionary *_attributesForElement(DOMElement *); +NSDictionary* attributesForElement(Element& element); +NSDictionary* aggregatedAttributesForAncestors(CharacterData&); Element* _blockLevelElementForNode(Node*); @@ -1352,15 +1355,45 @@ { if (!element) return [NSDictionary dictionary]; - -Element& coreElement = *core(element); - -auto& attributes = m_attributesForElements.add(&coreElement, nullptr).iterator->value; +return attributesForElement(*core(element)); +} + +NSDictionary* HTMLConverter::attributesForElement(Element& element) +{ +auto& attributes = m_attributesForElements.add(&element, nullptr).iterator->value; if (!attributes) -attributes = _computedAttributesForElement(coreElement); +attributes = _computedAttributesForElement(element); return attributes.get(); } +NSDictionary* HTMLConverter::aggregatedAttributesForAncestors(CharacterData& node) +{ +Node* ancestor = node.parentNode(); +while (ancestor && !ancestor->isElementNode()) +ancestor = ancestor->parentNode(); +if (!ancestor) +return nullptr; + +auto& attributes = m_aggregatedAttributesForElements.add(toElement(ancestor), nullptr).iterator->value; +if (!attributes) { +Vector ancestorElements; +ancestorElements.append(toElement(ancestor)); +for (; ancestor; ancestor = ancestor->parentNode()) { +if (ancestor->isElementNode()) +ancestorElements.append(toElement(ancestor)); +} + +attributes = [NSMutableDictionary dictionary]; +// Fill attrs dictionary with attributes from the highest to the lowest, not overwriting ones deeper in the tree +for (unsigned index = ancestorElements.size(); index;) { +index--; +[attributes addEntriesFromDictionary:attributesForElement(*ancestorElements[index])]; +} +} + +return attributes.get(); +} + void HTMLConverter::_newParagraphForElement(DOMElement *element, NSString *tag, BOOL flag, BOOL suppressTrailingSpace) { NSUInteger textLength = [_attrStr length]; @@ -2332,22 +2365,8 @@ [_attrStr replaceCharactersInRange:rangeToReplace withString:outputString]; rangeToReplace.length = outputString.length(); -RetainPtr attrs; -Node* ancestor = characterData.parentNode(); -while (ancestor) { -// Fill attrs dictionary with att
[webkit-changes] [166346] trunk/Source/WebKit2
Title: [166346] trunk/Source/WebKit2 Revision 166346 Author timothy_hor...@apple.com Date 2014-03-26 23:13:33 -0700 (Wed, 26 Mar 2014) Log Message Blind speculative iOS build fix. * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::viewportConfigurationChanged): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166345 => 166346) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 05:05:55 UTC (rev 166345) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 06:13:33 UTC (rev 166346) @@ -1,3 +1,10 @@ +2014-03-26 Tim Horton + +Blind speculative iOS build fix. + +* WebProcess/WebPage/ios/WebPageIOS.mm: +(WebKit::WebPage::viewportConfigurationChanged): + 2014-03-26 Benjamin Poulain [iOS][WK2] REGRESSION (WebKit2): Some pages appear blank until you scroll Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (166345 => 166346) --- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 05:05:55 UTC (rev 166345) +++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 06:13:33 UTC (rev 166346) @@ -1711,7 +1711,7 @@ IntRect unobscuredContentRect(scrollPosition, minimumLayoutSizeInDocumentCoordinate); frameView.setUnobscuredContentRect(unobscuredContentRect); -frameView.setScrollVelocity(0, 0, 0, monotonicallyIncreasingTime()); +frameView.setScrollVelocity(0, 0, monotonicallyIncreasingTime()); // FIXME: We could send down the obscured margins to find a better exposed rect and unobscured rect. // It is not a big deal at the moment because the tile coverage will always extend past the obscured bottom inset. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166345] trunk/Source/JavaScriptCore
Title: [166345] trunk/Source/_javascript_Core Revision 166345 Author fpi...@apple.com Date 2014-03-26 22:05:55 -0700 (Wed, 26 Mar 2014) Log Message Parse stackmaps liveOuts https://bugs.webkit.org/show_bug.cgi?id=130801 Reviewed by Geoffrey Garen. This just adds the code to parse them but doesn't do anything with them, yet. * ftl/FTLLocation.cpp: (JSC::FTL::Location::forStackmaps): * ftl/FTLLocation.h: (JSC::FTL::Location::forRegister): (JSC::FTL::Location::forIndirect): * ftl/FTLStackMaps.cpp: (JSC::FTL::StackMaps::Location::parse): (JSC::FTL::StackMaps::Location::dump): (JSC::FTL::StackMaps::LiveOut::parse): (JSC::FTL::StackMaps::LiveOut::dump): (JSC::FTL::StackMaps::Record::parse): (JSC::FTL::StackMaps::Record::dump): * ftl/FTLStackMaps.h: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/ftl/FTLLocation.cpp trunk/Source/_javascript_Core/ftl/FTLLocation.h trunk/Source/_javascript_Core/ftl/FTLStackMaps.cpp trunk/Source/_javascript_Core/ftl/FTLStackMaps.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166344 => 166345) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-27 04:42:50 UTC (rev 166344) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-27 05:05:55 UTC (rev 166345) @@ -1,3 +1,26 @@ +2014-03-26 Filip Pizlo + +Parse stackmaps liveOuts +https://bugs.webkit.org/show_bug.cgi?id=130801 + +Reviewed by Geoffrey Garen. + +This just adds the code to parse them but doesn't do anything with them, yet. + +* ftl/FTLLocation.cpp: +(JSC::FTL::Location::forStackmaps): +* ftl/FTLLocation.h: +(JSC::FTL::Location::forRegister): +(JSC::FTL::Location::forIndirect): +* ftl/FTLStackMaps.cpp: +(JSC::FTL::StackMaps::Location::parse): +(JSC::FTL::StackMaps::Location::dump): +(JSC::FTL::StackMaps::LiveOut::parse): +(JSC::FTL::StackMaps::LiveOut::dump): +(JSC::FTL::StackMaps::Record::parse): +(JSC::FTL::StackMaps::Record::dump): +* ftl/FTLStackMaps.h: + 2014-03-26 Mark Lam Build fix after r166307. Modified: trunk/Source/_javascript_Core/ftl/FTLLocation.cpp (166344 => 166345) --- trunk/Source/_javascript_Core/ftl/FTLLocation.cpp 2014-03-27 04:42:50 UTC (rev 166344) +++ trunk/Source/_javascript_Core/ftl/FTLLocation.cpp 2014-03-27 05:05:55 UTC (rev 166345) @@ -45,10 +45,10 @@ case StackMaps::Location::Register: case StackMaps::Location::Direct: -return forRegister(location.dwarfRegNum, location.offset); +return forRegister(location.dwarfReg, location.offset); case StackMaps::Location::Indirect: -return forIndirect(location.dwarfRegNum, location.offset); +return forIndirect(location.dwarfReg, location.offset); case StackMaps::Location::Constant: return forConstant(location.offset); Modified: trunk/Source/_javascript_Core/ftl/FTLLocation.h (166344 => 166345) --- trunk/Source/_javascript_Core/ftl/FTLLocation.h 2014-03-27 04:42:50 UTC (rev 166344) +++ trunk/Source/_javascript_Core/ftl/FTLLocation.h 2014-03-27 05:05:55 UTC (rev 166345) @@ -57,20 +57,20 @@ u.constant = 1; } -static Location forRegister(int16_t dwarfRegNum, int32_t addend) +static Location forRegister(DWARFRegister dwarfReg, int32_t addend) { Location result; result.m_kind = Register; -result.u.variable.dwarfRegNum = dwarfRegNum; +result.u.variable.dwarfRegNum = dwarfReg.dwarfRegNum(); result.u.variable.offset = addend; return result; } -static Location forIndirect(int16_t dwarfRegNum, int32_t offset) +static Location forIndirect(DWARFRegister dwarfReg, int32_t offset) { Location result; result.m_kind = Indirect; -result.u.variable.dwarfRegNum = dwarfRegNum; +result.u.variable.dwarfRegNum = dwarfReg.dwarfRegNum(); result.u.variable.offset = offset; return result; } Modified: trunk/Source/_javascript_Core/ftl/FTLStackMaps.cpp (166344 => 166345) --- trunk/Source/_javascript_Core/ftl/FTLStackMaps.cpp 2014-03-27 04:42:50 UTC (rev 166344) +++ trunk/Source/_javascript_Core/ftl/FTLStackMaps.cpp 2014-03-27 05:05:55 UTC (rev 166345) @@ -77,13 +77,13 @@ { kind = static_cast(context.view->read(context.offset, true)); size = context.view->read(context.offset, true); -dwarfRegNum = context.view->read(context.offset, true); +dwarfReg = DWARFRegister(context.view->read(context.offset, true)); this->offset = context.view->read(context.offset, true); } void StackMaps::Location::dump(PrintStream& out) const { -out.print("(", kind, ", reg", dwarfRegNum, ", off:", offset, ", size:", size, ")"); +out.print("(", kind, ", ", dwarfReg, ", off:", offset, ", size:", size, ")"); } GPRReg StackMaps::Location::directGPR() const @@ -97,6 +97,18 @@ FTL::Loca
[webkit-changes] [166344] trunk/Source/WebCore
Title: [166344] trunk/Source/WebCore Revision 166344 Author wei...@apple.com Date 2014-03-26 21:42:50 -0700 (Wed, 26 Mar 2014) Log Message Fix iOS build. * editing/cocoa/HTMLConverter.mm: (_font): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166343 => 166344) --- trunk/Source/WebCore/ChangeLog 2014-03-27 04:31:07 UTC (rev 166343) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 04:42:50 UTC (rev 166344) @@ -1,3 +1,10 @@ +2014-03-26 Sam Weinig + +Fix iOS build. + +* editing/cocoa/HTMLConverter.mm: +(_font): + 2014-03-26 Ryosuke Niwa Make _processText and _traverseNode in HTMLConverter more efficient Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (166343 => 166344) --- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 04:31:07 UTC (rev 166343) +++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 04:42:50 UTC (rev 166344) @@ -1125,7 +1125,7 @@ auto renderer = element.renderer(); if (!renderer) return nil; -return renderer->style().font().primaryFont()->getCTFont(); +return (PlatformFont *)renderer->style().font().primaryFont()->getCTFont(); } #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166343] trunk/Source/WebKit2
Title: [166343] trunk/Source/WebKit2 Revision 166343 Author benja...@webkit.org Date 2014-03-26 21:31:07 -0700 (Wed, 26 Mar 2014) Log Message [iOS][WK2] REGRESSION (WebKit2): Some pages appear blank until you scroll https://bugs.webkit.org/show_bug.cgi?id=130819 Patch by Benjamin Poulain on 2014-03-26 Reviewed by Tim Horton. When loading a new page, we never define the unobscured rect and exposed rect on the new frame. As a result, there is nothing to render. It uses to work thanks to dumb luck and a bug in Safari updating the visibleContentRects from the UIProcess. Now that the bug is gone, "dumb luck" is not reliable enough to get the content rects :) What this patch does is save if we have ever received new rects from the UI. If we have not, create them based on the minimum layout size. This works because we know Safari shows the minimum layout size by default and will tell us if it changes the obscured rects. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): (WebKit::WebPage::didCommitLoad): * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::viewportConfigurationChanged): (WebKit::WebPage::updateVisibleContentRects): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166342 => 166343) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 04:16:32 UTC (rev 166342) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 04:31:07 UTC (rev 166343) @@ -1,3 +1,28 @@ +2014-03-26 Benjamin Poulain + +[iOS][WK2] REGRESSION (WebKit2): Some pages appear blank until you scroll +https://bugs.webkit.org/show_bug.cgi?id=130819 + +Reviewed by Tim Horton. + +When loading a new page, we never define the unobscured rect and exposed rect on the new frame. +As a result, there is nothing to render. + +It uses to work thanks to dumb luck and a bug in Safari updating the visibleContentRects from +the UIProcess. Now that the bug is gone, "dumb luck" is not reliable enough to get the content rects :) + +What this patch does is save if we have ever received new rects from the UI. If we have not, create them +based on the minimum layout size. This works because we know Safari shows the minimum layout size by default +and will tell us if it changes the obscured rects. + +* WebProcess/WebPage/WebPage.cpp: +(WebKit::WebPage::WebPage): +(WebKit::WebPage::didCommitLoad): +* WebProcess/WebPage/WebPage.h: +* WebProcess/WebPage/ios/WebPageIOS.mm: +(WebKit::WebPage::viewportConfigurationChanged): +(WebKit::WebPage::updateVisibleContentRects): + 2014-03-26 Anders Carlsson Add a _WKScriptWorld class Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166342 => 166343) --- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-27 04:16:32 UTC (rev 166342) +++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-27 04:31:07 UTC (rev 166343) @@ -285,6 +285,7 @@ #if PLATFORM(IOS) , m_shouldReturnWordAtSelection(false) , m_lastVisibleContentRectUpdateID(0) +, m_hasReceivedVisibleContentRectsAfterDidCommitLoad(false) , m_scaleWasSetByUIProcess(false) , m_userHasChangedPageScaleFactor(false) , m_viewportScreenSize(parameters.viewportScreenSize) @@ -4229,6 +4230,7 @@ } } #if PLATFORM(IOS) +m_hasReceivedVisibleContentRectsAfterDidCommitLoad = false; m_userHasChangedPageScaleFactor = false; Document* document = frame->coreFrame()->document(); Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (166342 => 166343) --- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-27 04:16:32 UTC (rev 166342) +++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-27 04:31:07 UTC (rev 166343) @@ -1133,6 +1133,7 @@ WebCore::ViewportConfiguration m_viewportConfiguration; uint64_t m_lastVisibleContentRectUpdateID; +bool m_hasReceivedVisibleContentRectsAfterDidCommitLoad; bool m_scaleWasSetByUIProcess; bool m_userHasChangedPageScaleFactor; WebCore::FloatSize m_viewportScreenSize; Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (166342 => 166343) --- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 04:16:32 UTC (rev 166342) +++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 04:31:07 UTC (rev 166343) @@ -1703,7 +1703,21 @@ else scale = m_viewportConfiguration.initialScale(); -scalePage(scale, m_page->mainFrame().view()->scrollPosition()); +FrameView& frameView = *m_page->mainFrame().view(); +IntPoint scrollPosition = frameView.scrollPosition(); +if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) { +IntSize minimumLay
[webkit-changes] [166342] trunk/Source/WebCore
Title: [166342] trunk/Source/WebCore Revision 166342 Author rn...@webkit.org Date 2014-03-26 21:16:32 -0700 (Wed, 26 Mar 2014) Log Message Make _processText and _traverseNode in HTMLConverter more efficient https://bugs.webkit.org/show_bug.cgi?id=130769 Reviewed by Sam Weinig. Rewrote a bunch of code in C++ and avoided creating wrappers. This reduces the runtime of Interactive/CopyAll.html from ~16.5s to 15s. * editing/cocoa/HTMLConverter.mm: (HTMLConverterCaches::isAncestorsOfStartToBeConverted): (HTMLConverter::HTMLConverter): (HTMLConverter::~HTMLConverter): (HTMLConverter::_processElement): (HTMLConverter::_processText): (HTMLConverter::_traverseNode): (HTMLConverter::_traverseFooterNode): (HTMLConverterCaches::cacheAncestorsOfStartToBeConverted): (HTMLConverter::_loadFromDOMRange): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166341 => 166342) --- trunk/Source/WebCore/ChangeLog 2014-03-27 04:14:22 UTC (rev 166341) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 04:16:32 UTC (rev 166342) @@ -1,3 +1,24 @@ +2014-03-26 Ryosuke Niwa + +Make _processText and _traverseNode in HTMLConverter more efficient +https://bugs.webkit.org/show_bug.cgi?id=130769 + +Reviewed by Sam Weinig. + +Rewrote a bunch of code in C++ and avoided creating wrappers. +This reduces the runtime of Interactive/CopyAll.html from ~16.5s to 15s. + +* editing/cocoa/HTMLConverter.mm: +(HTMLConverterCaches::isAncestorsOfStartToBeConverted): +(HTMLConverter::HTMLConverter): +(HTMLConverter::~HTMLConverter): +(HTMLConverter::_processElement): +(HTMLConverter::_processText): +(HTMLConverter::_traverseNode): +(HTMLConverter::_traverseFooterNode): +(HTMLConverterCaches::cacheAncestorsOfStartToBeConverted): +(HTMLConverter::_loadFromDOMRange): + 2014-03-26 Adenilson Cavalcanti FEGaussianBlur: unify and const-ify calculateKernelSize Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (166341 => 166342) --- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 04:14:22 UTC (rev 166341) +++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 04:16:32 UTC (rev 166342) @@ -49,6 +49,7 @@ #import "Frame.h" #import "FrameLoader.h" #import "HTMLElement.h" +#import "HTMLFrameElementBase.h" #import "HTMLNames.h" #import "HTMLParserIdioms.h" #import "LoaderNSURLExtras.h" @@ -60,6 +61,7 @@ #import "TextIterator.h" #import #import +#import #if PLATFORM(IOS) @@ -416,8 +418,12 @@ PassRefPtr computedStylePropertyForElement(Element&, CSSPropertyID); PassRefPtr inlineStylePropertyForElement(Element&, CSSPropertyID); +Node* cacheAncestorsOfStartToBeConverted(const Range&); +bool isAncestorsOfStartToBeConverted(Node* node) const { return m_ancestorsUnderCommonAncestor.contains(node); } + private: HashMap> m_computedStyles; +HashSet m_ancestorsUnderCommonAncestor; }; @interface NSTextList (WebCoreNSTextListDetails) @@ -454,7 +460,6 @@ NSURL *_baseURL; DOMDocument *_document; DOMRange *_domRange; -NSMutableArray *_domStartAncestors; WebCore::DocumentLoader *_dataSource; NSMutableArray *_textLists; NSMutableArray *_textBlocks; @@ -487,7 +492,7 @@ PlatformColor *_colorForElement(Element&, CSSPropertyID); -void _traverseNode(DOMNode *node, NSInteger depth, BOOL embedded); +void _traverseNode(Node* node, unsigned depth, bool embedded); void _traverseFooterNode(DOMNode *node, NSInteger depth); NSDictionary *_computedAttributesForElement(Element&); @@ -510,7 +515,7 @@ BOOL _processElement(DOMElement *element, NSInteger depth); void _addMarkersToList(NSTextList *list, NSRange range); void _exitElement(DOMElement *element, NSInteger depth, NSUInteger startIndex); -void _processText(DOMCharacterData *text); +void _processText(CharacterData&); void _adjustTrailingNewline(); }; @@ -521,7 +526,6 @@ _documentAttrs = [[NSMutableDictionary alloc] init]; _baseURL = nil; _document = nil; -_domStartAncestors = nil; _dataSource = nullptr; _textLists = [[NSMutableArray alloc] init]; _textBlocks = [[NSMutableArray alloc] init]; @@ -552,7 +556,6 @@ [_attrStr release]; [_documentAttrs release]; [_domRange release]; -[_domStartAncestors release]; [_textLists release]; [_textBlocks release]; [_textTables release]; @@ -1980,21 +1983,11 @@ if (url) retval = !_addAttachmentForElement(element, url, isBlockLevel, NO); } -} else if (coreElement.hasTagName(frameTag)) { -if ([element respondsToSelector:@selector(contentDocument)]) { -DOMDocument *contentDocument = [(DOMHTMLFrameElement *)element contentDocument]; -if (contentDoc
[webkit-changes] [166340] trunk/Source/WebKit2
Title: [166340] trunk/Source/WebKit2 Revision 166340 Author ander...@apple.com Date 2014-03-26 20:55:48 -0700 (Wed, 26 Mar 2014) Log Message Add a _WKScriptWorld class https://bugs.webkit.org/show_bug.cgi?id=130817 Reviewed by Dan Bernstein. * UIProcess/API/Cocoa/_WKScriptWorld.h: Added. * UIProcess/API/Cocoa/_WKScriptWorld.mm: Added. (generateWorldID): (+[_WKScriptWorld defaultWorld]): (-[_WKScriptWorld init]): (-[_WKScriptWorld _initWithWorldID:]): * WebKit2.xcodeproj/project.pbxproj: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Added Paths trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166339 => 166340) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 03:53:31 UTC (rev 166339) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 03:55:48 UTC (rev 166340) @@ -1,5 +1,20 @@ 2014-03-26 Anders Carlsson +Add a _WKScriptWorld class +https://bugs.webkit.org/show_bug.cgi?id=130817 + +Reviewed by Dan Bernstein. + +* UIProcess/API/Cocoa/_WKScriptWorld.h: Added. +* UIProcess/API/Cocoa/_WKScriptWorld.mm: Added. +(generateWorldID): +(+[_WKScriptWorld defaultWorld]): +(-[_WKScriptWorld init]): +(-[_WKScriptWorld _initWithWorldID:]): +* WebKit2.xcodeproj/project.pbxproj: + +2014-03-26 Anders Carlsson + Rename a delegate method to -webView:didFinishNavigation: https://bugs.webkit.org/show_bug.cgi?id=130814 Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h (0 => 166340) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h (rev 0) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h 2014-03-27 03:55:48 UTC (rev 166340) @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2014 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import +#import + +#if WK_API_ENABLED + +WK_API_CLASS +@interface _WKScriptWorld : NSObject + ++(instancetype)defaultWorld; + +@end + +#endif Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm (0 => 166340) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm (rev 0) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm 2014-03-27 03:55:48 UTC (rev 166340) @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2014 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING I
[webkit-changes] [166339] trunk/Source/WebCore
Title: [166339] trunk/Source/WebCore Revision 166339 Author simon.fra...@apple.com Date 2014-03-26 20:53:31 -0700 (Wed, 26 Mar 2014) Log Message Make sure childContainmentLayer is parented https://bugs.webkit.org/show_bug.cgi?id=130808 Reviewed by Tim Horton. m_childContainmentLayer was never parented if the page created no other compositing layers, which left a dangling GraphicsLayer which in turn confused UI-side compositing a little. Fix by always parenting this layer. * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::createPrimaryGraphicsLayer): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderLayerBacking.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166338 => 166339) --- trunk/Source/WebCore/ChangeLog 2014-03-27 03:46:04 UTC (rev 166338) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 03:53:31 UTC (rev 166339) @@ -1,3 +1,18 @@ +2014-03-26 Simon Fraser + +Make sure childContainmentLayer is parented +https://bugs.webkit.org/show_bug.cgi?id=130808 + +Reviewed by Tim Horton. + +m_childContainmentLayer was never parented if the page +created no other compositing layers, which left a dangling +GraphicsLayer which in turn confused UI-side compositing a little. +Fix by always parenting this layer. + +* rendering/RenderLayerBacking.cpp: +(WebCore::RenderLayerBacking::createPrimaryGraphicsLayer): + 2014-03-26 Brian Burg Web Replay: disable page cache during capture/replay Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166338 => 166339) --- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-27 03:46:04 UTC (rev 166338) +++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-27 03:53:31 UTC (rev 166339) @@ -299,8 +299,10 @@ m_graphicsLayer = createGraphicsLayer(layerName); m_creatingPrimaryGraphicsLayer = false; -if (m_usingTiledCacheLayer) +if (m_usingTiledCacheLayer) { m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer"); +m_graphicsLayer->addChild(m_childContainmentLayer.get()); +} if (m_isMainFrameRenderViewLayer) { #if !PLATFORM(IOS) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166337] trunk/Source/WebCore
Title: [166337] trunk/Source/WebCore Revision 166337 Author bb...@apple.com Date 2014-03-26 20:45:38 -0700 (Wed, 26 Mar 2014) Log Message Web Replay: disable page cache during capture/replay https://bugs.webkit.org/show_bug.cgi?id=130672 Reviewed by Timothy Hatcher. Save, set, and restore page cache settings at the correct times. No new tests. If this code fails, then the tests for network replay will fail. * replay/ReplayController.cpp: (WebCore::ReplayController::setForceDeterministicSettings): Added. (WebCore::ReplayController::startCapturing): (WebCore::ReplayController::stopCapturing): (WebCore::ReplayController::cancelPlayback): (WebCore::ReplayController::replayToPosition): * replay/ReplayController.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/replay/ReplayController.cpp trunk/Source/WebCore/replay/ReplayController.h Diff Modified: trunk/Source/WebCore/ChangeLog (166336 => 166337) --- trunk/Source/WebCore/ChangeLog 2014-03-27 03:41:40 UTC (rev 166336) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 03:45:38 UTC (rev 166337) @@ -1,3 +1,22 @@ +2014-03-26 Brian Burg + +Web Replay: disable page cache during capture/replay +https://bugs.webkit.org/show_bug.cgi?id=130672 + +Reviewed by Timothy Hatcher. + +Save, set, and restore page cache settings at the correct times. + +No new tests. If this code fails, then the tests for network replay will fail. + +* replay/ReplayController.cpp: +(WebCore::ReplayController::setForceDeterministicSettings): Added. +(WebCore::ReplayController::startCapturing): +(WebCore::ReplayController::stopCapturing): +(WebCore::ReplayController::cancelPlayback): +(WebCore::ReplayController::replayToPosition): +* replay/ReplayController.h: + 2014-03-26 Sam Weinig Convert more of HTMLConverter to C++ Modified: trunk/Source/WebCore/replay/ReplayController.cpp (166336 => 166337) --- trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-27 03:41:40 UTC (rev 166336) +++ trunk/Source/WebCore/replay/ReplayController.cpp 2014-03-27 03:45:38 UTC (rev 166337) @@ -44,6 +44,7 @@ #include "ReplaySessionSegment.h" #include "ReplayingInputCursor.h" #include "ScriptController.h" +#include "Settings.h" #include "UserInputBridge.h" #include "WebReplayInputs.h" #include @@ -65,6 +66,19 @@ { } +void ReplayController::setForceDeterministicSettings(bool shouldForce) +{ +ASSERT(shouldForce ^ (m_sessionState == SessionState::Inactive)); + +if (shouldForce) { +m_savedSettings.usesPageCache = m_page.settings().usesPageCache(); + +m_page.settings().setUsesPageCache(false); +} else { +m_page.settings().setUsesPageCache(m_savedSettings.usesPageCache); +} +} + void ReplayController::setSessionState(SessionState state) { ASSERT(state != m_sessionState); @@ -199,6 +213,7 @@ ASSERT(m_segmentState == SegmentState::Unloaded); setSessionState(SessionState::Capturing); +setForceDeterministicSettings(true); LOG(WebReplay, "%-20s Starting capture.\n", "ReplayController"); InspectorInstrumentation::captureStarted(&m_page); @@ -216,6 +231,7 @@ completeSegment(); setSessionState(SessionState::Inactive); +setForceDeterministicSettings(false); LOG(WebReplay, "%-20s Stopping capture.\n", "ReplayController"); InspectorInstrumentation::captureStopped(&m_page); @@ -263,6 +279,7 @@ ASSERT(m_segmentState == SegmentState::Loaded); unloadSegment(); m_sessionState = SessionState::Inactive; +setForceDeterministicSettings(false); InspectorInstrumentation::playbackFinished(&m_page); } @@ -274,8 +291,10 @@ m_dispatchSpeed = speed; -if (m_sessionState != SessionState::Replaying) +if (m_sessionState != SessionState::Replaying) { setSessionState(SessionState::Replaying); +setForceDeterministicSettings(true); +} if (m_segmentState == SegmentState::Unloaded) loadSegmentAtIndex(position.segmentOffset); Modified: trunk/Source/WebCore/replay/ReplayController.h (166336 => 166337) --- trunk/Source/WebCore/replay/ReplayController.h 2014-03-27 03:41:40 UTC (rev 166336) +++ trunk/Source/WebCore/replay/ReplayController.h 2014-03-27 03:45:38 UTC (rev 166337) @@ -151,7 +151,16 @@ EventLoopInputDispatcher& dispatcher() const; void setSessionState(SessionState); +void setForceDeterministicSettings(bool); +struct SavedSettings { +bool usesPageCache; + +SavedSettings() +: usesPageCache(false) +{ } +}; + Page& m_page; RefPtr m_loadedSegment; @@ -170,6 +179,7 @@ SessionState m_sessionState; DispatchSpeed m_dispatchSpeed; +SavedSettings m_savedSettings; }; } // namespace WebCore ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org
[webkit-changes] [166338] trunk/Source/WebKit2
Title: [166338] trunk/Source/WebKit2 Revision 166338 Author ander...@apple.com Date 2014-03-26 20:46:04 -0700 (Wed, 26 Mar 2014) Log Message Rename a delegate method to -webView:didFinishNavigation: https://bugs.webkit.org/show_bug.cgi?id=130814 Reviewed by Sam Weinig. * UIProcess/API/Cocoa/WKNavigationDelegate.h: * UIProcess/Cocoa/NavigationState.h: * UIProcess/Cocoa/NavigationState.mm: (WebKit::NavigationState::setNavigationDelegate): (WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166337 => 166338) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 03:45:38 UTC (rev 166337) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 03:46:04 UTC (rev 166338) @@ -1,3 +1,16 @@ +2014-03-26 Anders Carlsson + +Rename a delegate method to -webView:didFinishNavigation: +https://bugs.webkit.org/show_bug.cgi?id=130814 + +Reviewed by Sam Weinig. + +* UIProcess/API/Cocoa/WKNavigationDelegate.h: +* UIProcess/Cocoa/NavigationState.h: +* UIProcess/Cocoa/NavigationState.mm: +(WebKit::NavigationState::setNavigationDelegate): +(WebKit::NavigationState::LoaderClient::didFinishLoadForFrame): + 2014-03-26 Tim Horton [iOS WebKit2] Crashes on swipe Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (166337 => 166338) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-03-27 03:45:38 UTC (rev 166337) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-03-27 03:46:04 UTC (rev 166338) @@ -57,7 +57,7 @@ - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error; - (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation; -- (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation; +- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation; - (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error; @end Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (166337 => 166338) --- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-03-27 03:45:38 UTC (rev 166337) +++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h 2014-03-27 03:46:04 UTC (rev 166338) @@ -42,6 +42,10 @@ @protocol WKHistoryDelegatePrivate; @protocol WKNavigationDelegate; +@interface NSObject (WKNavigationDelegateToBeRemoved) +- (void)webView:(WKWebView *)webView didFinishLoadingNavigation:(WKNavigation *)navigation; +@end + namespace WebKit { struct WebNavigationDataStore; @@ -129,13 +133,16 @@ bool webViewDidReceiveServerRedirectForProvisionalNavigation : 1; bool webViewDidFailProvisionalNavigationWithError : 1; bool webViewDidCommitNavigation : 1; -bool webViewDidFinishLoadingNavigation : 1; +bool webViewDidFinishNavigation : 1; bool webViewDidFailNavigationWithError : 1; bool webViewRenderingProgressDidChange : 1; bool webViewCanAuthenticateAgainstProtectionSpace : 1; bool webViewDidReceiveAuthenticationChallenge : 1; bool webViewWebProcessDidCrash : 1; + +// FIXME: Remove this once no clients depend on it being called. +bool webViewDidFinishLoadingNavigation : 1; } m_navigationDelegateMethods; HashMap> m_navigations; Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (166337 => 166338) --- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-03-27 03:45:38 UTC (rev 166337) +++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-03-27 03:46:04 UTC (rev 166338) @@ -112,13 +112,16 @@ m_navigationDelegateMethods.webViewDidReceiveServerRedirectForProvisionalNavigation = [delegate respondsToSelector:@selector(webView:didReceiveServerRedirectForProvisionalNavigation:)]; m_navigationDelegateMethods.webViewDidFailProvisionalNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailProvisionalNavigation:withError:)]; m_navigationDelegateMethods.webViewDidCommitNavigation = [delegate respondsToSelector:@selector(webView:didCommitNavigation:)]; -m_navigationDelegateMethods.webViewDidFinishLoadingNavigation = [delegate respondsToSelector:@selector(webView:didFinishLoadingNavigation:)]; +m_navigationDelegateMethods.webViewDidFinishNavigation = [delegate respondsToSelector:@selector(webView:didFinishNavigation:)]; m_navigationDelegateMethods.webViewDidFailNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailNavigation:withError:)]; m_navigationDelegateMethods.webViewRenderingProgressDidChang
[webkit-changes] [166336] trunk/Source/WebKit2
Title: [166336] trunk/Source/WebKit2 Revision 166336 Author timothy_hor...@apple.com Date 2014-03-26 20:41:40 -0700 (Wed, 26 Mar 2014) Log Message [iOS WebKit2] Crashes on swipe Reviewed by Benjamin Poulain. * UIProcess/ios/ViewGestureControllerIOS.mm: (WebKit::ViewGestureController::beginSwipeGesture): Get the IOSurfaceRef from the WebCore::IOSurface. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166335 => 166336) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 03:22:59 UTC (rev 166335) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 03:41:40 UTC (rev 166336) @@ -1,3 +1,14 @@ +2014-03-26 Tim Horton + +[iOS WebKit2] Crashes on swipe + + +Reviewed by Benjamin Poulain. + +* UIProcess/ios/ViewGestureControllerIOS.mm: +(WebKit::ViewGestureController::beginSwipeGesture): +Get the IOSurfaceRef from the WebCore::IOSurface. + 2014-03-26 Simon Fraser Fix the build: include UIKit headers inside the iOS #ifdef. Modified: trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm (166335 => 166336) --- trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-03-27 03:22:59 UTC (rev 166335) +++ trunk/Source/WebKit2/UIProcess/ios/ViewGestureControllerIOS.mm 2014-03-27 03:41:40 UTC (rev 166336) @@ -158,7 +158,7 @@ if (snapshot) { #if USE(IOSURFACE) if (snapshot->setIsPurgeable(false) == IOSurface::SurfaceState::Valid) { -[m_snapshotView layer].contents = (id)snapshot.get(); +[m_snapshotView layer].contents = (id)snapshot->surface(); m_currentSwipeSnapshotSurface = snapshot; } #else ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166335] trunk/Source/WebCore
Title: [166335] trunk/Source/WebCore Revision 166335 Author wei...@apple.com Date 2014-03-26 20:22:59 -0700 (Wed, 26 Mar 2014) Log Message Convert more of HTMLConverter to C++ https://bugs.webkit.org/show_bug.cgi?id=130811 Reviewed by Anders Carlsson. * editing/cocoa/HTMLConverter.mm: (HTMLConverter::HTMLConverter): (HTMLConverter::~HTMLConverter): (HTMLConverter::_blockLevelElementForNode): (HTMLConverter::_colorForElement): (HTMLConverter::_computedAttributesForElement): (HTMLConverter::_attributesForElement): (HTMLConverter::_fillInBlock): (HTMLConverter::_enterElement): (HTMLConverter::_addTableForElement): (HTMLConverter::_addTableCellForElement): (HTMLConverter::_processElement): (HTMLConverter::_exitElement): (HTMLConverter::_getFloat): Deleted. (HTMLConverter::_elementIsBlockLevel): Deleted. (HTMLConverter::_elementHasOwnBackgroundColor): Deleted. (HTMLConverter::_colorForNode): Deleted. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166334 => 166335) --- trunk/Source/WebCore/ChangeLog 2014-03-27 02:25:14 UTC (rev 166334) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 03:22:59 UTC (rev 166335) @@ -1,3 +1,28 @@ +2014-03-26 Sam Weinig + +Convert more of HTMLConverter to C++ +https://bugs.webkit.org/show_bug.cgi?id=130811 + +Reviewed by Anders Carlsson. + +* editing/cocoa/HTMLConverter.mm: +(HTMLConverter::HTMLConverter): +(HTMLConverter::~HTMLConverter): +(HTMLConverter::_blockLevelElementForNode): +(HTMLConverter::_colorForElement): +(HTMLConverter::_computedAttributesForElement): +(HTMLConverter::_attributesForElement): +(HTMLConverter::_fillInBlock): +(HTMLConverter::_enterElement): +(HTMLConverter::_addTableForElement): +(HTMLConverter::_addTableCellForElement): +(HTMLConverter::_processElement): +(HTMLConverter::_exitElement): +(HTMLConverter::_getFloat): Deleted. +(HTMLConverter::_elementIsBlockLevel): Deleted. +(HTMLConverter::_elementHasOwnBackgroundColor): Deleted. +(HTMLConverter::_colorForNode): Deleted. + 2014-03-26 Simon Fraser Hook up -webkit-overflow-scrolling:touch for iOS WK2 Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (166334 => 166335) --- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 02:25:14 UTC (rev 166334) +++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2014-03-27 03:22:59 UTC (rev 166335) @@ -447,6 +447,8 @@ } private: +HashMap, RetainPtr> m_attributesForElements; + NSMutableAttributedString *_attrStr; NSMutableDictionary *_documentAttrs; NSURL *_baseURL; @@ -463,7 +465,6 @@ NSMutableArray *_textTableRows; NSMutableArray *_textTableRowArrays; NSMutableArray *_textTableRowBackgroundColors; -NSMutableDictionary *_attributesForElements; NSMutableDictionary *_fontCache; NSMutableArray *_writingDirectionArray; @@ -484,18 +485,15 @@ void _loadFromDOMRange(); -PlatformColor *_colorForNode(DOMNode *, CSSPropertyID); -BOOL _getFloat(CGFloat *val, DOMNode *, CSSPropertyID); - +PlatformColor *_colorForElement(Element&, CSSPropertyID); + void _traverseNode(DOMNode *node, NSInteger depth, BOOL embedded); void _traverseFooterNode(DOMNode *node, NSInteger depth); -NSDictionary *_computedAttributesForElement(DOMElement *); +NSDictionary *_computedAttributesForElement(Element&); NSDictionary *_attributesForElement(DOMElement *); -bool _elementIsBlockLevel(DOMElement *); -bool _elementHasOwnBackgroundColor(DOMElement *); -DOMElement * _blockLevelElementForNode(DOMNode *); +Element* _blockLevelElementForNode(Node*); void _newParagraphForElement(DOMElement *element, NSString *tag, BOOL flag, BOOL suppressTrailingSpace); void _newLineForElement(DOMElement *element); @@ -503,11 +501,11 @@ BOOL _addAttachmentForElement(DOMElement *element, NSURL *url, BOOL needsParagraph, BOOL usePlaceholder); void _addQuoteForElement(DOMElement *element, BOOL opening, NSInteger level); void _addValue(NSString *value, DOMElement *element); -void _fillInBlock(NSTextBlock *block, DOMElement *element, PlatformColor *backgroundColor, CGFloat extraMargin, CGFloat extraPadding, BOOL isTable); +void _fillInBlock(NSTextBlock *block, Element&, PlatformColor *backgroundColor, CGFloat extraMargin, CGFloat extraPadding, BOOL isTable); void _processMetaElementWithName(NSString *name, NSString *content); void _processHeadElement(DOMElement *element); BOOL _enterElement(DOMElement *element, BOOL embedded); -void _addTableForElement(DOMElement *tableElement); +void _addTableForElement(Element *tableElement); void _addTableCellForElement(DOMElement *tableCellElement); BOOL _proces
[webkit-changes] [166334] trunk/Source/WebKit2
Title: [166334] trunk/Source/WebKit2 Revision 166334 Author simon.fra...@apple.com Date 2014-03-26 19:25:14 -0700 (Wed, 26 Mar 2014) Log Message Fix the build: include UIKit headers inside the iOS #ifdef. * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166333 => 166334) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 02:15:48 UTC (rev 166333) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 02:25:14 UTC (rev 166334) @@ -1,5 +1,11 @@ 2014-03-26 Simon Fraser +Fix the build: include UIKit headers inside the iOS #ifdef. + +* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm: + +2014-03-26 Simon Fraser + Hook up -webkit-overflow-scrolling:touch for iOS WK2 https://bugs.webkit.org/show_bug.cgi?id=130809 Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (166333 => 166334) --- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-03-27 02:15:48 UTC (rev 166333) +++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-03-27 02:25:14 UTC (rev 166334) @@ -25,13 +25,14 @@ #import "config.h" #import "ScrollingTreeOverflowScrollingNodeIOS.h" + +#if PLATFORM(IOS) +#if ENABLE(ASYNC_SCROLLING) + #import #import #import -#if PLATFORM(IOS) -#if ENABLE(ASYNC_SCROLLING) - using namespace WebCore; namespace WebKit { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166333] trunk/Source
Title: [166333] trunk/Source Revision 166333 Author simon.fra...@apple.com Date 2014-03-26 19:15:48 -0700 (Wed, 26 Mar 2014) Log Message Hook up -webkit-overflow-scrolling:touch for iOS WK2 https://bugs.webkit.org/show_bug.cgi?id=130809 Reviewed by Tim Horton. Source/WebCore: Get -webkit-overflow-scrolling: touch working for iOS WK2. * WebCore.exp.in: * page/scrolling/AsyncScrollingCoordinator.cpp: (WebCore::AsyncScrollingCoordinator::updateScrollingNode): Send in ScrollingGeometry when we update scrolling nodes. * page/scrolling/AsyncScrollingCoordinator.h: * page/scrolling/ScrollingCoordinator.h: (WebCore::ScrollingCoordinator::updateScrollingNode): * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h: Need to get to the scrolling layer in a subclass. (WebCore::ScrollingTreeScrollingNodeIOS::scrollLayer): * rendering/RenderLayer.cpp: (WebCore::RenderLayer::hasAcceleratedTouchScrolling): Remove code that temporarily disabled touch-scrolling. * rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): When we update scrolling nodes, send in the right scrolling geometry. Source/WebKit2: * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h: * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm: (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren): Set the content size of the UIScrollVIew based on the geometry. * UIProcess/ios/RemoteLayerTreeHostIOS.mm: (WebKit::RemoteLayerTreeHost::createLayer): Make a UIScrollView if the layer properties tell us that we have the scrolling behavior. * UIProcess/ios/WKContentView.mm: (-[WKContentView initWithFrame:context:WebKit::configuration:WebKit::webView:]): We need to allow user interaction in the _rootContentView so that events get to nested UIScrollViews (this could be optimized in future). * UIProcess/mac/RemoteLayerTreeHost.h: * UIProcess/mac/RemoteLayerTreeHost.mm: (WebKit::RemoteLayerTreeHost::updateLayerTree): (WebKit::RemoteLayerTreeHost::createLayer): Need to pass RemoteLayerTreeTransaction::LayerProperties in so we can get at the custom behavior. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h trunk/Source/WebCore/rendering/RenderLayer.cpp trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166332 => 166333) --- trunk/Source/WebCore/ChangeLog 2014-03-27 01:54:24 UTC (rev 166332) +++ trunk/Source/WebCore/ChangeLog 2014-03-27 02:15:48 UTC (rev 166333) @@ -1,3 +1,29 @@ +2014-03-26 Simon Fraser + +Hook up -webkit-overflow-scrolling:touch for iOS WK2 +https://bugs.webkit.org/show_bug.cgi?id=130809 + +Reviewed by Tim Horton. + +Get -webkit-overflow-scrolling: touch working for iOS WK2. + +* WebCore.exp.in: +* page/scrolling/AsyncScrollingCoordinator.cpp: +(WebCore::AsyncScrollingCoordinator::updateScrollingNode): +Send in ScrollingGeometry when we update scrolling nodes. +* page/scrolling/AsyncScrollingCoordinator.h: +* page/scrolling/ScrollingCoordinator.h: +(WebCore::ScrollingCoordinator::updateScrollingNode): +* page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h: +Need to get to the scrolling layer in a subclass. +(WebCore::ScrollingTreeScrollingNodeIOS::scrollLayer): +* rendering/RenderLayer.cpp: +(WebCore::RenderLayer::hasAcceleratedTouchScrolling): Remove code +that temporarily disabled touch-scrolling. +* rendering/RenderLayerCompositor.cpp: +(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): When we +update scrolling nodes, send in the right scrolling geometry. + 2014-03-26 Timothy Hatcher Modernize the loops in InspectorPageAgent.cpp. Modified: trunk/Source/WebCore/WebCore.exp.in (166332 => 166333) --- trunk/Source/WebCore/WebCore.exp.in 2014-03-27 01:54:24 UTC (rev 166332) +++ trunk/Source/WebCore/WebCore.exp.in 2014-03-27 02:15:48 UTC (rev 166333) @@ -2756,7 +2756,7 @@ __ZN7WebCore25AsyncScrollingCoordinator17attachToStateTreeENS_17ScrollingNodeTypeEyy __ZN7WebCore25AsyncScrollingCoordinator18syncChildPositionsERKNS_10LayoutRectE __ZN7WebCore25AsyncScrollingCoordinator19detachFromState
[webkit-changes] [166332] trunk/Source/WebKit2
Title: [166332] trunk/Source/WebKit2 Revision 166332 Author ander...@apple.com Date 2014-03-26 18:54:24 -0700 (Wed, 26 Mar 2014) Log Message Add -[WKWebView stopLoading] https://bugs.webkit.org/show_bug.cgi?id=130812 Reviewed by Tim Horton. * UIProcess/API/Cocoa/WKWebView.h: * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView stopLoading]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166331 => 166332) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 01:48:28 UTC (rev 166331) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 01:54:24 UTC (rev 166332) @@ -1,3 +1,14 @@ +2014-03-26 Anders Carlsson + +Add -[WKWebView stopLoading] +https://bugs.webkit.org/show_bug.cgi?id=130812 + +Reviewed by Tim Horton. + +* UIProcess/API/Cocoa/WKWebView.h: +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView stopLoading]): + 2014-03-26 Tim Horton Assertion failure in RemoteLayerBackingStore::flush Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (166331 => 166332) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-27 01:48:28 UTC (rev 166331) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-27 01:54:24 UTC (rev 166332) @@ -118,6 +118,9 @@ - (WKNavigation *)goBack; - (WKNavigation *)goForward; +- (void)stopLoading; + +// FIXME: Move this to WKIBActions. - (IBAction)stopLoading:(id)sender; @property (nonatomic) BOOL allowsBackForwardNavigationGestures; Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (166331 => 166332) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-27 01:48:28 UTC (rev 166331) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-03-27 01:54:24 UTC (rev 166332) @@ -307,6 +307,11 @@ return nil; } +- (void)stopLoading +{ +_page->stopLoading(); +} + - (IBAction)stopLoading:(id)sender { _page->stopLoading(); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166331] trunk/Source/WebKit2
Title: [166331] trunk/Source/WebKit2 Revision 166331 Author timothy_hor...@apple.com Date 2014-03-26 18:48:28 -0700 (Wed, 26 Mar 2014) Log Message Assertion failure in RemoteLayerBackingStore::flush https://bugs.webkit.org/show_bug.cgi?id=130810 Reviewed by Simon Fraser. * Shared/mac/RemoteLayerBackingStore.mm: (RemoteLayerBackingStore::flush): We don't always have backing store to flush, if platformCALayerDrawsContent() is false. We also can't assert that we have a back surface, because the very first paint will not. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166330 => 166331) --- trunk/Source/WebKit2/ChangeLog 2014-03-27 00:50:43 UTC (rev 166330) +++ trunk/Source/WebKit2/ChangeLog 2014-03-27 01:48:28 UTC (rev 166331) @@ -1,3 +1,16 @@ +2014-03-26 Tim Horton + +Assertion failure in RemoteLayerBackingStore::flush +https://bugs.webkit.org/show_bug.cgi?id=130810 + + +Reviewed by Simon Fraser. + +* Shared/mac/RemoteLayerBackingStore.mm: +(RemoteLayerBackingStore::flush): +We don't always have backing store to flush, if platformCALayerDrawsContent() is false. +We also can't assert that we have a back surface, because the very first paint will not. + 2014-03-26 Andy Estes [Cocoa] Expose DownloadClient::didFail() and DownloadClient::didCancel() Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (166330 => 166331) --- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-03-27 00:50:43 UTC (rev 166330) +++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-03-27 01:48:28 UTC (rev 166331) @@ -331,17 +331,20 @@ { #if USE(IOSURFACE) if (acceleratesDrawing()) { -CGContextRef platformContext = m_frontSurface->platformContext(); -ASSERT(platformContext); -ASSERT(m_backSurfacePendingFlush); -CGContextFlush(platformContext); -m_backSurfacePendingFlush = nullptr; +if (m_frontSurface) { +CGContextRef platformContext = m_frontSurface->platformContext(); +ASSERT(platformContext); +CGContextFlush(platformContext); +m_backSurfacePendingFlush = nullptr; +} return; } #endif ASSERT(!acceleratesDrawing()); -ASSERT(m_bufferContextPendingFlush); -CGContextFlush(m_bufferContextPendingFlush.get()); -m_bufferContextPendingFlush = nullptr; + +if (m_bufferContextPendingFlush) { +CGContextFlush(m_bufferContextPendingFlush.get()); +m_bufferContextPendingFlush = nullptr; +} } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166330] trunk/Source/JavaScriptCore
Title: [166330] trunk/Source/_javascript_Core Revision 166330 Author mark@apple.com Date 2014-03-26 17:50:43 -0700 (Wed, 26 Mar 2014) Log Message Build fix after r166307. Not reviewed. * runtime/JSCell.h: - The inline function isAPIValueWrapper() should not be exported. This was causing a linkage error when building for 32-bit x86 on Mac. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/JSCell.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166329 => 166330) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-26 23:58:15 UTC (rev 166329) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-27 00:50:43 UTC (rev 166330) @@ -1,3 +1,13 @@ +2014-03-26 Mark Lam + +Build fix after r166307. + +Not reviewed. + +* runtime/JSCell.h: +- The inline function isAPIValueWrapper() should not be exported. This + was causing a linkage error when building for 32-bit x86 on Mac. + 2014-03-26 Filip Pizlo Reasoning about DWARF register numbers should be moved out of FTL::Location Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (166329 => 166330) --- trunk/Source/_javascript_Core/runtime/JSCell.h 2014-03-26 23:58:15 UTC (rev 166329) +++ trunk/Source/_javascript_Core/runtime/JSCell.h 2014-03-27 00:50:43 UTC (rev 166330) @@ -92,7 +92,7 @@ bool isGetterSetter() const; bool isProxy() const; bool inherits(const ClassInfo*) const; -JS_EXPORT_PRIVATE bool isAPIValueWrapper() const; +bool isAPIValueWrapper() const; JSType type() const; IndexingType indexingType() const; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166329] trunk/Source/WebCore
Title: [166329] trunk/Source/WebCore Revision 166329 Author timo...@apple.com Date 2014-03-26 16:58:15 -0700 (Wed, 26 Mar 2014) Log Message Modernize the loops in InspectorPageAgent.cpp. Also moves the check for hiddenFromInspector to a lower level. This hides hidden resources from more places. https://bugs.webkit.org/show_bug.cgi?id=130803 Reviewed by Joseph Pecoraro. * inspector/InspectorPageAgent.cpp: (WebCore::buildArrayForCookies): (WebCore::cachedResourcesForFrame): (WebCore::allResourcesURLsForFrame): (WebCore::InspectorPageAgent::getCookies): (WebCore::InspectorPageAgent::searchInResources): (WebCore::InspectorPageAgent::didClearWindowObjectInWorld): (WebCore::InspectorPageAgent::loaderDetachedFromFrame): (WebCore::InspectorPageAgent::buildObjectForFrameTree): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/inspector/InspectorPageAgent.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166328 => 166329) --- trunk/Source/WebCore/ChangeLog 2014-03-26 23:51:12 UTC (rev 166328) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 23:58:15 UTC (rev 166329) @@ -1,3 +1,24 @@ +2014-03-26 Timothy Hatcher + +Modernize the loops in InspectorPageAgent.cpp. + +Also moves the check for hiddenFromInspector to a lower level. +This hides hidden resources from more places. + +https://bugs.webkit.org/show_bug.cgi?id=130803 + +Reviewed by Joseph Pecoraro. + +* inspector/InspectorPageAgent.cpp: +(WebCore::buildArrayForCookies): +(WebCore::cachedResourcesForFrame): +(WebCore::allResourcesURLsForFrame): +(WebCore::InspectorPageAgent::getCookies): +(WebCore::InspectorPageAgent::searchInResources): +(WebCore::InspectorPageAgent::didClearWindowObjectInWorld): +(WebCore::InspectorPageAgent::loaderDetachedFromFrame): +(WebCore::InspectorPageAgent::buildObjectForFrameTree): + 2014-03-26 Thiago de Barros Lacerda Add platform implementation for RTCOfferAnswerOptions and RTCOfferOptions Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (166328 => 166329) --- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-26 23:51:12 UTC (rev 166328) +++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-03-26 23:58:15 UTC (rev 166329) @@ -451,10 +451,8 @@ { RefPtr> cookies = Inspector::TypeBuilder::Array::create(); -ListHashSet::iterator end = cookiesList.end(); -ListHashSet::iterator it = cookiesList.begin(); -for (int i = 0; it != end; ++it, i++) -cookies->addItem(buildObjectForCookie(*it)); +for (auto& cookie : cookiesList) +cookies->addItem(buildObjectForCookie(cookie)); return cookies; } @@ -463,10 +461,10 @@ { Vector result; -const CachedResourceLoader::DocumentResourceMap& allResources = frame->document()->cachedResourceLoader()->allCachedResources(); -CachedResourceLoader::DocumentResourceMap::const_iterator end = allResources.end(); -for (CachedResourceLoader::DocumentResourceMap::const_iterator it = allResources.begin(); it != end; ++it) { -CachedResource* cachedResource = it->value.get(); +for (auto& cachedResourceHandle : frame->document()->cachedResourceLoader()->allCachedResources().values()) { +auto* cachedResource = cachedResourceHandle.get(); +if (cachedResource->resourceRequest().hiddenFromInspector()) +continue; switch (cachedResource->type()) { case CachedResource::ImageResource: @@ -493,9 +491,8 @@ result.append(frame->loader().documentLoader()->url()); -Vector allResources = cachedResourcesForFrame(frame); -for (Vector::const_iterator it = allResources.begin(); it != allResources.end(); ++it) -result.append((*it)->url()); +for (auto* cachedResource : cachedResourcesForFrame(frame)) +result.append(cachedResource->url()); return result; } @@ -515,13 +512,13 @@ for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext(mainFrame())) { Document* document = frame->document(); -Vector allURLs = allResourcesURLsForFrame(frame); -for (Vector::const_iterator it = allURLs.begin(); it != allURLs.end(); ++it) { + +for (auto& url : allResourcesURLsForFrame(frame)) { Vector docCookiesList; -rawCookiesImplemented = getRawCookies(document, URL(ParsedURLString, *it), docCookiesList); +rawCookiesImplemented = getRawCookies(document, URL(ParsedURLString, url), docCookiesList); + if (!rawCookiesImplemented) { // FIXME: We need duplication checking for the String representation of cookies. -// // Exceptions are thrown by cookie() in sandboxed frames. That won't happen here // because "document" is the document of the main frame of the page. stringCookiesList.append(document->cookie(ASSERT_
[webkit-changes] [166328] trunk
Title: [166328] trunk Revision 166328 Author aes...@apple.com Date 2014-03-26 16:51:12 -0700 (Wed, 26 Mar 2014) Log Message [Cocoa] Expose DownloadClient::didFail() and DownloadClient::didCancel() https://bugs.webkit.org/show_bug.cgi?id=130805 Reviewed by Dan Bernstein. Source/WebKit2: * UIProcess/API/Cocoa/_WKDownloadDelegate.h: * UIProcess/Cocoa/DownloadClient.h: * UIProcess/Cocoa/DownloadClient.mm: (WebKit::DownloadClient::DownloadClient): (WebKit::DownloadClient::didFail): (WebKit::DownloadClient::didCancel): Tools: * TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm: (-[DownloadDelegate _download:didReceiveResponse:]): (-[DownloadDelegate _downloadDidFinish:]): (runTest): (TEST): (-[FailingDownloadDelegate _downloadDidFinish:]): (-[FailingDownloadDelegate _download:didFailWithError:]): (-[FailingDownloadDelegate _downloadDidCancel:]): (-[CancelledDownloadDelegate _downloadDidStart:]): (-[CancelledDownloadDelegate _downloadDidFinish:]): (-[CancelledDownloadDelegate _download:didFailWithError:]): (-[CancelledDownloadDelegate _downloadDidCancel:]): (-[DownloadDelegate initWithSourceURL:]): Deleted. (-[DownloadDelegate sourceURL]): Deleted. (runTestWithNavigationDelegate): Deleted. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.h trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Download.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166327 => 166328) --- trunk/Source/WebKit2/ChangeLog 2014-03-26 23:36:08 UTC (rev 166327) +++ trunk/Source/WebKit2/ChangeLog 2014-03-26 23:51:12 UTC (rev 166328) @@ -1,3 +1,17 @@ +2014-03-26 Andy Estes + +[Cocoa] Expose DownloadClient::didFail() and DownloadClient::didCancel() +https://bugs.webkit.org/show_bug.cgi?id=130805 + +Reviewed by Dan Bernstein. + +* UIProcess/API/Cocoa/_WKDownloadDelegate.h: +* UIProcess/Cocoa/DownloadClient.h: +* UIProcess/Cocoa/DownloadClient.mm: +(WebKit::DownloadClient::DownloadClient): +(WebKit::DownloadClient::didFail): +(WebKit::DownloadClient::didCancel): + 2014-03-26 Cody Krieger -[WKWebProcessPlugInNodeHandle HTMLInputElementIsUserEdited] and -HTMLTextAreaElementIsUserEdited do not return the correct values. Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h (166327 => 166328) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h 2014-03-26 23:36:08 UTC (rev 166327) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownloadDelegate.h 2014-03-26 23:51:12 UTC (rev 166328) @@ -38,6 +38,8 @@ - (void)_download:(_WKDownload *)download didReceiveData:(uint64_t)length; - (NSString *)_download:(_WKDownload *)download decideDestinationWithSuggestedFilename:(NSString *)filename allowOverwrite:(BOOL *)allowOverwrite; - (void)_downloadDidFinish:(_WKDownload *)download; +- (void)_download:(_WKDownload *)download didFailWithError:(NSError *)error; +- (void)_downloadDidCancel:(_WKDownload *)download; @end #endif Modified: trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.h (166327 => 166328) --- trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.h 2014-03-26 23:36:08 UTC (rev 166327) +++ trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.h 2014-03-26 23:51:12 UTC (rev 166328) @@ -36,6 +36,7 @@ @protocol _WKDownloadDelegate; namespace WebCore { +class ResourceError; class ResourceResponse; } @@ -52,6 +53,8 @@ virtual void didReceiveData(WebContext*, DownloadProxy*, uint64_t length); virtual String decideDestinationWithSuggestedFilename(WebContext*, DownloadProxy*, const String& filename, bool& allowOverwriteParam); virtual void didFinish(WebContext*, DownloadProxy*); +virtual void didFail(WebContext*, DownloadProxy*, const WebCore::ResourceError&); +virtual void didCancel(WebContext*, DownloadProxy*); WeakObjCPtr> m_delegate; @@ -61,6 +64,8 @@ bool downloadDidReceiveData : 1; bool downloadDecideDestinationWithSuggestedFilenameAllowOverwrite : 1; bool downloadDidFinish : 1; +bool downloadDidFail : 1; +bool downloadDidCancel : 1; } m_delegateMethods; }; Modified: trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm (166327 => 166328) --- trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm 2014-03-26 23:36:08 UTC (rev 166327) +++ trunk/Source/WebKit2/UIProcess/Cocoa/DownloadClient.mm 2014-03-26 23:51:12 UTC (rev 166328) @@ -31,6 +31,7 @@ #import "_WKDownloadDelegate.h" #import "_WKDownloadInternal.h" #import "DownloadProxy.h" +#import #import namespace WebKit { @@ -49,6 +50,8 @@ m_delegateMethods.downloadDidReceiveData = [delegate respondsToSelector:@selector(_download:didReceiveData:)]; m_delegateMethods.downloadDecideDestinationWithSuggestedFilenameAllowOverwrite = [delegate respondsToSelector:@selecto
[webkit-changes] [166327] trunk/Tools
Title: [166327] trunk/Tools Revision 166327 Author ander...@apple.com Date 2014-03-26 16:36:08 -0700 (Wed, 26 Mar 2014) Log Message Change MiniBrowser to hold on to window controllers instead of windows https://bugs.webkit.org/show_bug.cgi?id=130797 Reviewed by Oliver Hunt. * MiniBrowser/mac/AppDelegate.h: * MiniBrowser/mac/AppDelegate.m: (-[BrowserAppDelegate init]): (-[BrowserAppDelegate newWindow:]): (-[BrowserAppDelegate browserWindowWillClose:]): (-[BrowserAppDelegate applicationWillTerminate:]): (-[BrowserAppDelegate frontmostBrowserWindowController]): Modified Paths trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/mac/AppDelegate.h trunk/Tools/MiniBrowser/mac/AppDelegate.m Diff Modified: trunk/Tools/ChangeLog (166326 => 166327) --- trunk/Tools/ChangeLog 2014-03-26 23:35:39 UTC (rev 166326) +++ trunk/Tools/ChangeLog 2014-03-26 23:36:08 UTC (rev 166327) @@ -1,3 +1,18 @@ +2014-03-26 Anders Carlsson + +Change MiniBrowser to hold on to window controllers instead of windows +https://bugs.webkit.org/show_bug.cgi?id=130797 + +Reviewed by Oliver Hunt. + +* MiniBrowser/mac/AppDelegate.h: +* MiniBrowser/mac/AppDelegate.m: +(-[BrowserAppDelegate init]): +(-[BrowserAppDelegate newWindow:]): +(-[BrowserAppDelegate browserWindowWillClose:]): +(-[BrowserAppDelegate applicationWillTerminate:]): +(-[BrowserAppDelegate frontmostBrowserWindowController]): + 2014-03-26 Commit Queue Unreviewed, rolling out r166264. Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (166326 => 166327) --- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-03-26 23:35:39 UTC (rev 166326) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2014-03-26 23:36:08 UTC (rev 166327) @@ -24,7 +24,7 @@ */ @interface BrowserAppDelegate : NSObject { -NSMutableSet *_browserWindows; +NSMutableSet *_browserWindowControllers; } - (void)browserWindowWillClose:(NSWindow *)window; Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (166326 => 166327) --- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-03-26 23:35:39 UTC (rev 166326) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2014-03-26 23:36:08 UTC (rev 166327) @@ -43,7 +43,7 @@ { self = [super init]; if (self) { -_browserWindows = [[NSMutableSet alloc] init]; +_browserWindowControllers = [[NSMutableSet alloc] init]; } return self; @@ -63,14 +63,14 @@ return; [[controller window] makeKeyAndOrderFront:sender]; -[_browserWindows addObject:[controller window]]; +[_browserWindowControllers addObject:controller]; [controller loadURLString:defaultURL]; } - (void)browserWindowWillClose:(NSWindow *)window { -[_browserWindows removeObject:window]; +[_browserWindowControllers removeObject:window.windowController]; } - (void)applicationDidFinishLaunching:(NSNotification *)aNotification @@ -84,12 +84,8 @@ - (void)applicationWillTerminate:(NSNotification *)notification { -for (NSWindow* window in _browserWindows) { -id delegate = [window delegate]; -assert([delegate isKindOfClass:[BrowserWindowController class]]); -BrowserWindowController *controller = (BrowserWindowController *)delegate; +for (BrowserWindowController* controller in _browserWindowControllers) [controller applicationTerminating]; -} } - (BrowserWindowController *)frontmostBrowserWindowController @@ -101,11 +97,11 @@ continue; BrowserWindowController *controller = (BrowserWindowController *)delegate; -assert([_browserWindows containsObject:[controller window]]); +assert([_browserWindowControllers containsObject:controller]); return controller; } -return 0; +return nil; } - (IBAction)openDocument:(id)sender ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166326] trunk/Source/WebKit2
Title: [166326] trunk/Source/WebKit2 Revision 166326 Author commit-qu...@webkit.org Date 2014-03-26 16:35:39 -0700 (Wed, 26 Mar 2014) Log Message -[WKWebProcessPlugInNodeHandle HTMLInputElementIsUserEdited] and -HTMLTextAreaElementIsUserEdited do not return the correct values. https://bugs.webkit.org/show_bug.cgi?id=130804 Patch by Cody Krieger on 2014-03-26 Reviewed by Dan Bernstein. The existing implementations of these methods are mis-cased ("HTMLInputELementIsUserEdited" and "HTMLTextAreaELementIsUserEdited" — note the "EL" in both cases). This results in us getting auto-synthesized getters for the HTMLInputElementIsUserEdited and HTMLTextAreaElementIsUserEdited properties, which will return NO unconditionally. * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm: Fix the capitalization of -HTMLInputElementIsUserEdited and -HTMLTextAreaElementIsUserEdited. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166325 => 166326) --- trunk/Source/WebKit2/ChangeLog 2014-03-26 23:26:48 UTC (rev 166325) +++ trunk/Source/WebKit2/ChangeLog 2014-03-26 23:35:39 UTC (rev 166326) @@ -1,3 +1,22 @@ +2014-03-26 Cody Krieger + +-[WKWebProcessPlugInNodeHandle HTMLInputElementIsUserEdited] and -HTMLTextAreaElementIsUserEdited do not return the correct values. + +https://bugs.webkit.org/show_bug.cgi?id=130804 + +Reviewed by Dan Bernstein. + +The existing implementations of these methods are mis-cased +("HTMLInputELementIsUserEdited" and "HTMLTextAreaELementIsUserEdited" — +note the "EL" in both cases). This results in us getting +auto-synthesized getters for the HTMLInputElementIsUserEdited and +HTMLTextAreaElementIsUserEdited properties, which will return NO +unconditionally. + +* WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm: +Fix the capitalization of -HTMLInputElementIsUserEdited and +-HTMLTextAreaElementIsUserEdited. + 2014-03-26 Andy Estes [Cocoa] Expose DownloadProxy::cancel() Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm (166325 => 166326) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2014-03-26 23:26:48 UTC (rev 166325) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInNodeHandle.mm 2014-03-26 23:35:39 UTC (rev 166326) @@ -78,12 +78,12 @@ _nodeHandle->setHTMLInputElementAutofilled(isAutoFilled); } -- (BOOL)HTMLInputELementIsUserEdited +- (BOOL)HTMLInputElementIsUserEdited { return _nodeHandle->htmlInputElementLastChangeWasUserEdit(); } -- (BOOL)HTMLTextAreaELementIsUserEdited +- (BOOL)HTMLTextAreaElementIsUserEdited { return _nodeHandle->htmlTextAreaElementLastChangeWasUserEdit(); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166325] trunk/Source/WebCore
Title: [166325] trunk/Source/WebCore Revision 166325 Author thiago.lace...@openbossa.org Date 2014-03-26 16:26:48 -0700 (Wed, 26 Mar 2014) Log Message Add platform implementation for RTCOfferAnswerOptions and RTCOfferOptions https://bugs.webkit.org/show_bug.cgi?id=130689 Reviewed by Eric Carlson. RTCOfferAnswerOptions and RTCOfferOptions objects were being passed to platform class, causing a layer violation. * Modules/mediastream/RTCOfferAnswerOptions.cpp: (WebCore::RTCOfferAnswerOptions::initialize): (WebCore::RTCOfferOptions::initialize): * Modules/mediastream/RTCOfferAnswerOptions.h: (WebCore::RTCOfferAnswerOptions::requestIdentity): (WebCore::RTCOfferAnswerOptions::privateOfferAnswerOptions): (WebCore::RTCOfferAnswerOptions::RTCOfferAnswerOptions): (WebCore::RTCOfferOptions::offerToReceiveVideo): (WebCore::RTCOfferOptions::offerToReceiveAudio): (WebCore::RTCOfferOptions::voiceActivityDetection): (WebCore::RTCOfferOptions::iceRestart): (WebCore::RTCOfferOptions::privateOfferOptions): (WebCore::RTCOfferOptions::RTCOfferOptions): * Modules/mediastream/RTCPeerConnection.cpp: (WebCore::RTCPeerConnection::createOffer): (WebCore::RTCPeerConnection::createAnswer): * platform/mediastream/RTCOfferAnswerOptionsPrivate.h: Added. * platform/mediastream/RTCPeerConnectionHandler.h: * platform/mock/RTCPeerConnectionHandlerMock.cpp: (WebCore::RTCPeerConnectionHandlerMock::createOffer): (WebCore::RTCPeerConnectionHandlerMock::createAnswer): * platform/mock/RTCPeerConnectionHandlerMock.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h Added Paths trunk/Source/WebCore/platform/mediastream/RTCOfferAnswerOptionsPrivate.h Diff Modified: trunk/Source/WebCore/ChangeLog (166324 => 166325) --- trunk/Source/WebCore/ChangeLog 2014-03-26 23:17:27 UTC (rev 166324) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 23:26:48 UTC (rev 166325) @@ -1,3 +1,36 @@ +2014-03-26 Thiago de Barros Lacerda + +Add platform implementation for RTCOfferAnswerOptions and RTCOfferOptions +https://bugs.webkit.org/show_bug.cgi?id=130689 + +Reviewed by Eric Carlson. + +RTCOfferAnswerOptions and RTCOfferOptions objects were being passed to platform class, causing a layer +violation. + +* Modules/mediastream/RTCOfferAnswerOptions.cpp: +(WebCore::RTCOfferAnswerOptions::initialize): +(WebCore::RTCOfferOptions::initialize): +* Modules/mediastream/RTCOfferAnswerOptions.h: +(WebCore::RTCOfferAnswerOptions::requestIdentity): +(WebCore::RTCOfferAnswerOptions::privateOfferAnswerOptions): +(WebCore::RTCOfferAnswerOptions::RTCOfferAnswerOptions): +(WebCore::RTCOfferOptions::offerToReceiveVideo): +(WebCore::RTCOfferOptions::offerToReceiveAudio): +(WebCore::RTCOfferOptions::voiceActivityDetection): +(WebCore::RTCOfferOptions::iceRestart): +(WebCore::RTCOfferOptions::privateOfferOptions): +(WebCore::RTCOfferOptions::RTCOfferOptions): +* Modules/mediastream/RTCPeerConnection.cpp: +(WebCore::RTCPeerConnection::createOffer): +(WebCore::RTCPeerConnection::createAnswer): +* platform/mediastream/RTCOfferAnswerOptionsPrivate.h: Added. +* platform/mediastream/RTCPeerConnectionHandler.h: +* platform/mock/RTCPeerConnectionHandlerMock.cpp: +(WebCore::RTCPeerConnectionHandlerMock::createOffer): +(WebCore::RTCPeerConnectionHandlerMock::createAnswer): +* platform/mock/RTCPeerConnectionHandlerMock.h: + 2014-03-26 Zalan Bujtas Device scale factor should always be greater than 0. Modified: trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp (166324 => 166325) --- trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp 2014-03-26 23:17:27 UTC (rev 166324) +++ trunk/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp 2014-03-26 23:26:48 UTC (rev 166325) @@ -32,11 +32,6 @@ namespace WebCore { -static bool validateRequestIdentity(const String& value) -{ -return value == "yes" || value == "no" || value == "ifconfigured"; -} - PassRefPtr RTCOfferAnswerOptions::create(const Dictionary& options, ExceptionCode& ec) { RefPtr offerAnswerOptions = adoptRef(new RTCOfferAnswerOptions()); @@ -53,13 +48,14 @@ bool RTCOfferAnswerOptions::initialize(const Dictionary& options) { +if (!m_private) +m_private = RTCOfferAnswerOptionsPrivate::create(); + String requestIdentity; if (!options.isUndefinedOrNull() && (!options.get("requestIdentity", requestIdentity) || requestIdentity.isEmpty()))
[webkit-changes] [166324] branches/safari-537.75-branch/LayoutTests
Title: [166324] branches/safari-537.75-branch/LayoutTests Revision 166324 Author matthew_han...@apple.com Date 2014-03-26 16:17:27 -0700 (Wed, 26 Mar 2014) Log Message Remove artifacts of local changes that made it into a versioning commit. Modified Paths branches/safari-537.75-branch/LayoutTests/ChangeLog Removed Paths branches/safari-537.75-branch/LayoutTests/js/resources/ Diff Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (166323 => 166324) --- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-26 22:43:22 UTC (rev 166323) +++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-03-26 23:17:27 UTC (rev 166324) @@ -1,3 +1,38 @@ +2014-03-26 Matthew Hanson + +Remove artifacts of local changes that made it into a versioning commit. + +Unreviewed. + +* js/resources: Removed. +* js/resources/JSON-parse.js: Removed. +* js/resources/JSON-stringify.js: Removed. +* js/resources/bom-in-file-retains-correct-offset.js: Removed. +* js/resources/codegen-temporaries-multiple-global-blocks-1.js: Removed. +* js/resources/codegen-temporaries-multiple-global-blocks-2.js: Removed. +* js/resources/const.js: Removed. +* js/resources/document-all-between-frames-subframe.html: Removed. +* js/resources/empty-worker.js: Removed. +* js/resources/fs-test-post.js: Removed. +* js/resources/garbage-collect-after-string-appends.js-disabled: Removed. +* js/resources/getOwnPropertyDescriptor.js: Removed. +* js/resources/image-preload-helper.js: Removed. +* js/resources/instanceof-operator-dummy-worker.js: Removed. +* js/resources/js-constructors-use-correct-global.js: Removed. +* js/resources/js-test-post-async.js: Removed. +* js/resources/js-test-post.js: Removed. +* js/resources/js-test-pre.js: Removed. +* js/resources/js-test-style.css: Removed. +* js/resources/json2-es5-compat.js: Removed. +* js/resources/lexical-lookup-in-function-constructor-child.html: Removed. +* js/resources/parse-error-external-script-in-eval.js: Removed. +* js/resources/parse-error-external-script-in-new-Function.js: Removed. +* js/resources/script-line-number.js: Removed. +* js/resources/select-options-remove.js: Removed. +* js/resources/standalone-post.js: Removed. +* js/resources/standalone-pre.js: Removed. +* js/resources/string-concatenate-outofmemory.js: Removed. + 2014-03-21 Matthew Hanson Merge r166090. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166323] trunk/Source/WebCore
Title: [166323] trunk/Source/WebCore Revision 166323 Author za...@apple.com Date 2014-03-26 15:43:22 -0700 (Wed, 26 Mar 2014) Log Message Device scale factor should always be greater than 0. https://bugs.webkit.org/show_bug.cgi?id=130798 Reviewed by David Kilzer. Rendering context requires a device scale factor > 0 so that we can map CSS pixels to device pixels properly. Neither 0 nor a negative device pixel ratio are considered to be valid. * page/Page.cpp: (WebCore::Page::setDeviceScaleFactor): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/Page.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166322 => 166323) --- trunk/Source/WebCore/ChangeLog 2014-03-26 22:05:24 UTC (rev 166322) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 22:43:22 UTC (rev 166323) @@ -1,3 +1,16 @@ +2014-03-26 Zalan Bujtas + +Device scale factor should always be greater than 0. +https://bugs.webkit.org/show_bug.cgi?id=130798 + +Reviewed by David Kilzer. + +Rendering context requires a device scale factor > 0 so that we can map CSS pixels +to device pixels properly. Neither 0 nor a negative device pixel ratio are considered to be valid. + +* page/Page.cpp: +(WebCore::Page::setDeviceScaleFactor): + 2014-03-26 Myles C. Maxfield Skipping underlines disregard points completely inside the underline rect Modified: trunk/Source/WebCore/page/Page.cpp (166322 => 166323) --- trunk/Source/WebCore/page/Page.cpp 2014-03-26 22:05:24 UTC (rev 166322) +++ trunk/Source/WebCore/page/Page.cpp 2014-03-26 22:43:22 UTC (rev 166323) @@ -734,6 +734,10 @@ void Page::setDeviceScaleFactor(float scaleFactor) { +ASSERT(scaleFactor > 0); +if (scaleFactor <= 0) +return; + if (m_deviceScaleFactor == scaleFactor) return; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166322] trunk
Title: [166322] trunk Revision 166322 Author mmaxfi...@apple.com Date 2014-03-26 15:05:24 -0700 (Wed, 26 Mar 2014) Log Message Skipping underlines disregard points completely inside the underline rect https://bugs.webkit.org/show_bug.cgi?id=130800 Patch by Myles C. Maxfield on 2014-03-26 Reviewed by Dean Jackson. Source/WebCore: When determining bounds for underline skipping, endpoints of glyph contours that lie entirely within the rect of the underline are ignored. This patch makes these points affect the skipping regions the same way that intersections do. Test: fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html * platform/graphics/mac/FontMac.mm: (WebCore::updateX): Refactored common code into a function (WebCore::findPathIntersections): Test for endpoints which lie entirely within the underline bounds LayoutTests: This test draws a glyph entire inside the underline. It should render the same as it would without any underline at all. * fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg: Added an underscore glyph that would lie entirely within an underline * fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/mac/FontMac.mm Added Paths trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline-expected.html trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html Diff Modified: trunk/LayoutTests/ChangeLog (166321 => 166322) --- trunk/LayoutTests/ChangeLog 2014-03-26 22:02:26 UTC (rev 166321) +++ trunk/LayoutTests/ChangeLog 2014-03-26 22:05:24 UTC (rev 166322) @@ -1,3 +1,17 @@ +2014-03-26 Myles C. Maxfield + +Skipping underlines disregard points completely inside the underline rect +https://bugs.webkit.org/show_bug.cgi?id=130800 + +Reviewed by Dean Jackson. + +This test draws a glyph entire inside the underline. It should render the same +as it would without any underline at all. + +* fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg: Added +an underscore glyph that would lie entirely within an underline +* fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html: + 2014-03-26 Simon Fraser REGRESSION (r155977): matrix animations no longer animate Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline-expected.html (0 => 166322) --- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline-expected.html (rev 0) +++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline-expected.html 2014-03-26 22:05:24 UTC (rev 166322) @@ -0,0 +1,19 @@ + + + + +@font-face { +font-family: 'Litherum'; +src: url("./resources/Litherum.svg") format(svg) +} +#p { +font: 100px 'Litherum'; +} + + + +This test draws an underscore that should entirely fit within an underline. +The underline should skip over the entire glyph. +_ + + Added: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html (0 => 166322) --- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html (rev 0) +++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/glyph-inside-underline.html 2014-03-26 22:05:24 UTC (rev 166322) @@ -0,0 +1,20 @@ + + + + +@font-face { +font-family: 'Litherum'; +src: url("./resources/Litherum.svg") format(svg) +} +#p { +font: 100px 'Litherum'; +text-decoration: underline; +} + + + +This test draws an underscore that should entirely fit within an underline. +The underline should skip over the entire glyph. +_ + + Modified: trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg (166321 => 166322) --- trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg 2014-03-26 22:02:26 UTC (rev 166321) +++ trunk/LayoutTests/fast/css3-text/css3-text-decoration/text-decoration-skip/resources/Litherum.svg 2014-03-26 22:05:24 UTC (rev 166322) @@ -4,8 +4,9 @@ - - + + + Modified: trunk/Source/WebCore/ChangeLog (166321 => 166322) --- trunk/Source/WebCore/ChangeLog 2014-03-26 22:02:26 UTC (rev 166321) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 22:05:24 UTC (rev 166322) @@ -1,3 +1,22 @@ +2014-03-26 Myles C. Maxfield + +Skipping underlines disregard points completely inside the underline rect +https://bugs.webkit.org/show_bug.cgi?id=130800 + +Reviewed
[webkit-changes] [166320] tags/Safari-537.75.14/
Title: [166320] tags/Safari-537.75.14/ Revision 166320 Author matthew_han...@apple.com Date 2014-03-26 15:00:01 -0700 (Wed, 26 Mar 2014) Log Message New tag. Added Paths tags/Safari-537.75.14/ Diff Property changes: tags/Safari-537.75.14 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166319] trunk/Source/WebCore
Title: [166319] trunk/Source/WebCore Revision 166319 Author psola...@apple.com Date 2014-03-26 14:45:27 -0700 (Wed, 26 Mar 2014) Log Message Unreviewed. iOS build fix after r166312. Soft link CMTimeRangeGetEnd. * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166318 => 166319) --- trunk/Source/WebCore/ChangeLog 2014-03-26 21:32:19 UTC (rev 166318) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 21:45:27 UTC (rev 166319) @@ -1,3 +1,9 @@ +2014-03-26 Pratik Solanki + +Unreviewed. iOS build fix after r166312. Soft link CMTimeRangeGetEnd. + +* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: + 2014-03-26 Timothy Hatcher Propagate the hiddenFromInspector flag on ResourceRequest in Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (166318 => 166319) --- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-03-26 21:32:19 UTC (rev 166318) +++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2014-03-26 21:45:27 UTC (rev 166319) @@ -68,6 +68,7 @@ SOFT_LINK(CoreMedia, CMTimeGetSeconds, Float64, (CMTime time), (time)) SOFT_LINK(CoreMedia, CMTimeMake, CMTime, (int64_t value, int32_t timescale), (value, timescale)) SOFT_LINK(CoreMedia, CMTimeRangeContainsTime, Boolean, (CMTimeRange range, CMTime time), (range, time)) +SOFT_LINK(CoreMedia, CMTimeRangeGetEnd, CMTime, (CMTimeRange range), (range)) SOFT_LINK(CoreMedia, CMTimeRangeMake, CMTimeRange, (CMTime start, CMTime duration), (start, duration)) SOFT_LINK(CoreMedia, CMTimeSubtract, CMTime, (CMTime minuend, CMTime subtrahend), (minuend, subtrahend)) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166318] trunk/Source/WebKit2
Title: [166318] trunk/Source/WebKit2 Revision 166318 Author aes...@apple.com Date 2014-03-26 14:32:19 -0700 (Wed, 26 Mar 2014) Log Message [Cocoa] Expose DownloadProxy::cancel() https://bugs.webkit.org/show_bug.cgi?id=130799 Reviewed by Dan Bernstein. * UIProcess/API/Cocoa/_WKDownload.h: * UIProcess/API/Cocoa/_WKDownload.mm: (-[_WKDownload cancel]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166317 => 166318) --- trunk/Source/WebKit2/ChangeLog 2014-03-26 21:20:01 UTC (rev 166317) +++ trunk/Source/WebKit2/ChangeLog 2014-03-26 21:32:19 UTC (rev 166318) @@ -1,3 +1,14 @@ +2014-03-26 Andy Estes + +[Cocoa] Expose DownloadProxy::cancel() +https://bugs.webkit.org/show_bug.cgi?id=130799 + +Reviewed by Dan Bernstein. + +* UIProcess/API/Cocoa/_WKDownload.h: +* UIProcess/API/Cocoa/_WKDownload.mm: +(-[_WKDownload cancel]): + 2014-03-26 Timothy Hatcher Propagate the hiddenFromInspector flag on ResourceRequest in Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h (166317 => 166318) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-03-26 21:20:01 UTC (rev 166317) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-03-26 21:32:19 UTC (rev 166318) @@ -32,6 +32,8 @@ WK_API_CLASS @interface _WKDownload : NSObject +- (void)cancel; + @property (nonatomic, readonly) NSURLRequest *request; @end Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm (166317 => 166318) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm 2014-03-26 21:20:01 UTC (rev 166317) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm 2014-03-26 21:32:19 UTC (rev 166318) @@ -41,6 +41,11 @@ [super dealloc]; } +- (void)cancel +{ +_download->cancel(); +} + - (NSURLRequest *)request { return _download->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166317] trunk/Source
Title: [166317] trunk/Source Revision 166317 Author timo...@apple.com Date 2014-03-26 14:20:01 -0700 (Wed, 26 Mar 2014) Log Message Propagate the hiddenFromInspector flag on ResourceRequest in places when a new request a made or passed between processes. https://bugs.webkit.org/show_bug.cgi?id=130741 Reviewed by Joseph Pecoraro. Source/WebCore: * WebCore.exp.in: Updated symbols for updateFromDelegatePreservingOldProperties. * platform/network/cf/ResourceRequest.h: * platform/network/cf/ResourceRequestCFNet.cpp: (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. (WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. * platform/network/curl/ResourceRequest.h: (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. (WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. * platform/network/mac/ResourceRequestMac.mm: (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. (WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. * platform/network/soup/ResourceRequest.h: (WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. (WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. Source/WebKit/mac: * WebCoreSupport/WebFrameLoaderClient.mm: (WebFrameLoaderClient::dispatchWillSendRequest): Copy hiddenFromInspector to the new request. Source/WebKit2: * NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::continueWillSendRequest): Use updateFromDelegatePreservingOldProperties. * Shared/WebCoreArgumentCoders.cpp: (IPC::ArgumentCoder::encode): Added hiddenFromInspector support. (IPC::ArgumentCoder::decode): Ditto. * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp: (WebKit::InjectedBundlePageResourceLoadClient::willSendRequestForFrame): Ditto. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/platform/network/cf/ResourceRequest.h trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp trunk/Source/WebCore/platform/network/curl/ResourceRequest.h trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm trunk/Source/WebCore/platform/network/soup/ResourceRequest.h trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166316 => 166317) --- trunk/Source/WebCore/ChangeLog 2014-03-26 21:06:49 UTC (rev 166316) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 21:20:01 UTC (rev 166317) @@ -1,3 +1,27 @@ +2014-03-26 Timothy Hatcher + +Propagate the hiddenFromInspector flag on ResourceRequest in +places when a new request a made or passed between processes. + +https://bugs.webkit.org/show_bug.cgi?id=130741 + +Reviewed by Joseph Pecoraro. + +* WebCore.exp.in: Updated symbols for updateFromDelegatePreservingOldProperties. +* platform/network/cf/ResourceRequest.h: +* platform/network/cf/ResourceRequestCFNet.cpp: +(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. +(WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. +* platform/network/curl/ResourceRequest.h: +(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. +(WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. +* platform/network/mac/ResourceRequestMac.mm: +(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. +(WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. +* platform/network/soup/ResourceRequest.h: +(WebCore::ResourceRequest::updateFromDelegatePreservingOldProperties): Added. +(WebCore::ResourceRequest::updateFromDelegatePreservingOldHTTPBody): Deleted. + 2014-03-26 Zoltan Horvath [CSS Shapes] Remove no-longer-used shape-inside geometry code Modified: trunk/Source/WebCore/WebCore.exp.in (166316 => 166317) --- trunk/Source/WebCore/WebCore.exp.in 2014-03-26 21:06:49 UTC (rev 166316) +++ trunk/Source/WebCore/WebCore.exp.in 2014-03-26 21:20:01 UTC (rev 166317) @@ -2133,7 +2133,7 @@ __ZN7WebCore14cookiesEnabledERKNS_21NetworkStorageSessionERKNS_3URLES5_ __ZN7WebCore15GraphicsContext15drawNativeImageEP7CGImageRKNS_9FloatSizeENS_10ColorSpaceERKNS_9FloatRectES9_fNS_17CompositeOperatorENS_9BlendModeENS_16ImageOrientationE __ZN7WebCore15GraphicsContextC1EP9CGContext -__ZN7WebCore15ResourceRequest39updateFromDelegatePreservingOldHTTPBodyERKS0_ +__ZN7WebCore15ResourceRequest41updateFromDelegatePreservingOldPropertiesERKS0_ __ZN7WebCore16FontPl
[webkit-changes] [166315] trunk/Source/WebKit2
Title: [166315] trunk/Source/WebKit2 Revision 166315 Author aes...@apple.com Date 2014-03-26 14:04:27 -0700 (Wed, 26 Mar 2014) Log Message [Cocoa] Expose DownloadProxy::request() https://bugs.webkit.org/show_bug.cgi?id=130796 Reviewed by Anders Carlsson. * UIProcess/API/Cocoa/_WKDownload.h: * UIProcess/API/Cocoa/_WKDownload.mm: (-[_WKDownload request]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (166314 => 166315) --- trunk/Source/WebKit2/ChangeLog 2014-03-26 20:56:10 UTC (rev 166314) +++ trunk/Source/WebKit2/ChangeLog 2014-03-26 21:04:27 UTC (rev 166315) @@ -1,3 +1,14 @@ +2014-03-26 Andy Estes + +[Cocoa] Expose DownloadProxy::request() +https://bugs.webkit.org/show_bug.cgi?id=130796 + +Reviewed by Anders Carlsson. + +* UIProcess/API/Cocoa/_WKDownload.h: +* UIProcess/API/Cocoa/_WKDownload.mm: +(-[_WKDownload request]): + 2014-03-26 Anders Carlsson Pass a real FrameLoadRequest to Chrome::createWindow Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h (166314 => 166315) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-03-26 20:56:10 UTC (rev 166314) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.h 2014-03-26 21:04:27 UTC (rev 166315) @@ -32,6 +32,8 @@ WK_API_CLASS @interface _WKDownload : NSObject +@property (nonatomic, readonly) NSURLRequest *request; + @end #endif // WK_API_ENABLED Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm (166314 => 166315) --- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm 2014-03-26 20:56:10 UTC (rev 166314) +++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKDownload.mm 2014-03-26 21:04:27 UTC (rev 166315) @@ -41,6 +41,11 @@ [super dealloc]; } +- (NSURLRequest *)request +{ +return _download->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody); +} + #pragma mark WKObject protocol implementation - (API::Object&)_apiObject ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166314] trunk/Source/WebKit2
Title: [166314] trunk/Source/WebKit2 Revision 166314 Author ander...@apple.com Date 2014-03-26 13:56:10 -0700 (Wed, 26 Mar 2014) Log Message Pass a real FrameLoadRequest to Chrome::createWindow https://bugs.webkit.org/show_bug.cgi?id=130795 Reviewed by Dan Bernstein. * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::dispatchCreatePage): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (166313 => 166314) --- trunk/Source/WebKit2/ChangeLog 2014-03-26 20:49:42 UTC (rev 166313) +++ trunk/Source/WebKit2/ChangeLog 2014-03-26 20:56:10 UTC (rev 166314) @@ -1,3 +1,13 @@ +2014-03-26 Anders Carlsson + +Pass a real FrameLoadRequest to Chrome::createWindow +https://bugs.webkit.org/show_bug.cgi?id=130795 + +Reviewed by Dan Bernstein. + +* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: +(WebKit::WebFrameLoaderClient::dispatchCreatePage): + 2014-03-26 Jeremy Jones Implement hasLiveStreamingContent property in WebAVPlayerController Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (166313 => 166314) --- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-26 20:49:42 UTC (rev 166313) +++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-03-26 20:56:10 UTC (rev 166314) @@ -610,7 +610,7 @@ return 0; // Just call through to the chrome client. -Page* newPage = webPage->corePage()->chrome().createWindow(m_frame->coreFrame(), FrameLoadRequest(m_frame->coreFrame()->document()->securityOrigin()), WindowFeatures(), navigationAction); +Page* newPage = webPage->corePage()->chrome().createWindow(m_frame->coreFrame(), FrameLoadRequest(m_frame->coreFrame()->document()->securityOrigin(), navigationAction.resourceRequest()), WindowFeatures(), navigationAction); if (!newPage) return 0; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166313] trunk/Source/JavaScriptCore
Title: [166313] trunk/Source/_javascript_Core Revision 166313 Author fpi...@apple.com Date 2014-03-26 13:49:42 -0700 (Wed, 26 Mar 2014) Log Message Reasoning about DWARF register numbers should be moved out of FTL::Location https://bugs.webkit.org/show_bug.cgi?id=130792 Reviewed by Oliver Hunt. Moving this code makes it possible for things other than FTL::Location to reason about DWARF register encoding. This refactoring also appears to reduce some code duplication and makes FTLLocation.cpp cleaner. * _javascript_Core.xcodeproj/project.pbxproj: * ftl/FTLCompile.cpp: (JSC::FTL::fixFunctionBasedOnStackMaps): * ftl/FTLDWARFRegister.cpp: Added. (JSC::FTL::DWARFRegister::reg): (JSC::FTL::DWARFRegister::dump): * ftl/FTLDWARFRegister.h: Added. (JSC::FTL::DWARFRegister::DWARFRegister): (JSC::FTL::DWARFRegister::dwarfRegNum): * ftl/FTLLocation.cpp: (JSC::FTL::Location::dump): (JSC::FTL::Location::isGPR): (JSC::FTL::Location::gpr): (JSC::FTL::Location::isFPR): (JSC::FTL::Location::fpr): * ftl/FTLLocation.h: (JSC::FTL::Location::hasDwarfReg): (JSC::FTL::Location::dwarfReg): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj trunk/Source/_javascript_Core/ftl/FTLCompile.cpp trunk/Source/_javascript_Core/ftl/FTLLocation.cpp trunk/Source/_javascript_Core/ftl/FTLLocation.h Added Paths trunk/Source/_javascript_Core/ftl/FTLDWARFRegister.cpp trunk/Source/_javascript_Core/ftl/FTLDWARFRegister.h Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166312 => 166313) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-26 20:17:39 UTC (rev 166312) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-26 20:49:42 UTC (rev 166313) @@ -1,3 +1,33 @@ +2014-03-26 Filip Pizlo + +Reasoning about DWARF register numbers should be moved out of FTL::Location +https://bugs.webkit.org/show_bug.cgi?id=130792 + +Reviewed by Oliver Hunt. + +Moving this code makes it possible for things other than FTL::Location to reason about +DWARF register encoding. This refactoring also appears to reduce some code duplication +and makes FTLLocation.cpp cleaner. + +* _javascript_Core.xcodeproj/project.pbxproj: +* ftl/FTLCompile.cpp: +(JSC::FTL::fixFunctionBasedOnStackMaps): +* ftl/FTLDWARFRegister.cpp: Added. +(JSC::FTL::DWARFRegister::reg): +(JSC::FTL::DWARFRegister::dump): +* ftl/FTLDWARFRegister.h: Added. +(JSC::FTL::DWARFRegister::DWARFRegister): +(JSC::FTL::DWARFRegister::dwarfRegNum): +* ftl/FTLLocation.cpp: +(JSC::FTL::Location::dump): +(JSC::FTL::Location::isGPR): +(JSC::FTL::Location::gpr): +(JSC::FTL::Location::isFPR): +(JSC::FTL::Location::fpr): +* ftl/FTLLocation.h: +(JSC::FTL::Location::hasDwarfReg): +(JSC::FTL::Location::dwarfReg): + 2014-03-26 Brent Fulgham Unreviewed build fix. Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (166312 => 166313) --- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-03-26 20:17:39 UTC (rev 166312) +++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2014-03-26 20:49:42 UTC (rev 166313) @@ -380,6 +380,8 @@ 0F9749711687ADE400A4FF6A /* JSCellInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F97496F1687ADE200A4FF6A /* JSCellInlines.h */; settings = {ATTRIBUTES = (Private, ); }; }; 0F98206016BFE38100240D02 /* PreciseJumpTargets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F98205D16BFE37F00240D02 /* PreciseJumpTargets.cpp */; }; 0F98206116BFE38300240D02 /* PreciseJumpTargets.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F98205E16BFE37F00240D02 /* PreciseJumpTargets.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 0F9C5E5E18E35F5E00D431C3 /* FTLDWARFRegister.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F9C5E5C18E35F5E00D431C3 /* FTLDWARFRegister.cpp */; }; + 0F9C5E5F18E35F5E00D431C3 /* FTLDWARFRegister.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F9C5E5D18E35F5E00D431C3 /* FTLDWARFRegister.h */; settings = {ATTRIBUTES = (Private, ); }; }; 0F9D3370165DBB90005AD387 /* Disassembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F9D336E165DBB8D005AD387 /* Disassembler.cpp */; }; 0F9D339617FFC4E60073C2BC /* DFGFlushedAt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F9D339417FFC4E60073C2BC /* DFGFlushedAt.cpp */; }; 0F9D339717FFC4E60073C2BC /* DFGFlushedAt.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F9D339517FFC4E60073C2BC /* DFGFlushedAt.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -1904,6 +1906,8 @@ 0F97496F1687ADE200A4FF6A /* JSCellInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCellInlines.h; sourceTree = ""; }; 0F98205D16BFE37F00240D02 /* PreciseJumpTargets.cpp */ = {isa = PB
[webkit-changes] [166312] trunk/Source
Title: [166312] trunk/Source Revision 166312 Author commit-qu...@webkit.org Date 2014-03-26 13:17:39 -0700 (Wed, 26 Mar 2014) Log Message Implement hasLiveStreamingContent property in WebAVPlayerController https://bugs.webkit.org/show_bug.cgi?id=128684 Patch by Jeremy Jones on 2014-03-26 Reviewed by Simon Fraser. Source/WebCore: * WebCore.exp.in: Add export for WebVideoFullscreenInterfaceAVKit::setSeekableRanges(). * platform/ios/WebVideoFullscreenInterface.h: Add setSeekableRanges() * platform/ios/WebVideoFullscreenInterfaceAVKit.h: Add setSeekableRanges() * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Remove vestigial playerLayer property. Add seekableTimeRanges property. (-[WebAVPlayerController dealloc]): Release _seekableTimeRanges. Remove references to _playerLayer. (-[WebAVPlayerController hasLiveStreamingContent]): Implement based on duration. Live stream has an infinite duration. (+[WebAVPlayerController keyPathsForValuesAffectingHasLiveStreamingContent]): Describe dependent keys for computed property hasLiveStreamingContent. (-[WebAVPlayerController skipBackwardThirtySeconds:]): Seek back 30 seconds if that time is in the seekable ranges. (-[WebAVPlayerController gotoEndOfSeekableRanges:]): Jump to live by going to the of the seekable ranges. (WebVideoFullscreenInterfaceAVKit::setSeekableRanges): Convert TimeRange to CMTimeRange. * platform/ios/WebVideoFullscreenModelMediaElement.mm: (WebVideoFullscreenModelMediaElement::setMediaElement): Set initial seekable ranges. (WebVideoFullscreenModelMediaElement::handleEvent): Update seekable ranges when time changes. Source/WebKit2: Plumb through the seekable ranges to the fullscreen interface. * UIProcess/ios/WebVideoFullscreenManagerProxy.h: Add declaration for setSeekableRangesVector() * UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in: Add interface SetSeekableRangesVector() * UIProcess/ios/WebVideoFullscreenManagerProxy.mm: (WebKit::WebVideoFullscreenManagerProxy::setSeekableRangesVector): Add setSeekableRangesVector that translates the vector into a TimeRanges and calls setSeekableRanges() * WebProcess/ios/WebVideoFullscreenManager.h: Add setSeekableRanges() * WebProcess/ios/WebVideoFullscreenManager.mm: (WebKit::WebVideoFullscreenManager::setSeekableRanges): setSeekableRanges() converts TimeRanges to Vector and calls SetSeekableRangesVector() Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterface.h trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm trunk/Source/WebCore/platform/ios/WebVideoFullscreenModelMediaElement.mm trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.h trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.messages.in trunk/Source/WebKit2/UIProcess/ios/WebVideoFullscreenManagerProxy.mm trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.h trunk/Source/WebKit2/WebProcess/ios/WebVideoFullscreenManager.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166311 => 166312) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:52:07 UTC (rev 166311) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 20:17:39 UTC (rev 166312) @@ -1,3 +1,48 @@ +2014-03-26 Jeremy Jones + +Implement hasLiveStreamingContent property in WebAVPlayerController +https://bugs.webkit.org/show_bug.cgi?id=128684 + +Reviewed by Simon Fraser. + +* WebCore.exp.in: +Add export for WebVideoFullscreenInterfaceAVKit::setSeekableRanges(). + +* platform/ios/WebVideoFullscreenInterface.h: +Add setSeekableRanges() + +* platform/ios/WebVideoFullscreenInterfaceAVKit.h: +Add setSeekableRanges() + +* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: +Remove vestigial playerLayer property. Add seekableTimeRanges property. + +(-[WebAVPlayerController dealloc]): +Release _seekableTimeRanges. +Remove references to _playerLayer. + +(-[WebAVPlayerController hasLiveStreamingContent]): +Implement based on duration. Live stream has an infinite duration. + +(+[WebAVPlayerController keyPathsForValuesAffectingHasLiveStreamingContent]): +Describe dependent keys for computed property hasLiveStreamingContent. + +(-[WebAVPlayerController skipBackwardThirtySeconds:]): +Seek back 30 seconds if that time is in the seekable ranges. + +(-[WebAVPlayerController gotoEndOfSeekableRanges:]): +Jump to live by going to the of the seekable ranges. + +(WebVideoFullscreenInterfaceAVKit::setSeekableRanges): +Convert TimeRange to CMTimeRange. + +* platform/ios/WebVideoFullscreenModelMediaElement.mm: +(WebVideoFullscreenModelMediaElement::setMediaElement): +Set initial seekable ranges. + +(WebVideoFullscreen
[webkit-changes] [166311] trunk/Source/WebCore
Title: [166311] trunk/Source/WebCore Revision 166311 Author bfulg...@apple.com Date 2014-03-26 12:52:07 -0700 (Wed, 26 Mar 2014) Log Message Fix OS X build. * WebCore.exp.in: Add missing export symbol. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in Diff Modified: trunk/Source/WebCore/ChangeLog (166310 => 166311) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:42:03 UTC (rev 166310) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:52:07 UTC (rev 166311) @@ -1,3 +1,9 @@ +2014-03-26 Brent Fulgham + +Fix OS X build. + +* WebCore.exp.in: Add missing export symbol. + 2014-03-26 Simon Fraser Fix the Windows build. Add a no-op impl for Mac non-UI-side. Modified: trunk/Source/WebCore/WebCore.exp.in (166310 => 166311) --- trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:42:03 UTC (rev 166310) +++ trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:52:07 UTC (rev 166311) @@ -251,6 +251,7 @@ __ZN7WebCore12gcControllerEv __ZN7WebCore12iconDatabaseEv __ZN7WebCore13AXObjectCache10rootObjectEv +__ZN7WebCore13AXObjectCache37setEnhancedUserInterfaceAccessibilityEb __ZN7WebCore13AXObjectCache18rootObjectForFrameEPNS_5FrameE __ZN7WebCore13AXObjectCache19enableAccessibilityEv __ZN7WebCore13AXObjectCache20disableAccessibilityEv ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166310] trunk/Source/WebCore
Title: [166310] trunk/Source/WebCore Revision 166310 Author simon.fra...@apple.com Date 2014-03-26 12:42:03 -0700 (Wed, 26 Mar 2014) Log Message Fix the Windows build. Add a no-op impl for Mac non-UI-side. * platform/graphics/ca/mac/PlatformCALayerMac.h: * platform/graphics/ca/win/PlatformCALayerWin.cpp: (PlatformCALayerWin::PlatformCALayerWin): * platform/graphics/ca/win/PlatformCALayerWin.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h Diff Modified: trunk/Source/WebCore/ChangeLog (166309 => 166310) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:42:03 UTC (rev 166310) @@ -1,5 +1,14 @@ 2014-03-26 Simon Fraser +Fix the Windows build. Add a no-op impl for Mac non-UI-side. + +* platform/graphics/ca/mac/PlatformCALayerMac.h: +* platform/graphics/ca/win/PlatformCALayerWin.cpp: +(PlatformCALayerWin::PlatformCALayerWin): +* platform/graphics/ca/win/PlatformCALayerWin.h: + +2014-03-26 Simon Fraser + REGRESSION (r155977): matrix animations no longer animate https://bugs.webkit.org/show_bug.cgi?id=130789 Modified: trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h (166309 => 166310) --- trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:36:51 UTC (rev 166309) +++ trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h 2014-03-26 19:42:03 UTC (rev 166310) @@ -137,7 +137,7 @@ virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance) override; virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; } -virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior) override { } +virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; } virtual TiledBacking* tiledBacking() override; Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (166309 => 166310) --- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-03-26 19:36:51 UTC (rev 166309) +++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp 2014-03-26 19:42:03 UTC (rev 166310) @@ -108,6 +108,7 @@ PlatformCALayerWin::PlatformCALayerWin(LayerType layerType, PlatformLayer* layer, PlatformCALayerClient* owner) : PlatformCALayer(layer ? LayerTypeCustom : layerType, owner) , m_customAppearance(GraphicsLayer::NoCustomAppearance) +, m_customBehavior(GraphicsLayer::NoCustomBehavior) { if (layer) { m_layer = layer; Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h (166309 => 166310) --- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-03-26 19:36:51 UTC (rev 166309) +++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.h 2014-03-26 19:42:03 UTC (rev 166310) @@ -129,6 +129,9 @@ virtual GraphicsLayer::CustomAppearance customAppearance() const override { return m_customAppearance; } virtual void updateCustomAppearance(GraphicsLayer::CustomAppearance customAppearance) override { m_customAppearance = customAppearance; } +virtual GraphicsLayer::CustomBehavior customBehavior() const override { return m_customBehavior; } +virtual void updateCustomBehavior(GraphicsLayer::CustomBehavior customBehavior) override { m_customBehavior = customBehavior; } + virtual TiledBacking* tiledBacking() override { return nullptr; } virtual PlatformCALayer* rootLayer() const override; @@ -148,6 +151,7 @@ HashMap> m_animations; GraphicsLayer::CustomAppearance m_customAppearance; +GraphicsLayer::CustomBehavior m_customBehavior; }; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166308] trunk/Source
Title: [166308] trunk/Source Revision 166308 Author simon.fra...@apple.com Date 2014-03-26 12:36:49 -0700 (Wed, 26 Mar 2014) Log Message Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers https://bugs.webkit.org/show_bug.cgi?id=130778 Reviewed by Tim Horton. Make it possible to put a "custom behavior" flag on a layer so that, with UI-side compositing, we know to create a specific type of layer or view for that GraphicsLayer. Source/WebCore: * WebCore.exp.in: * platform/graphics/GraphicsLayer.cpp: (WebCore::GraphicsLayer::GraphicsLayer): * platform/graphics/GraphicsLayer.h: (WebCore::GraphicsLayer::setCustomBehavior): (WebCore::GraphicsLayer::customBehavior): * platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): (WebCore::GraphicsLayerCA::updateCustomBehavior): (WebCore::GraphicsLayerCA::setCustomBehavior): * platform/graphics/ca/GraphicsLayerCA.h: * platform/graphics/ca/PlatformCALayer.h: * platform/graphics/ca/mac/PlatformCALayerMac.h: * platform/graphics/ca/mac/PlatformCALayerMac.mm: (PlatformCALayerMac::PlatformCALayerMac): * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::updateScrollingLayers): Source/WebKit2: * Shared/mac/RemoteLayerTreeTransaction.h: * Shared/mac/RemoteLayerTreeTransaction.mm: (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties): (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode): (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode): (WebKit::dumpChangedLayers): * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp: (PlatformCALayerRemote::customBehavior): (PlatformCALayerRemote::updateCustomBehavior): * WebProcess/WebPage/mac/PlatformCALayerRemote.h: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp trunk/Source/WebCore/platform/graphics/GraphicsLayer.h trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.h trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm trunk/Source/WebCore/rendering/RenderLayerBacking.cpp trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h Diff Modified: trunk/Source/WebCore/ChangeLog (166307 => 166308) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308) @@ -1,3 +1,32 @@ +2014-03-26 Simon Fraser + +Add a custom behavior flag to GraphicsLayer, piped down to PlatformCALayer, for scrolling layers +https://bugs.webkit.org/show_bug.cgi?id=130778 + +Reviewed by Tim Horton. + +Make it possible to put a "custom behavior" flag on a layer so that, +with UI-side compositing, we know to create a specific type of +layer or view for that GraphicsLayer. + +* WebCore.exp.in: +* platform/graphics/GraphicsLayer.cpp: +(WebCore::GraphicsLayer::GraphicsLayer): +* platform/graphics/GraphicsLayer.h: +(WebCore::GraphicsLayer::setCustomBehavior): +(WebCore::GraphicsLayer::customBehavior): +* platform/graphics/ca/GraphicsLayerCA.cpp: +(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): +(WebCore::GraphicsLayerCA::updateCustomBehavior): +(WebCore::GraphicsLayerCA::setCustomBehavior): +* platform/graphics/ca/GraphicsLayerCA.h: +* platform/graphics/ca/PlatformCALayer.h: +* platform/graphics/ca/mac/PlatformCALayerMac.h: +* platform/graphics/ca/mac/PlatformCALayerMac.mm: +(PlatformCALayerMac::PlatformCALayerMac): +* rendering/RenderLayerBacking.cpp: +(WebCore::RenderLayerBacking::updateScrollingLayers): + 2014-03-26 Brent Fulgham Unreviewed test correction. Modified: trunk/Source/WebCore/WebCore.exp.in (166307 => 166308) --- trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:21:49 UTC (rev 166307) +++ trunk/Source/WebCore/WebCore.exp.in 2014-03-26 19:36:49 UTC (rev 166308) @@ -545,6 +545,7 @@ __ZN7WebCore15GraphicsLayerCA16resumeAnimationsEv __ZN7WebCore15GraphicsLayerCA16setMasksToBoundsEb __ZN7WebCore15GraphicsLayerCA17setContentsOpaqueEb +__ZN7WebCore15GraphicsLayerCA17setCustomBehaviorENS_13GraphicsLayer14CustomBehaviorE __ZN7WebCore15GraphicsLayerCA17suspendAnimationsEd __ZN7WebCore15GraphicsLayerCA18setAllowTiledLayerEb __ZN7WebCore15GraphicsLayerCA18setBackgroundColorERKNS_5ColorE Modified: trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp (166307 => 166308) --- trun
[webkit-changes] [166309] trunk
Title: [166309] trunk Revision 166309 Author simon.fra...@apple.com Date 2014-03-26 12:36:51 -0700 (Wed, 26 Mar 2014) Log Message REGRESSION (r155977): matrix animations no longer animate https://bugs.webkit.org/show_bug.cgi?id=130789 Source/WebCore: Reviewed by Dean Jackson. r155977 erroneously removed two lines that set the end points for matrix animations (used when transform lists don't match), so put them back. Also don't repaint when updateContentsScale() is called and doesn't change the contents scale. Test: compositing/animation/matrix-animation.html * platform/graphics/ca/GraphicsLayerCA.cpp: (WebCore::GraphicsLayerCA::updateRootRelativeScale): (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints): (WebCore::GraphicsLayerCA::updateContentsScale): LayoutTests: Reviewed by Dean Jackson. Add test for fill-fowards animation with mismatched transform lists. * compositing/animation/matrix-animation-expected.html: Added. * compositing/animation/matrix-animation.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp Added Paths trunk/LayoutTests/compositing/animation/matrix-animation-expected.html trunk/LayoutTests/compositing/animation/matrix-animation.html Diff Modified: trunk/LayoutTests/ChangeLog (166308 => 166309) --- trunk/LayoutTests/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308) +++ trunk/LayoutTests/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309) @@ -1,3 +1,16 @@ +2014-03-26 Simon Fraser + +REGRESSION (r155977): matrix animations no longer animate +https://bugs.webkit.org/show_bug.cgi?id=130789 + + +Reviewed by Dean Jackson. + +Add test for fill-fowards animation with mismatched transform lists. + +* compositing/animation/matrix-animation-expected.html: Added. +* compositing/animation/matrix-animation.html: Added. + 2014-03-26 Antti Koivisto Render tree construction is O(N^2) in number of siblings Added: trunk/LayoutTests/compositing/animation/matrix-animation-expected.html (0 => 166309) --- trunk/LayoutTests/compositing/animation/matrix-animation-expected.html (rev 0) +++ trunk/LayoutTests/compositing/animation/matrix-animation-expected.html 2014-03-26 19:36:51 UTC (rev 166309) @@ -0,0 +1,17 @@ + + + + + +.box { +height: 100px; +width: 100px; +background-color: blue; +-webkit-transform: scale(1, 1) translate3d(10px, 10px, 0); +} + + + + + + Property changes on: trunk/LayoutTests/compositing/animation/matrix-animation-expected.html ___ Added: svn:mime-type Added: svn:keywords Added: svn:eol-style Added: trunk/LayoutTests/compositing/animation/matrix-animation.html (0 => 166309) --- trunk/LayoutTests/compositing/animation/matrix-animation.html (rev 0) +++ trunk/LayoutTests/compositing/animation/matrix-animation.html 2014-03-26 19:36:51 UTC (rev 166309) @@ -0,0 +1,43 @@ + + + + + +#box { +height: 100px; +width: 100px; +background-color: blue; +-webkit-transform: scale(0.1, 0.1); +} + +.animating { +-webkit-animation: zoom 1 0.05s forwards; +} + +@-webkit-keyframes zoom { +from { } +to { -webkit-transform: scale(1, 1) translate(10px, 10px); } +} + + +if (window.testRunner) +testRunner.waitUntilDone(); + +function doTest() +{ +var box = document.getElementById('box'); +box.addEventListener('webkitAnimationEnd', function() { +if (window.testRunner) +testRunner.notifyDone(); +}, false); +box.classList.add('animating'); +} + +window.addEventListener('load', doTest, false); + + + + + + + Property changes on: trunk/LayoutTests/compositing/animation/matrix-animation.html ___ Added: svn:mime-type Added: svn:keywords Added: svn:eol-style Modified: trunk/Source/WebCore/ChangeLog (166308 => 166309) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:49 UTC (rev 166308) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:36:51 UTC (rev 166309) @@ -1,5 +1,27 @@ 2014-03-26 Simon Fraser +REGRESSION (r155977): matrix animations no longer animate +https://bugs.webkit.org/show_bug.cgi?id=130789 + + +Reviewed by Dean Jackson. + +r155977 erroneously removed two lines that set the end points for +matrix animations (used when transform lists don't match), so +put them back. + +Also don't repaint when updateContentsScale() +is called and doesn't change
[webkit-changes] [166307] trunk/Source
Title: [166307] trunk/Source Revision 166307 Author bfulg...@apple.com Date 2014-03-26 12:21:49 -0700 (Wed, 26 Mar 2014) Log Message Source/_javascript_Core: Unreviewed build fix. * runtime/JSCell.h: VS2013 confused about argument type. Source/WebCore: Unreviewed test correction. Because of the way DRT on Windows links to WebCore, having the implementaion of the update method in the header caused a runtime failure due to duplicate symbols being bound to the compilation unit. * accessibility/AXObjectCache.cpp: (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Moved from header. * accessibility/AXObjectCache.h: (WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Deleted. Source/WebKit: Unreviewed build/test correction. * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export the AXObjectCache::setEnhancedUserInterfaceEnabled set function. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/JSCell.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/AXObjectCache.cpp trunk/Source/WebCore/accessibility/AXObjectCache.h trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166306 => 166307) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307) @@ -1,3 +1,9 @@ +2014-03-26 Brent Fulgham + +Unreviewed build fix. + +* runtime/JSCell.h: VS2013 confused about argument type. + 2014-03-26 Zoltan Horvath [CSS Shapes] Remove shape-inside support Modified: trunk/Source/_javascript_Core/runtime/JSCell.h (166306 => 166307) --- trunk/Source/_javascript_Core/runtime/JSCell.h 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/_javascript_Core/runtime/JSCell.h 2014-03-26 19:21:49 UTC (rev 166307) @@ -92,7 +92,7 @@ bool isGetterSetter() const; bool isProxy() const; bool inherits(const ClassInfo*) const; -bool isAPIValueWrapper() const; +JS_EXPORT_PRIVATE bool isAPIValueWrapper() const; JSType type() const; IndexingType indexingType() const; Modified: trunk/Source/WebCore/ChangeLog (166306 => 166307) --- trunk/Source/WebCore/ChangeLog 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307) @@ -1,3 +1,16 @@ +2014-03-26 Brent Fulgham + +Unreviewed test correction. + +Because of the way DRT on Windows links to WebCore, having the implementaion of the update +method in the header caused a runtime failure due to duplicate symbols being bound to the +compilation unit. + +* accessibility/AXObjectCache.cpp: +(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Moved from header. +* accessibility/AXObjectCache.h: +(WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility): Deleted. + 2014-03-26 Jer Noble REGRESSION(r162679): Poster image visible under the video Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (166306 => 166307) --- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-03-26 19:21:49 UTC (rev 166307) @@ -118,6 +118,11 @@ gAccessibilityEnabled = false; } +void AXObjectCache::setEnhancedUserInterfaceAccessibility(bool flag) +{ +gAccessibilityEnhancedUserInterfaceEnabled = flag; +} + AXObjectCache::AXObjectCache(Document& document) : m_document(document) , m_notificationPostTimer(this, &AXObjectCache::notificationPostTimerFired) Modified: trunk/Source/WebCore/accessibility/AXObjectCache.h (166306 => 166307) --- trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/WebCore/accessibility/AXObjectCache.h 2014-03-26 19:21:49 UTC (rev 166307) @@ -131,7 +131,7 @@ static void disableAccessibility(); // Enhanced user interface accessibility can be toggled by the assistive technology. -static void setEnhancedUserInterfaceAccessibility(bool flag) { gAccessibilityEnhancedUserInterfaceEnabled = flag; } +static void setEnhancedUserInterfaceAccessibility(bool flag); static bool accessibilityEnabled() { return gAccessibilityEnabled; } static bool accessibilityEnhancedUserInterfaceEnabled() { return gAccessibilityEnhancedUserInterfaceEnabled; } Modified: trunk/Source/WebKit/ChangeLog (166306 => 166307) --- trunk/Source/WebKit/ChangeLog 2014-03-26 19:20:58 UTC (rev 166306) +++ trunk/Source/WebKit/ChangeLog 2014-03-26 19:21:49 UTC (rev 166307) @@ -1,3 +1,10 @@ +2014-03-26 Brent Fulgham + +Unreviewed build/test correction. + +* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Export the AXObjectCache::setEnhancedUserInterfaceEnabled +
[webkit-changes] [166306] branches/safari-537.75-branch/Source/WebCore
Title: [166306] branches/safari-537.75-branch/Source/WebCore Revision 166306 Author matthew_han...@apple.com Date 2014-03-26 12:20:58 -0700 (Wed, 26 Mar 2014) Log Message Remove extraneous ! from merge of r166304. Modified Paths branches/safari-537.75-branch/Source/WebCore/ChangeLog branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp Diff Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (166305 => 166306) --- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:17:16 UTC (rev 166305) +++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:20:58 UTC (rev 166306) @@ -1,5 +1,9 @@ 2014-03-26 Matthew Hanson +Remove extraneous ! from merge of r166304. + +2014-03-26 Matthew Hanson + Merge r166304. 2014-03-26 Jer Noble Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (166305 => 166306) --- branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:17:16 UTC (rev 166305) +++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:20:58 UTC (rev 166306) @@ -1675,7 +1675,7 @@ { RenderObject* renderObject = renderer(); -if (!renderObject->isRenderImage() || !renderObject->isMedia() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip()) +if (!renderObject->isRenderImage() || renderObject->isMedia() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip()) return false; RenderImage* imageRenderer = toRenderImage(renderObject); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166305] branches/safari-537.75-branch/Source/WebCore
Title: [166305] branches/safari-537.75-branch/Source/WebCore Revision 166305 Author matthew_han...@apple.com Date 2014-03-26 12:17:16 -0700 (Wed, 26 Mar 2014) Log Message Merge r166304. Modified Paths branches/safari-537.75-branch/Source/WebCore/ChangeLog branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp Diff Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (166304 => 166305) --- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 18:37:44 UTC (rev 166304) +++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-03-26 19:17:16 UTC (rev 166305) @@ -1,3 +1,22 @@ +2014-03-26 Matthew Hanson + +Merge r166304. + +2014-03-26 Jer Noble + +REGRESSION(r162679): Poster image visible under the video +https://bugs.webkit.org/show_bug.cgi?id=130783 + +Reviewed by Simon Fraser. + +In the listed revision, we started checking for isRenderImage() +instead of isImage(). RenderMedias return 'true' for the first +but 'false' for the second. Change the if() statement to check +for isRenderMedia() in addition to !isRenderImage(). + +* rendering/RenderLayerBacking.cpp: +(WebCore::RenderLayerBacking::isDirectlyCompositedImage): + 2014-03-24 Matthew Hanson Remove a commented line of code introduced by r166104. Modified: branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (166304 => 166305) --- branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 18:37:44 UTC (rev 166304) +++ branches/safari-537.75-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 19:17:16 UTC (rev 166305) @@ -1675,7 +1675,7 @@ { RenderObject* renderObject = renderer(); -if (!renderObject->isRenderImage() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip()) +if (!renderObject->isRenderImage() || !renderObject->isMedia() || m_owningLayer->hasBoxDecorationsOrBackground() || renderObject->hasClip()) return false; RenderImage* imageRenderer = toRenderImage(renderObject); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166304] trunk/Source/WebCore
Title: [166304] trunk/Source/WebCore Revision 166304 Author jer.no...@apple.com Date 2014-03-26 11:37:44 -0700 (Wed, 26 Mar 2014) Log Message REGRESSION(r162679): Poster image visible under the video https://bugs.webkit.org/show_bug.cgi?id=130783 Reviewed by Simon Fraser. In the listed revision, we started checking for isRenderImage() instead of isImage(). RenderMedias return 'true' for the first but 'false' for the second. Change the if() statement to check for isRenderMedia() in addition to !isRenderImage(). * rendering/RenderLayerBacking.cpp: (WebCore::RenderLayerBacking::isDirectlyCompositedImage): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderLayerBacking.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (166303 => 166304) --- trunk/Source/WebCore/ChangeLog 2014-03-26 18:35:55 UTC (rev 166303) +++ trunk/Source/WebCore/ChangeLog 2014-03-26 18:37:44 UTC (rev 166304) @@ -1,3 +1,18 @@ +2014-03-26 Jer Noble + +REGRESSION(r162679): Poster image visible under the video +https://bugs.webkit.org/show_bug.cgi?id=130783 + +Reviewed by Simon Fraser. + +In the listed revision, we started checking for isRenderImage() +instead of isImage(). RenderMedias return 'true' for the first +but 'false' for the second. Change the if() statement to check +for isRenderMedia() in addition to !isRenderImage(). + +* rendering/RenderLayerBacking.cpp: +(WebCore::RenderLayerBacking::isDirectlyCompositedImage): + 2014-03-26 Antti Koivisto Render tree construction is O(N^2) in number of siblings Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (166303 => 166304) --- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 18:35:55 UTC (rev 166303) +++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-03-26 18:37:44 UTC (rev 166304) @@ -1838,7 +1838,7 @@ // that require painting. Direct compositing saves backing store. bool RenderLayerBacking::isDirectlyCompositedImage() const { -if (!renderer().isRenderImage() || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip()) +if (!renderer().isRenderImage() || renderer().isMedia() || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip()) return false; RenderImage& imageRenderer = toRenderImage(renderer()); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166303] trunk
Title: [166303] trunk Revision 166303 Author an...@apple.com Date 2014-03-26 11:35:55 -0700 (Wed, 26 Mar 2014) Log Message Render tree construction is O(N^2) in number of siblings https://bugs.webkit.org/show_bug.cgi?id=129065 Source/WebCore: Reviewed by Darin Adler. When adding a new renderer to the tree we would search for the correct render tree position by traversing DOM children forward to find something that already has a renderer. In common case there is no such renderer. This would be repeated for each inserted renderer leading to O(n^2) in respect to child node count. This patch caches the computed render tree insertion position and passes it to siblings. Until the cached position is reached it can be used for all new renderers. Test: perf/sibling-renderer-On2.html * style/StyleResolveTree.cpp: (WebCore::Style::RenderTreePosition::parent): (WebCore::Style::RenderTreePosition::RenderTreePosition): (WebCore::Style::RenderTreePosition::canInsert): (WebCore::Style::RenderTreePosition::insert): (WebCore::Style::RenderTreePosition::computeNextSibling): (WebCore::Style::RenderTreePosition::invalidateNextSibling): (WebCore::Style::styleForElement): (WebCore::Style::elementInsideRegionNeedsRenderer): (WebCore::Style::createRendererIfNeeded): (WebCore::Style::createTextRendererIfNeeded): (WebCore::Style::attachTextRenderer): (WebCore::Style::updateTextRendererAfterContentChange): (WebCore::Style::attachChildren): (WebCore::Style::attachDistributedChildren): (WebCore::Style::attachShadowRoot): (WebCore::Style::attachBeforeOrAfterPseudoElementIfNeeded): (WebCore::Style::attachRenderTree): (WebCore::Style::resolveLocal): (WebCore::Style::resolveTextNode): (WebCore::Style::resolveShadowTree): (WebCore::Style::updateBeforeOrAfterPseudoElement): (WebCore::Style::resolveTree): LayoutTests: Reviewed by Darin Adler. * perf/sibling-renderer-On2-expected.txt: Added. * perf/sibling-renderer-On2.html: Added. The test doesn't use magnitude-perf.js as this requires a relatively long-running test function and it seemed unsuitable for that. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/style/StyleResolveTree.cpp Added Paths trunk/LayoutTests/perf/sibling-renderer-On2-expected.txt trunk/LayoutTests/perf/sibling-renderer-On2.html Diff Modified: trunk/LayoutTests/ChangeLog (166302 => 166303) --- trunk/LayoutTests/ChangeLog 2014-03-26 18:31:58 UTC (rev 166302) +++ trunk/LayoutTests/ChangeLog 2014-03-26 18:35:55 UTC (rev 166303) @@ -1,3 +1,16 @@ +2014-03-26 Antti Koivisto + +Render tree construction is O(N^2) in number of siblings +https://bugs.webkit.org/show_bug.cgi?id=129065 + +Reviewed by Darin Adler. + +* perf/sibling-renderer-On2-expected.txt: Added. +* perf/sibling-renderer-On2.html: Added. + +The test doesn't use magnitude-perf.js as this requires a relatively long-running test function and +it seemed unsuitable for that. + 2014-03-26 Zoltan Horvath [CSS Shapes] Remove shape-inside support Added: trunk/LayoutTests/perf/sibling-renderer-On2-expected.txt (0 => 166303) --- trunk/LayoutTests/perf/sibling-renderer-On2-expected.txt (rev 0) +++ trunk/LayoutTests/perf/sibling-renderer-On2-expected.txt 2014-03-26 18:35:55 UTC (rev 166303) @@ -0,0 +1,5 @@ +PASS timeRenderTreeCreation(5000) < 20 * timeRenderTreeCreation(500) is true +PASS successfullyParsed is true + +TEST COMPLETE + Added: trunk/LayoutTests/perf/sibling-renderer-On2.html (0 => 166303) --- trunk/LayoutTests/perf/sibling-renderer-On2.html (rev 0) +++ trunk/LayoutTests/perf/sibling-renderer-On2.html 2014-03-26 18:35:55 UTC (rev 166303) @@ -0,0 +1,13 @@ + +