media/video-currentTime.html flakey
https://bugs.webkit.org/show_bug.cgi?id=118198

Reviewed by Jessie Berlin.

Update video-currentTime.html so that it listens for timeupdate events, and ends the test
after the first one with a >0 currentTime. Add a 3s watchdog for the failure case.

* media/video-currentTime-expected.txt:
* media/video-currentTime.html:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152184 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-webkit-line-break: after-white-space sometimes truncates DOM on copy & paste
https://bugs.webkit.org/show_bug.cgi?id=118164

Reviewed by Sam Weinig.

Source/WebCore:

We can't assume that all subsequent ancestors contain exactly one child since they could have been
added in the first if statement matching: currentNode->parentNode() != rootNode && isRemovableBlock(currentNode)

Exit early when we encounter such an ancestor since removing its ancestor (that contains multiple children
some of which aren't in nodesToRemove) can clobber more nodes than we're allowed to remove.

Test: editing/pasteboard/simplfiying-markup-should-not-strip-content.html

* editing/SimplifyMarkupCommand.cpp:
(WebCore::SimplifyMarkupCommand::doApply):
(WebCore::SimplifyMarkupCommand::pruneSubsequentAncestorsToRemove):

LayoutTests:

Add a regression test.

* editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt: Added.
* editing/pasteboard/simplfiying-markup-should-not-strip-content.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152185 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Upstream WebKit Nightly’s WebKitLauncher
https://bugs.webkit.org/show_bug.cgi?id=117418

Reviewed by Mark Rowe.

Literal patch from Nightly's OpenSource repo.

* WebKitLauncher/Configurations/Base.xcconfig:
* WebKitLauncher/Configurations/WebKitLauncher.xcconfig:
* WebKitLauncher/Info.plist:
* WebKitLauncher/WebKitLauncher.xcodeproj/project.pbxproj:
* WebKitLauncher/WebKitLauncherURLProtocol.m:
(+[WebKitLauncherURLProtocol load]):
(+[WebKitLauncherURLProtocol canInitWithRequest:]):
(-[WebKitLauncherURLProtocol startLoading]):
(-[WebKitLauncherURLProtocol handleWebKitVersionInformation]):
(-[WebKitLauncherURLProtocol resourceNotFound]):
* WebKitLauncher/WebKitNightlyEnablerSparkle.m:
(initializeSparkle):
* WebKitLauncher/main.m:
(determineExecutablePath):
(currentMacOSXVersion):
(main):
* WebKitLauncher/start.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152186 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Stale occlusion state after moving page back into window
https://bugs.webkit.org/show_bug.cgi?id=118202

Reviewed by Anders Carlsson.
        
We need to update the occlusion state when the page goes back into the window.

* UIProcess/API/mac/WKView.mm:
(-[WKView viewDidMoveToWindow]):
    - update occlusion state.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152187 268f45cc-cd09-0410-ab3c-d52691b4dbfc