[webkit-changes] [160295] trunk/Source/JavaScriptCore
Title: [160295] trunk/Source/_javascript_Core Revision 160295 Author fpi...@apple.com Date 2013-12-08 17:08:53 -0800 (Sun, 08 Dec 2013) Log Message Add the notion of ConstantStoragePointer to DFG IR https://bugs.webkit.org/show_bug.cgi?id=125395 Reviewed by Oliver Hunt. This pushes more typed array folding into StrengthReductionPhase, and enables CSE on storage pointers. Previously, you might have separate nodes for the same storage pointer and this would cause some bad register pressure in the DFG. Note that this was really a theoretical problem and not, to my knowledge a practical one - so this patch is basically just a clean-up. * dfg/DFGAbstractInterpreterInlines.h: (JSC::DFGexecuteEffects): * dfg/DFGCSEPhase.cpp: (JSC::DFG::CSEPhase::constantStoragePointerCSE): (JSC::DFG::CSEPhase::performNodeCSE): * dfg/DFGClobberize.h: (JSC::DFG::clobberize): * dfg/DFGFixupPhase.cpp: (JSC::DFG::FixupPhase::fixupNode): * dfg/DFGGraph.cpp: (JSC::DFG::Graph::dump): * dfg/DFGNode.h: (JSC::DFG::Node::convertToConstantStoragePointer): (JSC::DFG::Node::hasStoragePointer): (JSC::DFG::Node::storagePointer): * dfg/DFGNodeType.h: * dfg/DFGPredictionPropagationPhase.cpp: (JSC::DFG::PredictionPropagationPhase::propagate): * dfg/DFGSafeToExecute.h: (JSC::DFG::safeToExecute): * dfg/DFGSpeculativeJIT.cpp: (JSC::DFG::SpeculativeJIT::compileConstantStoragePointer): (JSC::DFG::SpeculativeJIT::compileGetIndexedPropertyStorage): * dfg/DFGSpeculativeJIT.h: * dfg/DFGSpeculativeJIT32_64.cpp: (JSC::DFG::SpeculativeJIT::compile): * dfg/DFGSpeculativeJIT64.cpp: (JSC::DFG::SpeculativeJIT::compile): * dfg/DFGStrengthReductionPhase.cpp: (JSC::DFG::StrengthReductionPhase::handleNode): (JSC::DFG::StrengthReductionPhase::foldTypedArrayPropertyToConstant): (JSC::DFG::StrengthReductionPhase::prepareToFoldTypedArray): * dfg/DFGWatchpointCollectionPhase.cpp: (JSC::DFG::WatchpointCollectionPhase::handle): * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::LowerDFGToLLVM::compileNode): (JSC::FTL::LowerDFGToLLVM::compileConstantStoragePointer): (JSC::FTL::LowerDFGToLLVM::compileGetIndexedPropertyStorage): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h trunk/Source/_javascript_Core/dfg/DFGCSEPhase.cpp trunk/Source/_javascript_Core/dfg/DFGClobberize.h trunk/Source/_javascript_Core/dfg/DFGFixupPhase.cpp trunk/Source/_javascript_Core/dfg/DFGGraph.cpp trunk/Source/_javascript_Core/dfg/DFGNode.h trunk/Source/_javascript_Core/dfg/DFGNodeType.h trunk/Source/_javascript_Core/dfg/DFGPredictionPropagationPhase.cpp trunk/Source/_javascript_Core/dfg/DFGSafeToExecute.h trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp trunk/Source/_javascript_Core/dfg/DFGStrengthReductionPhase.cpp trunk/Source/_javascript_Core/dfg/DFGWatchpointCollectionPhase.cpp trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (160294 => 160295) --- trunk/Source/_javascript_Core/ChangeLog 2013-12-09 01:06:54 UTC (rev 160294) +++ trunk/Source/_javascript_Core/ChangeLog 2013-12-09 01:08:53 UTC (rev 160295) @@ -1,5 +1,57 @@ 2013-12-08 Filip Pizlo +Add the notion of ConstantStoragePointer to DFG IR +https://bugs.webkit.org/show_bug.cgi?id=125395 + +Reviewed by Oliver Hunt. + +This pushes more typed array folding into StrengthReductionPhase, and enables CSE on +storage pointers. Previously, you might have separate nodes for the same storage +pointer and this would cause some bad register pressure in the DFG. Note that this +was really a theoretical problem and not, to my knowledge a practical one - so this +patch is basically just a clean-up. + +* dfg/DFGAbstractInterpreterInlines.h: +(JSC::DFGexecuteEffects): +* dfg/DFGCSEPhase.cpp: +(JSC::DFG::CSEPhase::constantStoragePointerCSE): +(JSC::DFG::CSEPhase::performNodeCSE): +* dfg/DFGClobberize.h: +(JSC::DFG::clobberize): +* dfg/DFGFixupPhase.cpp: +(JSC::DFG::FixupPhase::fixupNode): +* dfg/DFGGraph.cpp: +(JSC::DFG::Graph::dump): +* dfg/DFGNode.h: +(JSC::DFG::Node::convertToConstantStoragePointer): +(JSC::DFG::Node::hasStoragePointer): +(JSC::DFG::Node::storagePointer): +* dfg/DFGNodeType.h: +* dfg/DFGPredictionPropagationPhase.cpp: +(JSC::DFG::PredictionPropagationPhase::propagate): +* dfg/DFGSafeToExecute.h: +(JSC::DFG::safeToExecute): +* dfg/DFGSpeculativeJIT.cpp: +(JSC::DFG::SpeculativeJIT::compileConstantStoragePointer): +(JSC::DFG::SpeculativeJIT::compileGetIndexedPropertyStorage): +* dfg/DFGSpeculativeJIT.h: +* dfg/DFGSpeculativeJIT32_64.cpp: +
[webkit-changes] [160279] trunk/Source/WebCore
Title: [160279] trunk/Source/WebCore Revision 160279 Author zol...@webkit.org Date 2013-12-07 21:53:33 -0800 (Sat, 07 Dec 2013) Log Message Remove statusWithDirection static function from RenderBlockLineLayout https://bugs.webkit.org/show_bug.cgi?id=125372 Reviewed by Andreas Kling. I run into a FIXME about using BidiStatus constructor rather than statusWithDirection, once it's implemented. BidiStatus has got the appropriate constructor now, so I removed statusWithDirection and updated the code to use the constructor of BidiStatus. No new tests, no behavior change. * rendering/RenderBlockLineLayout.cpp: (WebCore::constructBidiRunsForSegment): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (160278 => 160279) --- trunk/Source/WebCore/ChangeLog 2013-12-08 05:23:29 UTC (rev 160278) +++ trunk/Source/WebCore/ChangeLog 2013-12-08 05:53:33 UTC (rev 160279) @@ -1,3 +1,19 @@ +2013-12-07 Zoltan Horvath + +Remove statusWithDirection static function from RenderBlockLineLayout +https://bugs.webkit.org/show_bug.cgi?id=125372 + +Reviewed by Andreas Kling. + +I run into a FIXME about using BidiStatus constructor rather than statusWithDirection, +once it's implemented. BidiStatus has got the appropriate constructor now, so I removed +statusWithDirection and updated the code to use the constructor of BidiStatus. + +No new tests, no behavior change. + +* rendering/RenderBlockLineLayout.cpp: +(WebCore::constructBidiRunsForSegment): + 2013-12-07 ChangSeok Oh Unreviewed. Build fix for gtk port after r160260. Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (160278 => 160279) --- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-08 05:23:29 UTC (rev 160278) +++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2013-12-08 05:53:33 UTC (rev 160279) @@ -865,16 +865,6 @@ lastRootBox()->appendFloat(floatingObject->renderer()); } -// FIXME: This should be a BidiStatus constructor or create method. -static inline BidiStatus statusWithDirection(TextDirection textDirection, bool isOverride) -{ -UCharDirection direction = textDirection == LTR ? U_LEFT_TO_RIGHT : U_RIGHT_TO_LEFT; -RefPtr context = BidiContext::create(textDirection == LTR ? 0 : 1, direction, isOverride, FromStyleOrDOM); - -// This copies BidiStatus and may churn the ref on BidiContext. I doubt it matters. -return BidiStatus(direction, direction, direction, context.release()); -} - // FIXME: BidiResolver should have this logic. static inline void constructBidiRunsForSegment(InlineBidiResolver& topResolver, BidiRunList& bidiRuns, const InlineIterator& endOfRuns, VisualDirectionOverride override, bool previousLineBrokeCleanly) { @@ -907,7 +897,7 @@ ASSERT(unicodeBidi == Isolate || unicodeBidi == IsolateOverride); direction = isolatedInline->style().direction(); } -isolatedResolver.setStatus(statusWithDirection(direction, isOverride(unicodeBidi))); +isolatedResolver.setStatus(BidiStatus(direction, isOverride(unicodeBidi))); // FIXME: The fact that we have to construct an Iterator here // currently prevents this code from moving into BidiResolver. ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160294] trunk/Source/JavaScriptCore
Title: [160294] trunk/Source/_javascript_Core Revision 160294 Author fpi...@apple.com Date 2013-12-08 17:06:54 -0800 (Sun, 08 Dec 2013) Log Message FTL should support UntypedUse versions of Compare nodes https://bugs.webkit.org/show_bug.cgi?id=125426 Reviewed by Oliver Hunt. This adds UntypedUse versions of all comparisons except CompareStrictEq, which is sufficiently different that I thought I'd do it in another patch. This also extends our ability to abstract over comparison kind and removes a bunch of copy-paste code. * dfg/DFGSpeculativeJIT64.cpp: (JSC::DFG::SpeculativeJIT::nonSpeculativeNonPeepholeCompare): * ftl/FTLCapabilities.cpp: (JSC::FTL::canCompile): * ftl/FTLIntrinsicRepository.h: * ftl/FTLLowerDFGToLLVM.cpp: (JSC::FTL::LowerDFGToLLVM::compileCompareEq): (JSC::FTL::LowerDFGToLLVM::compileCompareLess): (JSC::FTL::LowerDFGToLLVM::compileCompareLessEq): (JSC::FTL::LowerDFGToLLVM::compileCompareGreater): (JSC::FTL::LowerDFGToLLVM::compileCompareGreaterEq): (JSC::FTL::LowerDFGToLLVM::compare): (JSC::FTL::LowerDFGToLLVM::nonSpeculativeCompare): * ftl/FTLOutput.h: (JSC::FTL::Output::icmp): (JSC::FTL::Output::equal): (JSC::FTL::Output::notEqual): (JSC::FTL::Output::above): (JSC::FTL::Output::aboveOrEqual): (JSC::FTL::Output::below): (JSC::FTL::Output::belowOrEqual): (JSC::FTL::Output::greaterThan): (JSC::FTL::Output::greaterThanOrEqual): (JSC::FTL::Output::lessThan): (JSC::FTL::Output::lessThanOrEqual): (JSC::FTL::Output::fcmp): (JSC::FTL::Output::doubleEqual): (JSC::FTL::Output::doubleNotEqualOrUnordered): (JSC::FTL::Output::doubleLessThan): (JSC::FTL::Output::doubleLessThanOrEqual): (JSC::FTL::Output::doubleGreaterThan): (JSC::FTL::Output::doubleGreaterThanOrEqual): (JSC::FTL::Output::doubleEqualOrUnordered): (JSC::FTL::Output::doubleNotEqual): (JSC::FTL::Output::doubleLessThanOrUnordered): (JSC::FTL::Output::doubleLessThanOrEqualOrUnordered): (JSC::FTL::Output::doubleGreaterThanOrUnordered): (JSC::FTL::Output::doubleGreaterThanOrEqualOrUnordered): * tests/stress/untyped-equality.js: Added. (foo): * tests/stress/untyped-less-than.js: Added. (foo): Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp trunk/Source/_javascript_Core/ftl/FTLCapabilities.cpp trunk/Source/_javascript_Core/ftl/FTLIntrinsicRepository.h trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp trunk/Source/_javascript_Core/ftl/FTLOutput.h Added Paths trunk/Source/_javascript_Core/tests/stress/untyped-equality.js trunk/Source/_javascript_Core/tests/stress/untyped-less-than.js Diff Modified: trunk/Source/_javascript_Core/ChangeLog (160293 => 160294) --- trunk/Source/_javascript_Core/ChangeLog 2013-12-08 20:09:09 UTC (rev 160293) +++ trunk/Source/_javascript_Core/ChangeLog 2013-12-09 01:06:54 UTC (rev 160294) @@ -1,3 +1,59 @@ +2013-12-08 Filip Pizlo + +FTL should support UntypedUse versions of Compare nodes +https://bugs.webkit.org/show_bug.cgi?id=125426 + +Reviewed by Oliver Hunt. + +This adds UntypedUse versions of all comparisons except CompareStrictEq, which is +sufficiently different that I thought I'd do it in another patch. + +This also extends our ability to abstract over comparison kind and removes a bunch of +copy-paste code. + +* dfg/DFGSpeculativeJIT64.cpp: +(JSC::DFG::SpeculativeJIT::nonSpeculativeNonPeepholeCompare): +* ftl/FTLCapabilities.cpp: +(JSC::FTL::canCompile): +* ftl/FTLIntrinsicRepository.h: +* ftl/FTLLowerDFGToLLVM.cpp: +(JSC::FTL::LowerDFGToLLVM::compileCompareEq): +(JSC::FTL::LowerDFGToLLVM::compileCompareLess): +(JSC::FTL::LowerDFGToLLVM::compileCompareLessEq): +(JSC::FTL::LowerDFGToLLVM::compileCompareGreater): +(JSC::FTL::LowerDFGToLLVM::compileCompareGreaterEq): +(JSC::FTL::LowerDFGToLLVM::compare): +(JSC::FTL::LowerDFGToLLVM::nonSpeculativeCompare): +* ftl/FTLOutput.h: +(JSC::FTL::Output::icmp): +(JSC::FTL::Output::equal): +(JSC::FTL::Output::notEqual): +(JSC::FTL::Output::above): +(JSC::FTL::Output::aboveOrEqual): +(JSC::FTL::Output::below): +(JSC::FTL::Output::belowOrEqual): +(JSC::FTL::Output::greaterThan): +(JSC::FTL::Output::greaterThanOrEqual): +(JSC::FTL::Output::lessThan): +(JSC::FTL::Output::lessThanOrEqual): +(JSC::FTL::Output::fcmp): +(JSC::FTL::Output::doubleEqual): +(JSC::FTL::Output::doubleNotEqualOrUnordered): +(JSC::FTL::Output::doubleLessThan): +(JSC::FTL::Output::doubleLessThanOrEqual): +(JSC::FTL::Output::doubleGreaterThan): +(JSC::FTL::Output::doubleGreaterThanOrEqual): +(JSC::FTL::Output::doubleEqualOrUnordered): +(JSC::FTL::Output::doubleNotEqual): +(JSC::FTL::Output::doubleLessThanOrUnordered): +(JSC::FTL::Output::doubleL
[webkit-changes] [160291] trunk/Source/WebKit2
Title: [160291] trunk/Source/WebKit2 Revision 160291 Author wei...@apple.com Date 2013-12-08 10:57:01 -0800 (Sun, 08 Dec 2013) Log Message [Cocoa] Remove webProcessPlugInInitialize: from the WKWebProcessPlugIn protocol https://bugs.webkit.org/show_bug.cgi?id=125405 Reviewed by Dan Bernstein. * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h: * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: (WebKit::InjectedBundle::load): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160290 => 160291) --- trunk/Source/WebKit2/ChangeLog 2013-12-08 18:26:15 UTC (rev 160290) +++ trunk/Source/WebKit2/ChangeLog 2013-12-08 18:57:01 UTC (rev 160291) @@ -1,3 +1,14 @@ +2013-12-07 Sam Weinig + +[Cocoa] Remove webProcessPlugInInitialize: from the WKWebProcessPlugIn protocol +https://bugs.webkit.org/show_bug.cgi?id=125405 + +Reviewed by Dan Bernstein. + +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h: +* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: +(WebKit::InjectedBundle::load): + 2013-12-08 Brian Holt [WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM) Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h (160290 => 160291) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h 2013-12-08 18:26:15 UTC (rev 160290) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.h 2013-12-08 18:57:01 UTC (rev 160291) @@ -39,9 +39,6 @@ - (void)webProcessPlugIn:(WKWebProcessPlugInController *)plugInController initializeWithObject:(id)initializationObject; - (void)webProcessPlugIn:(WKWebProcessPlugInController *)plugInController didCreateBrowserContextController:(WKWebProcessPlugInBrowserContextController *)browserContextController; - (void)webProcessPlugIn:(WKWebProcessPlugInController *)plugInController willDestroyBrowserContextController:(WKWebProcessPlugInBrowserContextController *)browserContextController; - -- (void)webProcessPlugInInitialize:(WKWebProcessPlugInController *)plugInController DEPRECATED_ATTRIBUTE; - @end WK_API_CLASS Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm (160290 => 160291) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2013-12-08 18:26:15 UTC (rev 160290) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm 2013-12-08 18:57:01 UTC (rev 160291) @@ -112,11 +112,6 @@ if (initializationUserData && initializationUserData->type() == API::Object::Type::ObjCObjectGraph) objCInitializationUserData = static_cast(initializationUserData)->rootObject(); [instance webProcessPlugIn:plugInController initializeWithObject:objCInitializationUserData.get()]; -} else if ([instance respondsToSelector:@selector(webProcessPlugInInitialize:)]) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -[instance webProcessPlugInInitialize:plugInController]; -#pragma clang diagnostic pop } return true; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160275] trunk/Tools
Title: [160275] trunk/Tools Revision 160275 Author wei...@apple.com Date 2013-12-07 18:36:37 -0800 (Sat, 07 Dec 2013) Log Message Convert MiniBrowser to use WKProcessGroup and WKBrowsingContextGroup https://bugs.webkit.org/show_bug.cgi?id=125400 Reviewed by Dan Bernstein. * MiniBrowser/mac/AppDelegate.h: * MiniBrowser/mac/AppDelegate.m: * MiniBrowser/mac/WK2BrowserWindowController.h: * MiniBrowser/mac/WK2BrowserWindowController.m: (-[WK2BrowserWindowController initWithProcessGroup:browsingContextGroup:]): (-[WK2BrowserWindowController dealloc]): (createNewPage): (-[WK2BrowserWindowController awakeFromNib]): (-[WK2BrowserWindowController browsingContextController:didNavigateWithNavigationData:]): (-[WK2BrowserWindowController browsingContextController:didPerformClientRedirectFromURL:toURL:]): (-[WK2BrowserWindowController browsingContextController:didPerformServerRedirectFromURL:toURL:]): (-[WK2BrowserWindowController browsingContextController:didUpdateHistoryTitle:forURL:]): Replace global WKContextRef and WKPageGroupRef with WKProcessGroup and WKBrowsingContextGroup. Also replace context based WKContextHistoryClient with WKBrowsingContextController based WKBrowsingContextHistoryDelegate Modified Paths trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/mac/AppDelegate.h trunk/Tools/MiniBrowser/mac/AppDelegate.m trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.h trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m Diff Modified: trunk/Tools/ChangeLog (160274 => 160275) --- trunk/Tools/ChangeLog 2013-12-07 17:39:33 UTC (rev 160274) +++ trunk/Tools/ChangeLog 2013-12-08 02:36:37 UTC (rev 160275) @@ -1,3 +1,25 @@ +2013-12-07 Sam Weinig + +Convert MiniBrowser to use WKProcessGroup and WKBrowsingContextGroup +https://bugs.webkit.org/show_bug.cgi?id=125400 + +Reviewed by Dan Bernstein. + +* MiniBrowser/mac/AppDelegate.h: +* MiniBrowser/mac/AppDelegate.m: +* MiniBrowser/mac/WK2BrowserWindowController.h: +* MiniBrowser/mac/WK2BrowserWindowController.m: +(-[WK2BrowserWindowController initWithProcessGroup:browsingContextGroup:]): +(-[WK2BrowserWindowController dealloc]): +(createNewPage): +(-[WK2BrowserWindowController awakeFromNib]): +(-[WK2BrowserWindowController browsingContextController:didNavigateWithNavigationData:]): +(-[WK2BrowserWindowController browsingContextController:didPerformClientRedirectFromURL:toURL:]): +(-[WK2BrowserWindowController browsingContextController:didPerformServerRedirectFromURL:toURL:]): +(-[WK2BrowserWindowController browsingContextController:didUpdateHistoryTitle:forURL:]): +Replace global WKContextRef and WKPageGroupRef with WKProcessGroup and WKBrowsingContextGroup. Also +replace context based WKContextHistoryClient with WKBrowsingContextController based WKBrowsingContextHistoryDelegate + 2013-12-07 Gustavo Noronha Silva [GTK] Run each gtest subtest separately instead of in one go Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (160274 => 160275) --- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2013-12-07 17:39:33 UTC (rev 160274) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2013-12-08 02:36:37 UTC (rev 160275) @@ -24,8 +24,9 @@ */ @interface BrowserAppDelegate : NSObject { -WKContextRef _processContext; -WKPageGroupRef _pageGroup; +WKProcessGroup *_processGroup; +WKBrowsingContextGroup *_browsingContextGroup; + NSMutableSet *_browserWindows; } Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (160274 => 160275) --- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-07 17:39:33 UTC (rev 160274) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-08 02:36:37 UTC (rev 160275) @@ -28,7 +28,7 @@ #import "WK1BrowserWindowController.h" #import "WK2BrowserWindowController.h" -#import +#import #import #import @@ -41,77 +41,12 @@ @implementation BrowserAppDelegate -// MARK: History Client Callbacks - -static void didNavigateWithNavigationData(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo) -{ -WKStringRef wkTitle = WKNavigationDataCopyTitle(navigationData); -CFStringRef title = WKStringCopyCFString(0, wkTitle); -WKRelease(wkTitle); - -WKURLRef wkURL = WKNavigationDataCopyURL(navigationData); -CFURLRef url = "" wkURL); -WKRelease(wkURL); - -LOG(@"HistoryClient - didNavigateWithNavigationData - title: %@ - url: %@", title, url); -CFRelease(title); -CFRelease(url); -} - -static void didPerformClientRedirect(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo) -{ -CFURLRef cfSourceURL = WKURLCopyCFURL(0, sourceURL); -CFURLRef cfDestinationURL = WKURLCopyCFURL(0, destinationURL); -LOG(@"HistoryClient - didPerformClientRedirect - sourceURL: %@ - destinationURL: %@", cfSourceURL, cf
[webkit-changes] [160293] trunk/Tools
Title: [160293] trunk/Tools Revision 160293 Author commit-qu...@webkit.org Date 2013-12-08 12:09:09 -0800 (Sun, 08 Dec 2013) Log Message [WK2] Add ENABLE_NETWORK_PROCESS flag https://bugs.webkit.org/show_bug.cgi?id=125421 Add support to build with the Network Process enabled. Patch by Brian Holt on 2013-12-08 Reviewed by Martin Robinson. * Scripts/webkitperl/FeatureList.pm: Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitperl/FeatureList.pm Diff Modified: trunk/Tools/ChangeLog (160292 => 160293) --- trunk/Tools/ChangeLog 2013-12-08 19:01:17 UTC (rev 160292) +++ trunk/Tools/ChangeLog 2013-12-08 20:09:09 UTC (rev 160293) @@ -1,3 +1,14 @@ +2013-12-08 Brian Holt + +[WK2] Add ENABLE_NETWORK_PROCESS flag +https://bugs.webkit.org/show_bug.cgi?id=125421 + +Add support to build with the Network Process enabled. + +Reviewed by Martin Robinson. + +* Scripts/webkitperl/FeatureList.pm: + 2013-12-07 Filip Pizlo Fold typedArray.length if typedArray is constant Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (160292 => 160293) --- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-12-08 19:01:17 UTC (rev 160292) +++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-12-08 20:09:09 UTC (rev 160293) @@ -111,6 +111,7 @@ $mouseCursorScaleSupport, $netscapePluginAPISupport, $networkInfoSupport, +$networkProcessSupport, $nosniffSupport, $notificationsSupport, $orientationEventsSupport, @@ -484,6 +485,9 @@ { option => "cloop", desc => "Force use of the llint c loop", define => "ENABLE_LLINT_C_LOOP", default => 0, value => \$forceCLoop }, + +{ option => "network-process", desc => "Toggle Network Process support", + define => "ENABLE_NETWORK_PROCESS", default => 0, value => \$networkProcessSupport }, ); sub getFeatureOptionList() ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160284] trunk/LayoutTests
Title: [160284] trunk/LayoutTests Revision 160284 Author zandober...@gmail.com Date 2013-12-08 05:09:44 -0800 (Sun, 08 Dec 2013) Log Message Unreviewed GTK gardening. Removing the baseline added in r160283. It's not really required, the failure is originating in an unnecessary and wrong patch that's applied on the Freetype source tree that's used in the GTK's Jhbuild setup. That patch will be removed in the near future, but until then the failure of accessibility/press-targers-center-point.html should be handled through an expectation. * platform/gtk/TestExpectations: * platform/gtk/accessibility/press-targets-center-point-expected.txt: Removed. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/TestExpectations Removed Paths trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (160283 => 160284) --- trunk/LayoutTests/ChangeLog 2013-12-08 10:09:34 UTC (rev 160283) +++ trunk/LayoutTests/ChangeLog 2013-12-08 13:09:44 UTC (rev 160284) @@ -1,5 +1,17 @@ 2013-12-08 Zan Dobersek +Unreviewed GTK gardening. + +Removing the baseline added in r160283. It's not really required, the failure is originating +in an unnecessary and wrong patch that's applied on the Freetype source tree that's used in the +GTK's Jhbuild setup. That patch will be removed in the near future, but until then the failure +of accessibility/press-targers-center-point.html should be handled through an expectation. + +* platform/gtk/TestExpectations: +* platform/gtk/accessibility/press-targets-center-point-expected.txt: Removed. + +2013-12-08 Zan Dobersek + Unreviewed GTK gardening. Adding expectations for the current test failures. Adding a GTK-specific baseline for a recently introduced a11y test. Modified: trunk/LayoutTests/platform/gtk/TestExpectations (160283 => 160284) --- trunk/LayoutTests/platform/gtk/TestExpectations 2013-12-08 10:09:34 UTC (rev 160283) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-12-08 13:09:44 UTC (rev 160284) @@ -1519,6 +1519,8 @@ webkit.org/b/125406 fast/regions/relative-in-absolute-borders-overflow.html [ ImageOnlyFailure ] +webkit.org/b/125409 accessibility/press-targets-center-point.html [ Failure ] + # # End of Tests failing # Deleted: trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt (160283 => 160284) --- trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt 2013-12-08 10:09:34 UTC (rev 160283) +++ trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt 2013-12-08 13:09:44 UTC (rev 160284) @@ -1,25 +0,0 @@ -target -Actual: (89, 17) -Expected: (89, 18) - -translate transform target -Actual: (289, 264) -Expected: (289, 265) - -vertical left-to-right writing mode target -Actual: (17, 307) -Expected: (18, 307) - -right-to-left direction target -Actual: (129, 509) -Expected: (129, 510) - -This tests that press targets the receiving elements center point. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS successfullyParsed is true - -TEST COMPLETE - ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160285] trunk/Tools
Title: [160285] trunk/Tools Revision 160285 Author commit-qu...@webkit.org Date 2013-12-08 07:30:30 -0800 (Sun, 08 Dec 2013) Log Message [Gtk] install-dependencies doesn't install libgtk-3-dev https://bugs.webkit.org/show_bug.cgi?id=125320 Patch by Brendan Long on 2013-12-08 Reviewed by Gustavo Noronha Silva. * gtk/install-dependencies: Add libgtk-3-dev, libsoup2.4 and subversion Modified Paths trunk/Tools/ChangeLog trunk/Tools/gtk/install-dependencies Diff Modified: trunk/Tools/ChangeLog (160284 => 160285) --- trunk/Tools/ChangeLog 2013-12-08 13:09:44 UTC (rev 160284) +++ trunk/Tools/ChangeLog 2013-12-08 15:30:30 UTC (rev 160285) @@ -1,3 +1,12 @@ +2013-12-08 Brendan Long + +[Gtk] install-dependencies doesn't install libgtk-3-dev +https://bugs.webkit.org/show_bug.cgi?id=125320 + +Reviewed by Gustavo Noronha Silva. + +* gtk/install-dependencies: Add libgtk-3-dev, libsoup2.4 and subversion + 2013-12-07 Sam Weinig [Cocoa] Convert a few more parts of MiniBrowser over to the Objective-C API Modified: trunk/Tools/gtk/install-dependencies (160284 => 160285) --- trunk/Tools/gtk/install-dependencies 2013-12-08 13:09:44 UTC (rev 160284) +++ trunk/Tools/gtk/install-dependencies 2013-12-08 15:30:30 UTC (rev 160285) @@ -55,6 +55,7 @@ libgl1-mesa-glx \ libgnutls-dev \ libgtk2.0-dev \ +libgtk-3-dev \ libgudev-1.0-dev \ libicu-dev \ libjpeg8-dev \ @@ -65,6 +66,7 @@ libpulse-dev \ librsvg2-dev \ libsecret-1-dev \ +libsoup2.4-dev \ libsqlite3-dev \ libtheora-dev \ libtool \ @@ -116,6 +118,10 @@ xfonts-utils \ xtrans-dev \ xutils-dev + +# These are dependencies necessary for using webkit-patch +apt-get install \ +subversion } function installDependenciesWithYum { ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160280] trunk/Source/WebKit2
Title: [160280] trunk/Source/WebKit2 Revision 160280 Author wei...@apple.com Date 2013-12-07 22:17:18 -0800 (Sat, 07 Dec 2013) Log Message [Cocoa] Make WKWebProcessPlugInController work with WKObject wrapping https://bugs.webkit.org/show_bug.cgi?id=125404 Reviewed by Dan Bernstein. * Shared/Cocoa/APIObject.mm: (API::Object::newObject): * Shared/mac/ObjCObjectGraphCoders.mm: * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm: (-[WKWebProcessPlugInController dealloc]): (didCreatePage): (willDestroyPage): (-[WKWebProcessPlugInController _setPrincipalClassInstance:]): (-[WKWebProcessPlugInController API::]): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: (WebKit::wrapper): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h: * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: (WebKit::InjectedBundle::load): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160279 => 160280) --- trunk/Source/WebKit2/ChangeLog 2013-12-08 05:53:33 UTC (rev 160279) +++ trunk/Source/WebKit2/ChangeLog 2013-12-08 06:17:18 UTC (rev 160280) @@ -1,3 +1,25 @@ +2013-12-07 Sam Weinig + +[Cocoa] Make WKWebProcessPlugInController work with WKObject wrapping +https://bugs.webkit.org/show_bug.cgi?id=125404 + +Reviewed by Dan Bernstein. + +* Shared/Cocoa/APIObject.mm: +(API::Object::newObject): +* Shared/mac/ObjCObjectGraphCoders.mm: +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm: +(-[WKWebProcessPlugInController dealloc]): +(didCreatePage): +(willDestroyPage): +(-[WKWebProcessPlugInController _setPrincipalClassInstance:]): +(-[WKWebProcessPlugInController API::]): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: +(WebKit::wrapper): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInPrivate.h: +* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: +(WebKit::InjectedBundle::load): + 2013-12-07 Dan Bernstein [Cocoa] WebData has a generic wrapper @@ -5,7 +27,7 @@ Reviewed by Sam Weinig. -Added WKNSData, an NSData subclass that confroms to WKObject and wraps a WebData. +Added WKNSData, an NSData subclass that conforms to WKObject and wraps a WebData. * Shared/Cocoa/APIObject.mm: (API::Object::newObject): Allocate a WKNSData if the API::Object is data. Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (160279 => 160280) --- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 05:53:33 UTC (rev 160279) +++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 06:17:18 UTC (rev 160280) @@ -44,6 +44,7 @@ #import "WKNavigationDataInternal.h" #import "WKProcessGroupInternal.h" #import "WKWebProcessPlugInBrowserContextControllerInternal.h" +#import "WKWebProcessPlugInInternal.h" namespace API { @@ -82,6 +83,10 @@ wrapper = [WKBackForwardListItem alloc]; break; +case Type::Bundle: +wrapper = [WKWebProcessPlugInController alloc]; +break; + case Type::BundlePage: wrapper = [WKWebProcessPlugInBrowserContextController alloc]; break; Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (160279 => 160280) --- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2013-12-08 05:53:33 UTC (rev 160279) +++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2013-12-08 06:17:18 UTC (rev 160280) @@ -40,7 +40,6 @@ #import "InjectedBundleUserMessageCoders.h" #import "WKBundleAPICast.h" #import "WKWebProcessPlugInBrowserContextControllerInternal.h" -#import "WKWebProcessPlugInBrowserContextControllerPrivate.h" #import "WKWebProcessPlugInInternal.h" #import "WebPage.h" #import "WebProcess.h" Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (160279 => 160280) --- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-08 05:53:33 UTC (rev 160279) +++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-08 06:17:18 UTC (rev 160280) @@ -28,7 +28,6 @@ #if WK_API_ENABLED -#import "InjectedBundle.h" #import "WKConnectionInternal.h" #import "WKBundle.h" #import "WKBundleAPICast.h" @@ -39,18 +38,24 @@ using namespace WebKit; @interface WKWebProcessPlugInController () { +API::ObjectStorage _bundle; RetainPtr> _principalClassInstance; -RefPtr _bundle; -RetainPtr _connectionWrapper; } @en
[webkit-changes] [160287] trunk/Tools
Title: [160287] trunk/Tools Revision 160287 Author zandober...@gmail.com Date 2013-12-08 08:51:28 -0800 (Sun, 08 Dec 2013) Log Message [gdb] Update printers for WTF::CString, JSC::JSString https://bugs.webkit.org/show_bug.cgi?id=124600 Reviewed by Gustavo Noronha Silva. Update the two printers after they fell behind the changes in implementation. * gdb/webkit.py: (WTFCStringPrinter.to_string): (JSCJSStringPrinter.to_string): Modified Paths trunk/Tools/ChangeLog trunk/Tools/gdb/webkit.py Diff Modified: trunk/Tools/ChangeLog (160286 => 160287) --- trunk/Tools/ChangeLog 2013-12-08 16:50:01 UTC (rev 160286) +++ trunk/Tools/ChangeLog 2013-12-08 16:51:28 UTC (rev 160287) @@ -1,5 +1,18 @@ 2013-12-08 Zan Dobersek +[gdb] Update printers for WTF::CString, JSC::JSString +https://bugs.webkit.org/show_bug.cgi?id=124600 + +Reviewed by Gustavo Noronha Silva. + +Update the two printers after they fell behind the changes in implementation. + +* gdb/webkit.py: +(WTFCStringPrinter.to_string): +(JSCJSStringPrinter.to_string): + +2013-12-08 Zan Dobersek + [webkitpy] Add a WestonDriver unit test https://bugs.webkit.org/show_bug.cgi?id=125408 Modified: trunk/Tools/gdb/webkit.py (160286 => 160287) --- trunk/Tools/gdb/webkit.py 2013-12-08 16:50:01 UTC (rev 160286) +++ trunk/Tools/gdb/webkit.py 2013-12-08 16:51:28 UTC (rev 160287) @@ -115,10 +115,9 @@ class WTFCStringPrinter(StringPrinter): "Print a WTF::CString" def to_string(self): -# The CString holds a buffer, which is a refptr to a WTF::CStringBuffer. -data = "" +string = (self.val['m_buffer']['m_ptr'] + 1).cast(gdb.lookup_type('char').pointer()) length = self.val['m_buffer']['m_ptr']['m_length'] -return ''.join([chr((data + i).dereference()) for i in range(length)]) +return lstring_to_string(string, length) class WTFStringImplPrinter(StringPrinter): @@ -164,7 +163,7 @@ if self.val['m_length'] == 0: return '' -return WTFStringImplPrinter(self.val['m_value']).to_string() +return WTFStringPrinter(self.val['m_value']).to_string() class WebCoreQualifiedNamePrinter(StringPrinter): ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160274] trunk/Tools
Title: [160274] trunk/Tools Revision 160274 Author g...@gnome.org Date 2013-12-07 09:39:33 -0800 (Sat, 07 Dec 2013) Log Message [GTK] Run each gtest subtest separately instead of in one go https://bugs.webkit.org/show_bug.cgi?id=125386 Reviewed by Martin Robinson. This is what other ports are doing (except they build each test as a separate binary) and will help with the timeouts we sometimes hit because it applies to the full test run. * Scripts/run-gtk-tests: (TestRunner._get_tests_from_google_test_suite): get a list of available sub-tests. (TestRunner._run_google_test): run a single subtest from a gtest binary. (TestRunner._run_google_test_suite): call the binary once per subtest. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/run-gtk-tests Diff Modified: trunk/Tools/ChangeLog (160273 => 160274) --- trunk/Tools/ChangeLog 2013-12-07 16:50:25 UTC (rev 160273) +++ trunk/Tools/ChangeLog 2013-12-07 17:39:33 UTC (rev 160274) @@ -1,3 +1,19 @@ +2013-12-07 Gustavo Noronha Silva + +[GTK] Run each gtest subtest separately instead of in one go +https://bugs.webkit.org/show_bug.cgi?id=125386 + +Reviewed by Martin Robinson. + +This is what other ports are doing (except they build each test as a separate binary) +and will help with the timeouts we sometimes hit because it applies to the full test +run. + +* Scripts/run-gtk-tests: +(TestRunner._get_tests_from_google_test_suite): get a list of available sub-tests. +(TestRunner._run_google_test): run a single subtest from a gtest binary. +(TestRunner._run_google_test_suite): call the binary once per subtest. + 2013-12-07 Dániel Bátyai Move PrettyPatch related code to prettypatch.py Modified: trunk/Tools/Scripts/run-gtk-tests (160273 => 160274) --- trunk/Tools/Scripts/run-gtk-tests 2013-12-07 16:50:25 UTC (rev 160273) +++ trunk/Tools/Scripts/run-gtk-tests 2013-12-07 17:39:33 UTC (rev 160274) @@ -324,20 +324,45 @@ return self._run_test_command(tester_command, self._options.timeout) -def _run_test_google(self, test_program): -tester_command = [test_program] -skipped_tests_cases = self._test_cases_to_skip(test_program) -if skipped_tests_cases: -tester_command.append("--gtest_filter=-%s" % ":".join(skipped_tests_cases)) +def _get_tests_from_google_test_suite(self, test_program): +try: +output = subprocess.check_output([test_program, '--gtest_list_tests']) +except subprocess.CalledProcessError: +sys.stderr.write("ERROR: could not list available tests for binary %s.\n" % (test_program)) +sys.stderr.flush() +return 1 -return self._run_test_command(tester_command, self._options.timeout) +skipped_test_cases = self._test_cases_to_skip(test_program) +tests = [] +prefix = None +for line in output.split('\n'): +if not line.startswith(' '): +prefix = line +continue +else: +test_name = prefix + line.strip() +if not test_name in skipped_test_cases: +tests.append(test_name) +return tests + +def _run_google_test(self, test_program, subtest): +test_command = [test_program, '--gtest_filter=%s' % (subtest)] +return self._run_test_command(test_command, self._options.timeout) + +def _run_google_test_suite(self, test_program): +for subtest in self._get_tests_from_google_test_suite(test_program): +retcode = self._run_google_test(test_program, subtest) +if retcode: +return retcode +return 0 + def _run_test(self, test_program): if "unittests" in test_program or "WebKit2APITests" in test_program: return self._run_test_glib(test_program) if "TestWebKitAPI" in test_program: -return self._run_test_google(test_program) +return self._run_google_test_suite(test_program) return 1 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160276] trunk/Tools
Title: [160276] trunk/Tools Revision 160276 Author wei...@apple.com Date 2013-12-07 19:00:44 -0800 (Sat, 07 Dec 2013) Log Message [Cocoa] Convert a few more parts of MiniBrowser over to the Objective-C API https://bugs.webkit.org/show_bug.cgi?id=125401 Reviewed by Dan Bernstein. * MiniBrowser/mac/WK2BrowserWindowController.m: (-[WK2BrowserWindowController fetch:]): (-[WK2BrowserWindowController reload:]): (-[WK2BrowserWindowController goBack:]): (-[WK2BrowserWindowController goForward:]): (-[WK2BrowserWindowController validateUserInterfaceItem:]): (-[WK2BrowserWindowController currentZoomFactor]): (-[WK2BrowserWindowController setCurrentZoomFactor:]): (-[WK2BrowserWindowController zoomIn:]): (-[WK2BrowserWindowController zoomOut:]): (-[WK2BrowserWindowController canResetZoom]): (-[WK2BrowserWindowController resetZoom:]): (-[WK2BrowserWindowController toggleZoomMode:]): (-[WK2BrowserWindowController updateTextFieldFromURL:]): Modified Paths trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m Diff Modified: trunk/Tools/ChangeLog (160275 => 160276) --- trunk/Tools/ChangeLog 2013-12-08 02:36:37 UTC (rev 160275) +++ trunk/Tools/ChangeLog 2013-12-08 03:00:44 UTC (rev 160276) @@ -1,5 +1,27 @@ 2013-12-07 Sam Weinig +[Cocoa] Convert a few more parts of MiniBrowser over to the Objective-C API +https://bugs.webkit.org/show_bug.cgi?id=125401 + +Reviewed by Dan Bernstein. + +* MiniBrowser/mac/WK2BrowserWindowController.m: +(-[WK2BrowserWindowController fetch:]): +(-[WK2BrowserWindowController reload:]): +(-[WK2BrowserWindowController goBack:]): +(-[WK2BrowserWindowController goForward:]): +(-[WK2BrowserWindowController validateUserInterfaceItem:]): +(-[WK2BrowserWindowController currentZoomFactor]): +(-[WK2BrowserWindowController setCurrentZoomFactor:]): +(-[WK2BrowserWindowController zoomIn:]): +(-[WK2BrowserWindowController zoomOut:]): +(-[WK2BrowserWindowController canResetZoom]): +(-[WK2BrowserWindowController resetZoom:]): +(-[WK2BrowserWindowController toggleZoomMode:]): +(-[WK2BrowserWindowController updateTextFieldFromURL:]): + +2013-12-07 Sam Weinig + Convert MiniBrowser to use WKProcessGroup and WKBrowsingContextGroup https://bugs.webkit.org/show_bug.cgi?id=125400 Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (160275 => 160276) --- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-08 02:36:37 UTC (rev 160275) +++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-08 03:00:44 UTC (rev 160276) @@ -33,7 +33,6 @@ #import #import #import -#import #import #import #import @@ -79,15 +78,7 @@ { [urlText setStringValue:[self addProtocolIfNecessary:[urlText stringValue]]]; -CFURLRef cfURL = CFURLCreateWithString(0, (CFStringRef)[urlText stringValue], 0); -if (!cfURL) -return; - -WKURLRef url = "" -CFRelease(cfURL); - -WKPageLoadURL(_webView.pageRef, url); -WKRelease(url); +[_webView.browsingContextController loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[urlText stringValue; } - (IBAction)showHideWebView:(id)sender @@ -135,7 +126,7 @@ - (IBAction)reload:(id)sender { -WKPageReload(_webView.pageRef); +[_webView.browsingContextController reload]; } - (IBAction)forceRepaint:(id)sender @@ -145,12 +136,12 @@ - (IBAction)goBack:(id)sender { -WKPageGoBack(_webView.pageRef); +[_webView.browsingContextController goBack]; } - (IBAction)goForward:(id)sender { -WKPageGoForward(_webView.pageRef); +[_webView.browsingContextController goForward]; } - (BOOL)validateUserInterfaceItem:(id )item @@ -158,10 +149,10 @@ SEL action = "" action]; if (action == @selector(goBack:)) -return _webView && WKPageCanGoBack(_webView.pageRef); +return _webView && [_webView.browsingContextController canGoBack]; if (action == @selector(goForward:)) -return _webView && WKPageCanGoForward(_webView.pageRef); +return _webView && [_webView.browsingContextController canGoForward]; return YES; } @@ -194,14 +185,17 @@ #define DefaultMaximumZoomFactor (3.0) #define DefaultZoomFactorRatio (1.2) -- (double)currentZoomFactor +- (CGFloat)currentZoomFactor { -return _zoomTextOnly ? WKPageGetTextZoomFactor(_webView.pageRef) : WKPageGetPageZoomFactor(_webView.pageRef); +return _zoomTextOnly ? _webView.browsingContextController.textZoom : _webView.browsingContextController.pageZoom; } -- (void)setCurrentZoomFactor:(double)factor +- (void)setCurrentZoomFactor:(CGFloat)factor { -_zoomTextOnly ? WKPageSetTextZoomFactor(_webView.pageRef, factor) : WKPageSetPageZoomFactor(_webView.pageRef, factor); +if (_zoomTextOnly) +_webView.browsingContextController.textZoom = factor; +else +_webV
[webkit-changes] [160286] trunk/Tools
Title: [160286] trunk/Tools Revision 160286 Author zandober...@gmail.com Date 2013-12-08 08:50:01 -0800 (Sun, 08 Dec 2013) Log Message [webkitpy] Add a WestonDriver unit test https://bugs.webkit.org/show_bug.cgi?id=125408 Reviewed by Gustavo Noronha Silva. Add a webkitpy unit test for the Weston driver. * Scripts/webkitpy/port/westondriver_unittest.py: Added. (WestonDriverTest): (WestonDriverTest.make_driver): Sets up a new WestonDriver instance for testing purposes. (WestonDriverTest.test_start): Check that the Weston compositor is launched properly and that the server environment contains proper WAYLAND and GDK_BACKEND entries. (WestonDriverTest.test_stop): Check that the Weston compositor is terminated properly and that the driver cleans up the temporary directory. (WestonDriverTest.test_stop.FakeWestonProcess): A helper class that logs the expected termination. (WestonDriverTest.test_stop.FakeWestonProcess.terminate): Modified Paths trunk/Tools/ChangeLog Added Paths trunk/Tools/Scripts/webkitpy/port/westondriver_unittest.py Diff Modified: trunk/Tools/ChangeLog (160285 => 160286) --- trunk/Tools/ChangeLog 2013-12-08 15:30:30 UTC (rev 160285) +++ trunk/Tools/ChangeLog 2013-12-08 16:50:01 UTC (rev 160286) @@ -1,3 +1,22 @@ +2013-12-08 Zan Dobersek + +[webkitpy] Add a WestonDriver unit test +https://bugs.webkit.org/show_bug.cgi?id=125408 + +Reviewed by Gustavo Noronha Silva. + +Add a webkitpy unit test for the Weston driver. + +* Scripts/webkitpy/port/westondriver_unittest.py: Added. +(WestonDriverTest): +(WestonDriverTest.make_driver): Sets up a new WestonDriver instance for testing purposes. +(WestonDriverTest.test_start): Check that the Weston compositor is launched properly and that +the server environment contains proper WAYLAND and GDK_BACKEND entries. +(WestonDriverTest.test_stop): Check that the Weston compositor is terminated properly and that +the driver cleans up the temporary directory. +(WestonDriverTest.test_stop.FakeWestonProcess): A helper class that logs the expected termination. +(WestonDriverTest.test_stop.FakeWestonProcess.terminate): + 2013-12-08 Brendan Long [Gtk] install-dependencies doesn't install libgtk-3-dev Added: trunk/Tools/Scripts/webkitpy/port/westondriver_unittest.py (0 => 160286) --- trunk/Tools/Scripts/webkitpy/port/westondriver_unittest.py (rev 0) +++ trunk/Tools/Scripts/webkitpy/port/westondriver_unittest.py 2013-12-08 16:50:01 UTC (rev 160286) @@ -0,0 +1,84 @@ +# Copyright (C) 2013 Igalia S.L. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +#* Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +#* 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. +#* Neither the name of Igalia S.L. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT +# OWNER OR 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 logging +import re +import unittest2 as unittest + +from webkitpy.common.system.filesystem_mock import MockFileSystem +from webkitpy.common.system.outputcapture import OutputCapture +from webkitpy.common.system.systemhost_mock import MockSystemHost +from webkitpy.port import Port +from webkitpy.port.server_process_mock import MockServerProcess +from webkitpy.port.westondriver import WestonDriver +from webkitpy.tool.mocktool import MockOptions + +_log = logging.getLogger(__name__) + + +class WestonDriverTest(unittest.TestCase): +def make_driver(self, filesystem=None): +port = Port(MockSystemHost(log_executive=True, filesystem=filesystem), 'westondrivertestport', options=MockOptions(configuration='Release')) +port._config.build_directory = lambda configuration: "/mock_build" +port._server_process_constructo
[webkit-changes] [160278] trunk/Source/WebKit2
Title: [160278] trunk/Source/WebKit2 Revision 160278 Author m...@apple.com Date 2013-12-07 21:23:29 -0800 (Sat, 07 Dec 2013) Log Message [Cocoa] WebData has a generic wrapper https://bugs.webkit.org/show_bug.cgi?id=125402 Reviewed by Sam Weinig. Added WKNSData, an NSData subclass that confroms to WKObject and wraps a WebData. * Shared/Cocoa/APIObject.mm: (API::Object::newObject): Allocate a WKNSData if the API::Object is data. * Shared/Cocoa/WKNSData.h: Added. (WebKit::wrapper): Added. Returns a WebData’s wrapper as an NSData. * Shared/Cocoa/WKNSData.mm: Added. (-[WKNSData dealloc]): Calls the WebData destructor. (-[WKNSData length]): Added. (-[WKNSData bytes]): Added. (-[WKNSData copyWithZone:]): Retains self. (-[WKNSData _apiObject]): Returns the wrapped WebData. * WebKit2.xcodeproj/project.pbxproj: Added references to new files. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Added Paths trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160277 => 160278) --- trunk/Source/WebKit2/ChangeLog 2013-12-08 05:22:02 UTC (rev 160277) +++ trunk/Source/WebKit2/ChangeLog 2013-12-08 05:23:29 UTC (rev 160278) @@ -1,3 +1,24 @@ +2013-12-07 Dan Bernstein + +[Cocoa] WebData has a generic wrapper +https://bugs.webkit.org/show_bug.cgi?id=125402 + +Reviewed by Sam Weinig. + +Added WKNSData, an NSData subclass that confroms to WKObject and wraps a WebData. + +* Shared/Cocoa/APIObject.mm: +(API::Object::newObject): Allocate a WKNSData if the API::Object is data. +* Shared/Cocoa/WKNSData.h: Added. +(WebKit::wrapper): Added. Returns a WebData’s wrapper as an NSData. +* Shared/Cocoa/WKNSData.mm: Added. +(-[WKNSData dealloc]): Calls the WebData destructor. +(-[WKNSData length]): Added. +(-[WKNSData bytes]): Added. +(-[WKNSData copyWithZone:]): Retains self. +(-[WKNSData _apiObject]): Returns the wrapped WebData. +* WebKit2.xcodeproj/project.pbxproj: Added references to new files. + 2013-12-07 Sam Weinig [Cocoa] Make WKWebProcessPlugInBrowserContextController work with WKObject wrapping Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (160277 => 160278) --- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 05:22:02 UTC (rev 160277) +++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 05:23:29 UTC (rev 160278) @@ -34,6 +34,7 @@ #import "WKBrowsingContextGroupInternal.h" #import "WKConnectionInternal.h" #import "WKNSArray.h" +#import "WKNSData.h" #import "WKNSDictionary.h" #import "WKNSError.h" #import "WKNSString.h" @@ -93,6 +94,10 @@ wrapper = [WKProcessGroup alloc]; break; +case Type::Data: +wrapper = [WKNSData alloc]; +break; + case Type::Dictionary: wrapper = [WKNSDictionary alloc]; break; Added: trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h (0 => 160278) --- trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h (rev 0) +++ trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h 2013-12-08 05:23:29 UTC (rev 160278) @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2013 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 "WKFoundation.h" + +#if WK_API_ENABLED + +#import "WKObject.h" +#import "WebData.h" + +namespace WebKit { + +inline NSData *wrapper(WebData& data) +{ +ASSERT([data.wrapper() isKindOfClass:[NSData self]]); +return (NSData *)data.wrapper(); +} + +} + +@interface WKNSData : NSData +@end
[webkit-changes] [160277] trunk/Source/WebKit2
Title: [160277] trunk/Source/WebKit2 Revision 160277 Author wei...@apple.com Date 2013-12-07 21:22:02 -0800 (Sat, 07 Dec 2013) Log Message [Cocoa] Make WKWebProcessPlugInBrowserContextController work with WKObject wrapping https://bugs.webkit.org/show_bug.cgi?id=125403 Reviewed by Dan Bernstein. * Shared/Cocoa/APIObject.mm: (API::Object::newObject): * Shared/mac/ObjCObjectGraphCoders.mm: (WebKit::InjectedBundleObjCObjectGraphDecoderImpl::decode): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm: (didCreatePage): (willDestroyPage): (setUpBundleClient): (-[WKWebProcessPlugInController _initWithPrincipalClassInstance:bundle:]): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm: (-[WKWebProcessPlugInBrowserContextController dealloc]): (-[WKWebProcessPlugInBrowserContextController mainFrameDocument]): (-[WKWebProcessPlugInBrowserContextController selectedRange]): (-[WKWebProcessPlugInBrowserContextController API::]): (-[WKWebProcessPlugInBrowserContextController _bundlePageRef]): (-[WKWebProcessPlugInBrowserContextController handle]): (+[WKWebProcessPlugInBrowserContextController lookUpBrowsingContextFromHandle:]): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h: (WebKit::wrapper): * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: * WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: (WebKit::InjectedBundle::load): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h trunk/Source/WebKit2/WebProcess/InjectedBundle/mac/InjectedBundleMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160276 => 160277) --- trunk/Source/WebKit2/ChangeLog 2013-12-08 03:00:44 UTC (rev 160276) +++ trunk/Source/WebKit2/ChangeLog 2013-12-08 05:22:02 UTC (rev 160277) @@ -1,3 +1,33 @@ +2013-12-07 Sam Weinig + +[Cocoa] Make WKWebProcessPlugInBrowserContextController work with WKObject wrapping +https://bugs.webkit.org/show_bug.cgi?id=125403 + +Reviewed by Dan Bernstein. + +* Shared/Cocoa/APIObject.mm: +(API::Object::newObject): +* Shared/mac/ObjCObjectGraphCoders.mm: +(WebKit::InjectedBundleObjCObjectGraphDecoderImpl::decode): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm: +(didCreatePage): +(willDestroyPage): +(setUpBundleClient): +(-[WKWebProcessPlugInController _initWithPrincipalClassInstance:bundle:]): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm: +(-[WKWebProcessPlugInBrowserContextController dealloc]): +(-[WKWebProcessPlugInBrowserContextController mainFrameDocument]): +(-[WKWebProcessPlugInBrowserContextController selectedRange]): +(-[WKWebProcessPlugInBrowserContextController API::]): +(-[WKWebProcessPlugInBrowserContextController _bundlePageRef]): +(-[WKWebProcessPlugInBrowserContextController handle]): +(+[WKWebProcessPlugInBrowserContextController lookUpBrowsingContextFromHandle:]): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerInternal.h: +(WebKit::wrapper): +* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInInternal.h: +* WebProcess/InjectedBundle/mac/InjectedBundleMac.mm: +(WebKit::InjectedBundle::load): + 2013-12-07 Gustavo Noronha Silva Fix API test expectation following 160220. Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (160276 => 160277) --- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 03:00:44 UTC (rev 160276) +++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-08 05:22:02 UTC (rev 160277) @@ -32,8 +32,8 @@ #import "WKBackForwardListItemInternal.h" #import "WKBrowsingContextControllerInternal.h" #import "WKBrowsingContextGroupInternal.h" +#import "WKConnectionInternal.h" #import "WKNSArray.h" -#import "WKConnectionInternal.h" #import "WKNSDictionary.h" #import "WKNSError.h" #import "WKNSString.h" @@ -42,6 +42,7 @@ #import "WKNSURLProtectionSpace.h" #import "WKNavigationDataInternal.h" #import "WKProcessGroupInternal.h" +#import "WKWebProcessPlugInBrowserContextControllerInternal.h" namespace API { @@ -80,6 +81,10 @@ wrapper = [WKBackForwardListItem alloc]; break; +case Type::BundlePage: +wrapper = [WKWebProcessPlugInBrowserContextController alloc]; +break; + case Type::Connection: wrapper = NSAllocateObject([WKConnection self], size, nullptr
[webkit-changes] [160283] trunk/LayoutTests
Title: [160283] trunk/LayoutTests Revision 160283 Author zandober...@gmail.com Date 2013-12-08 02:09:34 -0800 (Sun, 08 Dec 2013) Log Message Unreviewed GTK gardening. Adding expectations for the current test failures. Adding a GTK-specific baseline for a recently introduced a11y test. * platform/gtk/TestExpectations: * platform/gtk/accessibility/press-targets-center-point-expected.txt: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/gtk/TestExpectations Added Paths trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt Diff Modified: trunk/LayoutTests/ChangeLog (160282 => 160283) --- trunk/LayoutTests/ChangeLog 2013-12-08 06:43:27 UTC (rev 160282) +++ trunk/LayoutTests/ChangeLog 2013-12-08 10:09:34 UTC (rev 160283) @@ -1,3 +1,11 @@ +2013-12-08 Zan Dobersek + +Unreviewed GTK gardening. Adding expectations for the current test failures. +Adding a GTK-specific baseline for a recently introduced a11y test. + +* platform/gtk/TestExpectations: +* platform/gtk/accessibility/press-targets-center-point-expected.txt: Added. + 2013-12-05 Jer Noble [MSE] Bring end-of-stream algorithm section up to current spec. Modified: trunk/LayoutTests/platform/gtk/TestExpectations (160282 => 160283) --- trunk/LayoutTests/platform/gtk/TestExpectations 2013-12-08 06:43:27 UTC (rev 160282) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-12-08 10:09:34 UTC (rev 160283) @@ -293,11 +293,12 @@ webkit.org/b/99065 http/tests/media/media-source/video-media-source-state-changes.html [ Timeout ] webkit.org/b/99065 http/tests/media/media-source/video-media-source-zero-byte-append-in-ended-state.html [ Timeout ] -webkit.org/b/99065 media/media-source/media-source-track-enabled.html [ Failure ] -webkit.org/b/99065 media/media-source/media-source-tracks.html [ Failure ] -webkit.org/b/99065 media/media-source/media-source-append-failed.html [ Timeout ] -webkit.org/b/99065 media/media-source/media-source-canplaythrough.html [ Timeout ] -webkit.org/b/99065 media/media-source/media-source-play.html [ Timeout ] +webkit.org/b/99065 media/media-source/media-source-track-enabled.html [ Failure ] +webkit.org/b/99065 media/media-source/media-source-tracks.html [ Failure ] +webkit.org/b/99065 media/media-source/media-source-append-failed.html [ Timeout ] +webkit.org/b/99065 media/media-source/media-source-canplaythrough.html [ Timeout ] +webkit.org/b/99065 media/media-source/media-source-play.html [ Timeout ] +webkit.org/b/99065 media/media-source/media-source-end-of-stream.html [ Timeout ] # Encrypted Media Extensions are not enabled. webkit.org/b/99024 media/encrypted-media [ Failure Timeout ] @@ -755,6 +756,8 @@ webkit.org/b/124513 media/video-ended-event-negative-playback.html [ Failure Pass ] +webkit.org/b/125407 plugins/plugin-clip-subframe.html [ Failure Pass ] + # # End of Flaky tests # @@ -1514,6 +1517,8 @@ webkit.org/b/125348 accessibility/document-attributes.html [ Failure ] +webkit.org/b/125406 fast/regions/relative-in-absolute-borders-overflow.html [ ImageOnlyFailure ] + # # End of Tests failing # Added: trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt (0 => 160283) --- trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt (rev 0) +++ trunk/LayoutTests/platform/gtk/accessibility/press-targets-center-point-expected.txt 2013-12-08 10:09:34 UTC (rev 160283) @@ -0,0 +1,25 @@ +target +Actual: (89, 17) +Expected: (89, 18) + +translate transform target +Actual: (289, 264) +Expected: (289, 265) + +vertical left-to-right writing mode target +Actual: (17, 307) +Expected: (18, 307) + +right-to-left direction target +Actual: (129, 509) +Expected: (129, 510) + +This tests that press targets the receiving elements center point. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS successfullyParsed is true + +TEST COMPLETE + ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160281] trunk/Source/WebCore
Title: [160281] trunk/Source/WebCore Revision 160281 Author jer.no...@apple.com Date 2013-12-07 22:39:39 -0800 (Sat, 07 Dec 2013) Log Message [MSE][Mac] Crash when removing MediaSource from HTMLMediaElement. https://bugs.webkit.org/show_bug.cgi?id=125269 Reviewed by Sam Weinig. Fixes the media/media-source/media-source-fastseek.html test when run with MallocScribble enabled. It's possible for a SourceBufferPrivateAVFObjC to outlive its MediaSourcePrivateAVFObjC, so make sure to clear the pointer from the former to the latter when the latter is destroyed. That means we now have to check to see if the pointer to the latter is still valid at every call site. As a drive-by fix, rename m_parent to m_mediaSource to more accurately reflect what the pointer points to. * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm: (WebCore::MediaSourcePrivateAVFObjC::~MediaSourcePrivateAVFObjC): Clear the SourceBuffer's backpointer. * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h: (WebCore::SourceBufferPrivateAVFObjC::clearMediaSource): * platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: (WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC): Rename m_parent -> m_mediaSource. (WebCore::SourceBufferPrivateAVFObjC::append): Check m_mediaSource before calling. (WebCore::SourceBufferPrivateAVFObjC::removedFromMediaSource): Ditto. (WebCore::SourceBufferPrivateAVFObjC::readyState): Ditto. (WebCore::SourceBufferPrivateAVFObjC::setReadyState): Ditto. (WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled): Ditto. (WebCore::SourceBufferPrivateAVFObjC::flushAndEnqueueNonDisplayingSamples): Ditto. (WebCore::SourceBufferPrivateAVFObjC::enqueueSample): Ditto. (WebCore::SourceBufferPrivateAVFObjC::setActive): Ditto. * platform/mock/mediasource/MockMediaSourcePrivate.cpp: (WebCore::MockMediaSourcePrivate::~MockMediaSourcePrivate): Clear the SourceBuffer's backpointer. * platform/mock/mediasource/MockSourceBufferPrivate.cpp: (WebCore::MockSourceBufferPrivate::MockSourceBufferPrivate): Rename m_parent -> m_mediaSource. (WebCore::MockSourceBufferPrivate::removedFromMediaSource): Check m_mediaSource before calling. (WebCore::MockSourceBufferPrivate::readyState): Ditto. (WebCore::MockSourceBufferPrivate::setReadyState): Ditto. (WebCore::MockSourceBufferPrivate::setActive): Ditto. * platform/mock/mediasource/MockSourceBufferPrivate.h: (WebCore::MockSourceBufferPrivate::clearMediaSource): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm trunk/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp trunk/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp trunk/Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.h Diff Modified: trunk/Source/WebCore/ChangeLog (160280 => 160281) --- trunk/Source/WebCore/ChangeLog 2013-12-08 06:17:18 UTC (rev 160280) +++ trunk/Source/WebCore/ChangeLog 2013-12-08 06:39:39 UTC (rev 160281) @@ -1,3 +1,45 @@ +2013-12-04 Jer Noble + +[MSE][Mac] Crash when removing MediaSource from HTMLMediaElement. +https://bugs.webkit.org/show_bug.cgi?id=125269 + +Reviewed by Sam Weinig. + +Fixes the media/media-source/media-source-fastseek.html test when run with MallocScribble enabled. + +It's possible for a SourceBufferPrivateAVFObjC to outlive its MediaSourcePrivateAVFObjC, so +make sure to clear the pointer from the former to the latter when the latter is destroyed. +That means we now have to check to see if the pointer to the latter is still valid at every +call site. + +As a drive-by fix, rename m_parent to m_mediaSource to more accurately reflect what the pointer +points to. + +* platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm: +(WebCore::MediaSourcePrivateAVFObjC::~MediaSourcePrivateAVFObjC): Clear the SourceBuffer's backpointer. +* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.h: +(WebCore::SourceBufferPrivateAVFObjC::clearMediaSource): +* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm: +(WebCore::SourceBufferPrivateAVFObjC::SourceBufferPrivateAVFObjC): Rename m_parent -> m_mediaSource. +(WebCore::SourceBufferPrivateAVFObjC::append): Check m_mediaSource before calling. +(WebCore::SourceBufferPrivateAVFObjC::removedFromMediaSource): Ditto. +(WebCore::SourceBufferPrivateAVFObjC::readyState): Ditto. +(WebCore::SourceBufferPrivateAVFObjC::setReadyState): Ditto. +(WebCore::SourceBufferPrivateAVFObjC::trackDidChangeEnabled): Ditto. +(WebCore::SourceBufferPrivateAVFObjC::flushAndEnqueueNonDisplayingSamples): Ditto. +
[webkit-changes] [160282] trunk
Title: [160282] trunk Revision 160282 Author jer.no...@apple.com Date 2013-12-07 22:43:27 -0800 (Sat, 07 Dec 2013) Log Message [MSE] Bring end-of-stream algorithm section up to current spec. https://bugs.webkit.org/show_bug.cgi?id=125270 Reviewed by Darin Adler. Source/WebCore: Test: media/media-source/media-source-end-of-stream.html Separate the "endOfStream()" method from the "end of stream algorithm". * Modules/mediasource/MediaSource.cpp: (WebCore::SourceBufferIsUpdating): Added predicate function. (WebCore::MediaSource::endOfStream): Call streamEndedWithError(). (WebCore::MediaSource::streamEndedWithError): Added. * Modules/mediasource/MediaSource.h: * Modules/mediasource/SourceBuffer.cpp: (WebCore::SourceBuffer::appendBufferTimerFired): Call streamEndedWithError(). (WebCore::SourceBuffer::sourceBufferPrivateDidReceiveSample): Ditto. * Modules/mediasource/SourceBuffer.h: * html/HTMLMediaElement.cpp: (HTMLMediaElement::mediaLoadingFailedFatally): Renamed from mediaEngineError. (HTMLMediaElement::mediaLoadingFailed): Call renamed method. * html/HTMLMediaElement.h: * platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm: (WebCore::MediaSourcePrivateAVFObjC::markEndOfStream): Set load state to Loaded. * platform/mock/mediasource/MockMediaPlayerMediaSource.cpp: (WebCore::MockMediaPlayerMediaSource::setNetworkState): Simple setter. * platform/mock/mediasource/MockMediaPlayerMediaSource.h: * platform/mock/mediasource/MockMediaSourcePrivate.cpp: (WebCore::MockMediaSourcePrivate::MockMediaSourcePrivate): Set the intitial duration to NaN. (WebCore::MockMediaSourcePrivate::markEndOfStream): Set load state to Loaded. LayoutTests: * media/media-source/media-source-end-of-stream-expected.txt: Added. * media/media-source/media-source-end-of-stream.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp trunk/Source/WebCore/Modules/mediasource/MediaSource.h trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/html/HTMLMediaElement.h trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.h trunk/Source/WebCore/platform/mock/mediasource/MockMediaSourcePrivate.cpp Added Paths trunk/LayoutTests/media/media-source/media-source-end-of-stream-expected.txt trunk/LayoutTests/media/media-source/media-source-end-of-stream.html Diff Modified: trunk/LayoutTests/ChangeLog (160281 => 160282) --- trunk/LayoutTests/ChangeLog 2013-12-08 06:39:39 UTC (rev 160281) +++ trunk/LayoutTests/ChangeLog 2013-12-08 06:43:27 UTC (rev 160282) @@ -1,3 +1,13 @@ +2013-12-05 Jer Noble + +[MSE] Bring end-of-stream algorithm section up to current spec. +https://bugs.webkit.org/show_bug.cgi?id=125270 + +Reviewed by Darin Adler. + +* media/media-source/media-source-end-of-stream-expected.txt: Added. +* media/media-source/media-source-end-of-stream.html: Added. + 2013-12-06 Filip Pizlo FTL should support all of Branch/LogicalNot Added: trunk/LayoutTests/media/media-source/media-source-end-of-stream-expected.txt (0 => 160282) --- trunk/LayoutTests/media/media-source/media-source-end-of-stream-expected.txt (rev 0) +++ trunk/LayoutTests/media/media-source/media-source-end-of-stream-expected.txt 2013-12-08 06:43:27 UTC (rev 160282) @@ -0,0 +1,37 @@ + +RUN(video.src = "" +EVENT(sourceopen) +RUN(source.endOfStream("network")) +EVENT(error) +EXPECTED (video.error.code == '4') OK +RUN(video.src = "" +EVENT(sourceopen) +RUN(source.endOfStream("decode")) +EVENT(error) +EXPECTED (video.error.code == '4') OK +RUN(video.src = "" +EVENT(sourceopen) +RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")) +RUN(sourceBuffer.appendBuffer(initSegment)) +EVENT(updateend) +RUN(source.endOfStream("network")) +EVENT(error) +EXPECTED (video.error.code == '2') OK +RUN(video.src = "" +EVENT(sourceopen) +RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")) +RUN(sourceBuffer.appendBuffer(initSegment)) +EVENT(updateend) +RUN(source.endOfStream("decode")) +EVENT(error) +EXPECTED (video.error.code == '3') OK +RUN(video.src = "" +EVENT(sourceopen) +RUN(sourceBuffer = source.addSourceBuffer("video/mock; codecs=mock")) +RUN(sourceBuffer.appendBuffer(initSegment)) +EVENT(updateend) +RUN(source.endOfStream("")) +EVENT(suspend) +EXPECTED (video.networkState == '1') OK +END OF TEST + Added: trunk/LayoutTests/media/media-source/media-source-end-of-stream.html (0 => 160282) --- trunk/LayoutTests/media/media-source/media-source-end-of-stream.html (rev 0) +++ trunk/LayoutTests/media/media-source/media-source-end-of-stream.htm
[webkit-changes] [160288] trunk/Source/WebCore
Title: [160288] trunk/Source/WebCore Revision 160288 Author carlo...@webkit.org Date 2013-12-08 10:16:04 -0800 (Sun, 08 Dec 2013) Log Message [GTK] Do not generate new dispatch_event methods marked as deprecated https://bugs.webkit.org/show_bug.cgi?id=125416 Reviewed by Gustavo Noronha Silva. * bindings/scripts/CodeGeneratorGObject.pm: (SkipFunction): Skip dispatch_event methods for objects implementing EventTarget interface unless they are already deprecated. (GenerateFunction): Pass also the parentNode to SkipFunction(). Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm Diff Modified: trunk/Source/WebCore/ChangeLog (160287 => 160288) --- trunk/Source/WebCore/ChangeLog 2013-12-08 16:51:28 UTC (rev 160287) +++ trunk/Source/WebCore/ChangeLog 2013-12-08 18:16:04 UTC (rev 160288) @@ -1,3 +1,16 @@ +2013-12-08 Carlos Garcia Campos + +[GTK] Do not generate new dispatch_event methods marked as deprecated +https://bugs.webkit.org/show_bug.cgi?id=125416 + +Reviewed by Gustavo Noronha Silva. + +* bindings/scripts/CodeGeneratorGObject.pm: +(SkipFunction): Skip dispatch_event methods for objects +implementing EventTarget interface unless they are already +deprecated. +(GenerateFunction): Pass also the parentNode to SkipFunction(). + 2013-12-05 Jer Noble [MSE] Bring end-of-stream algorithm section up to current spec. Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (160287 => 160288) --- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-12-08 16:51:28 UTC (rev 160287) +++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-12-08 18:16:04 UTC (rev 160288) @@ -245,6 +245,7 @@ sub SkipFunction { my $object = shift; my $function = shift; +my $parentNode = shift; my $decamelize = shift; my $prefix = shift; @@ -288,6 +289,21 @@ return 1; } +# Skip dispatch_event methods, except the one already deprecated. +if ($parentNode->extendedAttributes->{"EventTarget"} && $function->signature->name eq "dispatchEvent" +&& $functionName ne "webkit_dom_audio_track_list_dispatch_event" +&& $functionName ne "webkit_dom_battery_manager_dispatch_event" +&& $functionName ne "webkit_dom_dom_application_cache_dispatch_event" +&& $functionName ne "webkit_dom_dom_window_dispatch_event" +&& $functionName ne "webkit_dom_node_dispatch_event" +&& $functionName ne "webkit_dom_text_track_cue_dispatch_event" +&& $functionName ne "webkit_dom_text_track_dispatch_event" +&& $functionName ne "webkit_dom_text_track_list_dispatch_event" +&& $functionName ne "webkit_dom_video_track_list_dispatch_event" +&& $functionName ne "webkit_dom_webkit_named_flow_dispatch_event" +&& $functionName ne "webkit_dom_test_event_target_dispatch_event") { +return 1; +} if ($function->signature->name eq "set" and $parentNode->extendedAttributes->{"TypedArray"}) { return 1; @@ -913,7 +929,7 @@ my $decamelize = decamelize($interfaceName); -if (SkipFunction($object, $function, $decamelize, $prefix)) { +if (SkipFunction($object, $function, $parentNode, $decamelize, $prefix)) { return; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160289] trunk/Source/WebCore
Title: [160289] trunk/Source/WebCore Revision 160289 Author carlo...@webkit.org Date 2013-12-08 10:22:29 -0800 (Sun, 08 Dec 2013) Log Message [GTK] Do not skip attributes with only custom setter https://bugs.webkit.org/show_bug.cgi?id=125417 Reviewed by Gustavo Noronha Silva. For attributes with a custom setter, we now generate the code as a read-only attribute with a getter method, unless it also has a custom getter in which case the attribute is skipped. * bindings/gobject/GNUmakefile.am: Generate WebKitDOMMediaController that is now required by an attribute having a custom setter. * bindings/gobject/WebKitDOMCustom.cpp: Remove methods that are now generated. * bindings/gobject/WebKitDOMCustom.h: Ditto. * bindings/gobject/WebKitDOMCustom.symbols: Ditto. * bindings/gobject/webkitdom.symbols: Add new symbols. * bindings/scripts/CodeGeneratorGObject.pm: (SkipAttribute): Do not skip attributes having a custom setter. (GetWriteableProperties): Do not include attributes having a custom setter. (GenerateProperty): Do not return early for attributes having custom setter. (GenerateFunctions): Do not generate setter for attributes having a custom setter. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/bindings/gobject/GNUmakefile.am trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols trunk/Source/WebCore/bindings/gobject/webkitdom.symbols trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm Diff Modified: trunk/Source/WebCore/ChangeLog (160288 => 160289) --- trunk/Source/WebCore/ChangeLog 2013-12-08 18:16:04 UTC (rev 160288) +++ trunk/Source/WebCore/ChangeLog 2013-12-08 18:22:29 UTC (rev 160289) @@ -1,5 +1,31 @@ 2013-12-08 Carlos Garcia Campos +[GTK] Do not skip attributes with only custom setter +https://bugs.webkit.org/show_bug.cgi?id=125417 + +Reviewed by Gustavo Noronha Silva. + +For attributes with a custom setter, we now generate the code as a +read-only attribute with a getter method, unless it also has a +custom getter in which case the attribute is skipped. + +* bindings/gobject/GNUmakefile.am: Generate WebKitDOMMediaController +that is now required by an attribute having a custom setter. +* bindings/gobject/WebKitDOMCustom.cpp: Remove methods that are now generated. +* bindings/gobject/WebKitDOMCustom.h: Ditto. +* bindings/gobject/WebKitDOMCustom.symbols: Ditto. +* bindings/gobject/webkitdom.symbols: Add new symbols. +* bindings/scripts/CodeGeneratorGObject.pm: +(SkipAttribute): Do not skip attributes having a custom setter. +(GetWriteableProperties): Do not include attributes having a +custom setter. +(GenerateProperty): Do not return early for attributes having +custom setter. +(GenerateFunctions): Do not generate setter for attributes having +a custom setter. + +2013-12-08 Carlos Garcia Campos + [GTK] Do not generate new dispatch_event methods marked as deprecated https://bugs.webkit.org/show_bug.cgi?id=125416 Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (160288 => 160289) --- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-12-08 18:16:04 UTC (rev 160288) +++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-12-08 18:22:29 UTC (rev 160289) @@ -207,6 +207,8 @@ DerivedSources/webkitdom/WebKitDOMKeyboardEventPrivate.h \ DerivedSources/webkitdom/WebKitDOMLocation.cpp \ DerivedSources/webkitdom/WebKitDOMLocationPrivate.h \ + DerivedSources/webkitdom/WebKitDOMMediaController.cpp \ + DerivedSources/webkitdom/WebKitDOMMediaControllerPrivate.h \ DerivedSources/webkitdom/WebKitDOMMediaError.cpp \ DerivedSources/webkitdom/WebKitDOMMediaErrorPrivate.h \ DerivedSources/webkitdom/WebKitDOMMediaList.cpp \ @@ -287,6 +289,7 @@ DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.h \ DerivedSources/webkitdom/WebKitDOMCSSStyleSheet.h \ DerivedSources/webkitdom/WebKitDOMCSSValue.h \ + DerivedSources/webkitdom/WebKitDOMMediaController.h \ DerivedSources/webkitdom/WebKitDOMMediaList.h \ DerivedSources/webkitdom/WebKitDOMMediaQueryList.h \ DerivedSources/webkitdom/WebKitDOMStyleMedia.h \ Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp (160288 => 160289) --- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2013-12-08 18:16:04 UTC (rev 160288) +++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2013-12-08 18:22:29 UTC (rev 160289) @@ -20,15 +20,12 @@ #include "WebKitDOMCustom.h" #include "JSMainThreadExecState.h" -#include "WebKitDOMAudioTrackPrivate.h" #include "WebKitDOMHTMLInputElement.h" #include "WebKitDOMHTMLInputElementPrivate.h" #include "WebKitDOMHTMLMediaElementPrivate.h" #include "WebKitDOMHTMLTextAreaElement.h" #include "WebKitDOMHTMLTextAreaElem
[webkit-changes] [160290] trunk/Source/WebKit2
Title: [160290] trunk/Source/WebKit2 Revision 160290 Author commit-qu...@webkit.org Date 2013-12-08 10:26:15 -0800 (Sun, 08 Dec 2013) Log Message [WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM) https://bugs.webkit.org/show_bug.cgi?id=125415 Patch by Brian Holt on 2013-12-08 Reviewed by Gustavo Noronha Silva. * NetworkProcess/NetworkProcess.cpp: * UIProcess/Network/NetworkProcessProxy.cpp: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (160289 => 160290) --- trunk/Source/WebKit2/ChangeLog 2013-12-08 18:22:29 UTC (rev 160289) +++ trunk/Source/WebKit2/ChangeLog 2013-12-08 18:26:15 UTC (rev 160290) @@ -1,3 +1,13 @@ +2013-12-08 Brian Holt + +[WK2] Guard include of SecItemShim.h with ENABLE(SEC_ITEM_SHIM) +https://bugs.webkit.org/show_bug.cgi?id=125415 + +Reviewed by Gustavo Noronha Silva. + +* NetworkProcess/NetworkProcess.cpp: +* UIProcess/Network/NetworkProcessProxy.cpp: + 2013-12-07 Sam Weinig [Cocoa] Make WKWebProcessPlugInController work with WKObject wrapping Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (160289 => 160290) --- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-12-08 18:22:29 UTC (rev 160289) +++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2013-12-08 18:26:15 UTC (rev 160290) @@ -39,7 +39,6 @@ #include "NetworkProcessProxyMessages.h" #include "NetworkResourceLoader.h" #include "RemoteNetworkingContext.h" -#include "SecItemShim.h" #include "StatisticsData.h" #include "WebContextMessages.h" #include "WebCookieManager.h" @@ -48,6 +47,10 @@ #include #include +#if ENABLE(SEC_ITEM_SHIM) +#include "SecItemShim.h" +#endif + using namespace WebCore; namespace WebKit { Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (160289 => 160290) --- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-08 18:22:29 UTC (rev 160289) +++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2013-12-08 18:26:15 UTC (rev 160290) @@ -33,11 +33,14 @@ #include "DownloadProxyMessages.h" #include "NetworkProcessCreationParameters.h" #include "NetworkProcessMessages.h" -#include "SecItemShimProxy.h" #include "WebContext.h" #include "WebProcessMessages.h" #include +#if ENABLE(SEC_ITEM_SHIM) +#include "SecItemShimProxy.h" +#endif + #define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, connection()) using namespace WebCore; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160296] trunk/Source/WebKit2
Title: [160296] trunk/Source/WebKit2 Revision 160296 Author wei...@apple.com Date 2013-12-08 20:11:00 -0800 (Sun, 08 Dec 2013) Log Message [Cocoa] Remove knowledge of the WKView from the WebFullScreenManagerProxy by adding a proper client https://bugs.webkit.org/show_bug.cgi?id=125427 Reviewed by Dan Bernstein. * UIProcess/API/mac/PageClientImpl.h: * UIProcess/API/mac/PageClientImpl.mm: (WebKit::PageClientImpl::fullScreenManagerProxyClient): (WebKit::PageClientImpl::closeFullScreenManager): (WebKit::PageClientImpl::isFullScreen): (WebKit::PageClientImpl::enterFullScreen): (WebKit::PageClientImpl::exitFullScreen): (WebKit::PageClientImpl::beganEnterFullScreen): (WebKit::PageClientImpl::beganExitFullScreen): Implement the new client. * UIProcess/API/mac/WKView.mm: Remove call to setWebView() and do some cleanup. * UIProcess/API/mac/WKViewInternal.h: Convert to property syntax and re-arrange. * UIProcess/PageClient.h: Expose access to the new client. * UIProcess/WebFullScreenManagerProxy.cpp: (WebKit::WebFullScreenManagerProxy::create): (WebKit::WebFullScreenManagerProxy::WebFullScreenManagerProxy): (WebKit::WebFullScreenManagerProxy::invalidate): (WebKit::WebFullScreenManagerProxy::close): (WebKit::WebFullScreenManagerProxy::isFullScreen): (WebKit::WebFullScreenManagerProxy::enterFullScreen): (WebKit::WebFullScreenManagerProxy::exitFullScreen): (WebKit::WebFullScreenManagerProxy::beganEnterFullScreen): (WebKit::WebFullScreenManagerProxy::beganExitFullScreen): * UIProcess/WebFullScreenManagerProxy.h: Use the new client. * UIProcess/WebPageProxy.cpp: Pass the new client. * UIProcess/mac/WebFullScreenManagerProxyMac.mm: Removed. Now goes through the client. * WebKit2.xcodeproj/project.pbxproj: Remove WebFullScreenManagerProxyMac.mm. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h trunk/Source/WebKit2/UIProcess/PageClient.h trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.h trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Removed Paths trunk/Source/WebKit2/UIProcess/mac/WebFullScreenManagerProxyMac.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160295 => 160296) --- trunk/Source/WebKit2/ChangeLog 2013-12-09 01:08:53 UTC (rev 160295) +++ trunk/Source/WebKit2/ChangeLog 2013-12-09 04:11:00 UTC (rev 160296) @@ -1,3 +1,52 @@ +2013-12-08 Sam Weinig + +[Cocoa] Remove knowledge of the WKView from the WebFullScreenManagerProxy by adding a proper client +https://bugs.webkit.org/show_bug.cgi?id=125427 + +Reviewed by Dan Bernstein. + +* UIProcess/API/mac/PageClientImpl.h: +* UIProcess/API/mac/PageClientImpl.mm: +(WebKit::PageClientImpl::fullScreenManagerProxyClient): +(WebKit::PageClientImpl::closeFullScreenManager): +(WebKit::PageClientImpl::isFullScreen): +(WebKit::PageClientImpl::enterFullScreen): +(WebKit::PageClientImpl::exitFullScreen): +(WebKit::PageClientImpl::beganEnterFullScreen): +(WebKit::PageClientImpl::beganExitFullScreen): +Implement the new client. + +* UIProcess/API/mac/WKView.mm: +Remove call to setWebView() and do some cleanup. + +* UIProcess/API/mac/WKViewInternal.h: +Convert to property syntax and re-arrange. + +* UIProcess/PageClient.h: +Expose access to the new client. + +* UIProcess/WebFullScreenManagerProxy.cpp: +(WebKit::WebFullScreenManagerProxy::create): +(WebKit::WebFullScreenManagerProxy::WebFullScreenManagerProxy): +(WebKit::WebFullScreenManagerProxy::invalidate): +(WebKit::WebFullScreenManagerProxy::close): +(WebKit::WebFullScreenManagerProxy::isFullScreen): +(WebKit::WebFullScreenManagerProxy::enterFullScreen): +(WebKit::WebFullScreenManagerProxy::exitFullScreen): +(WebKit::WebFullScreenManagerProxy::beganEnterFullScreen): +(WebKit::WebFullScreenManagerProxy::beganExitFullScreen): +* UIProcess/WebFullScreenManagerProxy.h: +Use the new client. + +* UIProcess/WebPageProxy.cpp: +Pass the new client. + +* UIProcess/mac/WebFullScreenManagerProxyMac.mm: +Removed. Now goes through the client. + +* WebKit2.xcodeproj/project.pbxproj: +Remove WebFullScreenManagerProxyMac.mm. + 2013-12-07 Sam Weinig [Cocoa] Remove webProcessPlugInInitialize: from the WKWebProcessPlugIn protocol Modified: trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h (160295 => 160296) --- trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h 2013-12-09 01:08:53 UTC (rev 160295) +++
[webkit-changes] [160297] trunk/Source/WebKit2
Title: [160297] trunk/Source/WebKit2 Revision 160297 Author wei...@apple.com Date 2013-12-08 20:23:16 -0800 (Sun, 08 Dec 2013) Log Message Fix the iOS build. * UIProcess/API/ios/PageClientImplIOS.h: * UIProcess/API/ios/PageClientImplIOS.mm: * UIProcess/ios/WebFullScreenManagerProxyIOS.mm: Removed. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm Removed Paths trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (160296 => 160297) --- trunk/Source/WebKit2/ChangeLog 2013-12-09 04:11:00 UTC (rev 160296) +++ trunk/Source/WebKit2/ChangeLog 2013-12-09 04:23:16 UTC (rev 160297) @@ -1,5 +1,13 @@ 2013-12-08 Sam Weinig +Fix the iOS build. + +* UIProcess/API/ios/PageClientImplIOS.h: +* UIProcess/API/ios/PageClientImplIOS.mm: +* UIProcess/ios/WebFullScreenManagerProxyIOS.mm: Removed. + +2013-12-08 Sam Weinig + [Cocoa] Remove knowledge of the WKView from the WebFullScreenManagerProxy by adding a proper client https://bugs.webkit.org/show_bug.cgi?id=125427 Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h (160296 => 160297) --- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2013-12-09 04:11:00 UTC (rev 160296) +++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.h 2013-12-09 04:23:16 UTC (rev 160297) @@ -27,18 +27,24 @@ #define PageClientImplIOS_h #import "PageClient.h" +#import "WebFullScreenManagerProxy.h" #import @class WKContentView; namespace WebKit { -class PageClientImpl : public PageClient { +class PageClientImpl : public PageClient +#if ENABLE(FULLSCREEN_API) +, public WebFullScreenManagerProxyClient +#endif +{ public: explicit PageClientImpl(WKContentView *); virtual ~PageClientImpl(); private: +// PageClient virtual std::unique_ptr createDrawingAreaProxy() OVERRIDE; virtual void setViewNeedsDisplay(const WebCore::IntRect&) OVERRIDE; virtual void displayView() OVERRIDE; @@ -102,6 +108,21 @@ virtual void selectionDidChange() OVERRIDE; virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) OVERRIDE; +// Auxiliary Client Creation +#if ENABLE(FULLSCREEN_API) +virual WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() OVERRIDE; +#endif + +#if ENABLE(FULLSCREEN_API) +// WebFullScreenManagerProxyClient +virtual void closeFullScreenManager() OVERRIDE; +virtual bool isFullScreen() OVERRIDE; +virtual void enterFullScreen() OVERRIDE; +virtual void exitFullScreen() OVERRIDE; +virtual void beganEnterFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE; +virtual void beganExitFullScreen(const WebCore::IntRect& initialFrame, const WebCore::IntRect& finalFrame) OVERRIDE; +#endif + WKContentView *m_view; }; } // namespace WebKit Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (160296 => 160297) --- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2013-12-09 04:11:00 UTC (rev 160296) +++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2013-12-09 04:23:16 UTC (rev 160297) @@ -341,4 +341,40 @@ [m_view _stopAssistingNode]; } +#if ENABLE(FULLSCREEN_API) + +WebFullScreenManagerProxyClient& PageClientImpl::fullScreenManagerProxyClient() +{ +return *this; +} + +// WebFullScreenManagerProxyClient + +void PageClientImpl::closeFullScreenManager() +{ +} + +bool PageClientImpl::isFullScreen() +{ +return false; +} + +void PageClientImpl::enterFullScreen() +{ +} + +void PageClientImpl::exitFullScreen() +{ +} + +void PageClientImpl::beganEnterFullScreen(const IntRect&, const IntRect&) +{ +} + +void PageClientImpl::beganExitFullScreen(const IntRect&, const IntRect&) +{ +} + +#endif // ENABLE(FULLSCREEN_API) + } // namespace WebKit Deleted: trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm (160296 => 160297) --- trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm 2013-12-09 04:11:00 UTC (rev 160296) +++ trunk/Source/WebKit2/UIProcess/ios/WebFullScreenManagerProxyIOS.mm 2013-12-09 04:23:16 UTC (rev 160297) @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2010 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
[webkit-changes] [160298] trunk/Tools
Title: [160298] trunk/Tools Revision 160298 Author wei...@apple.com Date 2013-12-08 20:51:32 -0800 (Sun, 08 Dec 2013) Log Message 32-bit MiniBrowser doesn't build https://bugs.webkit.org/show_bug.cgi?id=125420 Reviewed by Dan Bernstein. * MiniBrowser/mac/AppDelegate.h: * MiniBrowser/mac/AppDelegate.m: (-[BrowserAppDelegate init]): (-[BrowserAppDelegate applicationWillTerminate:]): Modified Paths trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/mac/AppDelegate.h trunk/Tools/MiniBrowser/mac/AppDelegate.m Diff Modified: trunk/Tools/ChangeLog (160297 => 160298) --- trunk/Tools/ChangeLog 2013-12-09 04:23:16 UTC (rev 160297) +++ trunk/Tools/ChangeLog 2013-12-09 04:51:32 UTC (rev 160298) @@ -1,3 +1,15 @@ +2013-12-08 Sam Weinig + +32-bit MiniBrowser doesn't build +https://bugs.webkit.org/show_bug.cgi?id=125420 + +Reviewed by Dan Bernstein. + +* MiniBrowser/mac/AppDelegate.h: +* MiniBrowser/mac/AppDelegate.m: +(-[BrowserAppDelegate init]): +(-[BrowserAppDelegate applicationWillTerminate:]): + 2013-12-08 Brian Holt [WK2] Add ENABLE_NETWORK_PROCESS flag Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (160297 => 160298) --- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2013-12-09 04:23:16 UTC (rev 160297) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2013-12-09 04:51:32 UTC (rev 160298) @@ -23,10 +23,13 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#import + @interface BrowserAppDelegate : NSObject { +#if WK_API_ENABLED WKProcessGroup *_processGroup; WKBrowsingContextGroup *_browsingContextGroup; - +#endif NSMutableSet *_browserWindows; } Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (160297 => 160298) --- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-09 04:23:16 UTC (rev 160297) +++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2013-12-09 04:51:32 UTC (rev 160298) @@ -45,8 +45,10 @@ { self = [super init]; if (self) { +#if WK_API_ENABLED _processGroup = [[WKProcessGroup alloc] init]; _browsingContextGroup = [[WKBrowsingContextGroup alloc] initWithIdentifier:@"MiniBrowser"]; +#endif _browserWindows = [[NSMutableSet alloc] init]; } @@ -92,11 +94,13 @@ [controller applicationTerminating]; } +#if WK_API_ENABLED [_processGroup release]; _processGroup = nil; [_browsingContextGroup release]; _browsingContextGroup = nil; +#endif } - (BrowserWindowController *)frontmostBrowserWindowController ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [160299] trunk
Title: [160299] trunk Revision 160299 Author rn...@webkit.org Date 2013-12-08 21:13:49 -0800 (Sun, 08 Dec 2013) Log Message getComputedStyle border-radius shorthand omits vertical radius information https://bugs.webkit.org/show_bug.cgi?id=125394 Reviewed by Andreas Kling. Source/WebCore: Merge https://chromium.googlesource.com/chromium/blink/+/4c2866855dddbb28bb7d978ad627acc368af23d0 getComputedStyle of border-radius shows the vertical radius components if they differ from their horizontal counterpants. We were incorrectly detecting this case and over simplifying the results of getComputedStyle. This patch ensures we only hide the vertical values if they are identical to the horizontal values. * css/CSSComputedStyleDeclaration.cpp: (WebCore::getBorderRadiusShorthandValue): LayoutTests: * fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt: * fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp Diff Modified: trunk/LayoutTests/ChangeLog (160298 => 160299) --- trunk/LayoutTests/ChangeLog 2013-12-09 04:51:32 UTC (rev 160298) +++ trunk/LayoutTests/ChangeLog 2013-12-09 05:13:49 UTC (rev 160299) @@ -1,3 +1,13 @@ +2013-12-08 Ryosuke Niwa + +getComputedStyle border-radius shorthand omits vertical radius information +https://bugs.webkit.org/show_bug.cgi?id=125394 + +Reviewed by Andreas Kling. + +* fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt: +* fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand.html: + 2013-12-08 Zan Dobersek Unreviewed GTK gardening. Modified: trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt (160298 => 160299) --- trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt 2013-12-09 04:51:32 UTC (rev 160298) +++ trunk/LayoutTests/fast/css/getComputedStyle/getComputedStyle-border-radius-shorthand-expected.txt 2013-12-09 05:13:49 UTC (rev 160299) @@ -83,6 +83,38 @@ PASS computedStyle.getPropertyCSSValue('border-bottom-right-radius').cssText is '4px 7px' PASS computedStyle.getPropertyCSSValue('border-bottom-left-radius').cssText is '6px 8px' PASS checkComputedStyleValue() is true +PASS computedStyle.getPropertyValue('border-radius') is '10px 20px 30px 40px / 15px 25px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-radius').toString() is '[object CSSValueList]' +PASS computedStyle.getPropertyCSSValue('border-radius').cssText is '10px 20px 30px 40px / 15px 25px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-top-left-radius').cssText is '10px 15px' +PASS computedStyle.getPropertyCSSValue('border-top-right-radius').cssText is '20px 25px' +PASS computedStyle.getPropertyCSSValue('border-bottom-right-radius').cssText is '30px 35px' +PASS computedStyle.getPropertyCSSValue('border-bottom-left-radius').cssText is '40px 45px' +PASS checkComputedStyleValue() is true +PASS computedStyle.getPropertyValue('border-radius') is '10px 20px 30px 40px / 10px 25px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-radius').toString() is '[object CSSValueList]' +PASS computedStyle.getPropertyCSSValue('border-radius').cssText is '10px 20px 30px 40px / 10px 25px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-top-left-radius').cssText is '10px' +PASS computedStyle.getPropertyCSSValue('border-top-right-radius').cssText is '20px 25px' +PASS computedStyle.getPropertyCSSValue('border-bottom-right-radius').cssText is '30px 35px' +PASS computedStyle.getPropertyCSSValue('border-bottom-left-radius').cssText is '40px 45px' +PASS checkComputedStyleValue() is true +PASS computedStyle.getPropertyValue('border-radius') is '10px 20px 30px 40px / 10px 20px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-radius').toString() is '[object CSSValueList]' +PASS computedStyle.getPropertyCSSValue('border-radius').cssText is '10px 20px 30px 40px / 10px 20px 35px 45px' +PASS computedStyle.getPropertyCSSValue('border-top-left-radius').cssText is '10px' +PASS computedStyle.getPropertyCSSValue('border-top-right-radius').cssText is '20px' +PASS computedStyle.getPropertyCSSValue('border-bottom-right-radius').cssText is '30px 35px' +PASS computedStyle.getPropertyCSSValue('border-bottom-left-radius').cssText is '40px 45px' +PASS checkComputedStyleValue() is true +PASS computedStyle.getPropertyValue('border-radius') is '10px 20px 30px 40px / 10px 20px 30px 45px' +PASS computedStyle.getPropertyCSSValue('border-radius').toString() is '[object CSSValueList]' +PASS computedStyle.getPropertyCSSValue('border-radius').cssText
[webkit-changes] [160300] trunk/Source/WebKit2
Title: [160300] trunk/Source/WebKit2 Revision 160300 Author wei...@apple.com Date 2013-12-08 21:44:17 -0800 (Sun, 08 Dec 2013) Log Message Remove WebContext::sharedProcessContext() https://bugs.webkit.org/show_bug.cgi?id=125437 Reviewed by Dan Bernstein. * UIProcess/API/ios/WKGeolocationProviderIOS.mm: * UIProcess/WebContext.cpp: * UIProcess/WebContext.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm trunk/Source/WebKit2/UIProcess/WebContext.cpp trunk/Source/WebKit2/UIProcess/WebContext.h Diff Modified: trunk/Source/WebKit2/ChangeLog (160299 => 160300) --- trunk/Source/WebKit2/ChangeLog 2013-12-09 05:13:49 UTC (rev 160299) +++ trunk/Source/WebKit2/ChangeLog 2013-12-09 05:44:17 UTC (rev 160300) @@ -1,5 +1,16 @@ 2013-12-08 Sam Weinig +Remove WebContext::sharedProcessContext() +https://bugs.webkit.org/show_bug.cgi?id=125437 + +Reviewed by Dan Bernstein. + +* UIProcess/API/ios/WKGeolocationProviderIOS.mm: +* UIProcess/WebContext.cpp: +* UIProcess/WebContext.h: + +2013-12-08 Sam Weinig + Fix the iOS build. * UIProcess/API/ios/PageClientImplIOS.h: Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm (160299 => 160300) --- trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-09 05:13:49 UTC (rev 160299) +++ trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-09 05:44:17 UTC (rev 160300) @@ -139,7 +139,8 @@ -(id)init { ASSERT_NOT_REACHED(); -return [self initWithContext:(WebContext::sharedProcessContext())]; +[self release]; +return nil; } -(id)initWithContext:(WebContext*)context Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160299 => 160300) --- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-09 05:13:49 UTC (rev 160299) +++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-09 05:44:17 UTC (rev 160300) @@ -123,14 +123,6 @@ return contexts(); } -#if PLATFORM(IOS) -WebContext* WebContext::sharedProcessContext() -{ -static WKContextRef sharedContextRef = WKContextCreate(); -return toImpl(sharedContextRef); -} -#endif - WebContext::WebContext(const String& injectedBundlePath) : m_processModel(ProcessModelSharedSecondaryProcess) , m_webProcessCountLimit(UINT_MAX) Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (160299 => 160300) --- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-09 05:13:49 UTC (rev 160299) +++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-09 05:44:17 UTC (rev 160300) @@ -101,10 +101,6 @@ static PassRefPtr create(const String& injectedBundlePath); virtual ~WebContext(); -#if PLATFORM(IOS) -static WebContext *sharedProcessContext(); -#endif - static const Vector& allContexts(); template ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes