[webkit-changes] [186591] branches/safari-600.1.4.17-branch

[ddkilzer]

Title: [186591] branches/safari-600.1.4.17-branch








Revision 186591
Author ddkil...@apple.com
Date 2015-07-09 07:41:30 -0700 (Thu, 09 Jul 2015)


Log Message
Merged r184151, and a small part of r183813.  rdar://problem/21716549

Modified Paths

branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.17-branch/Source/WebCore/loader/DocumentLoader.cpp
branches/safari-600.1.4.17-branch/Source/WebCore/loader/FrameLoaderClient.h
branches/safari-600.1.4.17-branch/Source/WebKit2/ChangeLog
branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/FrameLoadState.h
branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-600.1.4.17-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-600.1.4.17-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-600.1.4.17-branch/Tools/ChangeLog
branches/safari-600.1.4.17-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

branches/safari-600.1.4.17-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ProvisionalURLChange.mm




Diff

Modified: branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog (186590 => 186591)

--- branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog	2015-07-09 08:58:49 UTC (rev 186590)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/ChangeLog	2015-07-09 14:41:30 UTC (rev 186591)
@@ -1,3 +1,33 @@
+2015-07-09  David Kilzer  ddkil...@apple.com
+
+rdar://problem/21716549 Donner: Safari URL And _javascript_ Prompt Origin Spoof Vulnerability
+
+Merge r184151.
+
+2015-05-11  Dan Bernstein  m...@apple.com
+
+WebCore part of rdar://problem/20878075 Trying to navigate to an invalid URL loads about:blank, but -[WKWebView URL] returns the invalid URL
+
+Reviewed by Alexey Proskuryakov.
+
+Test: TestWebKitAPI/Tests/WebKit2Cocoa/ProvisionalURLChange.mm
+
+In some cases, trying to navigate to an invalid URL results in navigation to about:blank.
+When the about:blank load is committed, the UI process still thinks that the provisional
+URL is the original, invalid URL, and updates its state to reflect that that’s the URL that
+has been committed.
+
+The provisional URL changes (1) when a provisional load begins, (2) when a server redirect
+happens, (3) when the client changes the request in willSendRequest, and (4) in this
+about:blank case. For (1) and (2), there are frame loader client callbacks. (3) is client-
+initiated. So this patch addresses (4).
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::maybeLoadEmpty): If our request URL is changing to about:blank and
+while loading the main resource, call FrameLoaderClient::dispatchDidChangeProvisionalURL.
+* loader/FrameLoaderClient.h: Added dispatchDidChangeProvisionalURL with an empty
+implementation.
+
 2015-07-08  Lucas Forschler  lforsch...@apple.com
 
 Merge r186165. rdar://problem/21533207


Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/DocumentLoader.cpp (186590 => 186591)

--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 08:58:49 UTC (rev 186590)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 14:41:30 UTC (rev 186591)
@@ -1389,8 +1389,12 @@
 if (!shouldLoadEmpty  !frameLoader()-client().representationExistsForURLScheme(m_request.url().protocol()))
 return false;
 
-if (m_request.url().isEmpty()  !frameLoader()-stateMachine().creatingInitialEmptyDocument())
+if (m_request.url().isEmpty()  !frameLoader()-stateMachine().creatingInitialEmptyDocument()) {
 m_request.setURL(blankURL());
+if (isLoadingMainResource())
+frameLoader()-client().dispatchDidChangeProvisionalURL();
+}
+
 String mimeType = shouldLoadEmpty ? text/html : frameLoader()-client().generatedMIMETypeForURLScheme(m_request.url().protocol());
 m_response = ResourceResponse(m_request.url(), mimeType, 0, String(), String());
 finishedLoading(monotonicallyIncreasingTime());


Modified: branches/safari-600.1.4.17-branch/Source/WebCore/loader/FrameLoaderClient.h (186590 => 186591)

--- branches/safari-600.1.4.17-branch/Source/WebCore/loader/FrameLoaderClient.h	2015-07-09 08:58:49 UTC (rev 186590)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/loader/FrameLoaderClient.h	2015-07-09 14:41:30 UTC (rev 186591)
@@ -153,6 +153,7 @@
 
 virtual void dispatchDidHandleOnloadEvents() = 0;
 virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
+virtual void dispatchDidChangeProvisionalURL() { }
 virtual void dispatchDidCancelClientRedirect() = 0;
 

[webkit-changes] [186592] trunk/Source/WebCore

[darin]

Title: [186592] trunk/Source/WebCore








Revision 186592
Author da...@apple.com
Date 2015-07-09 08:27:43 -0700 (Thu, 09 Jul 2015)


Log Message
REGRESSION (r182866): repeated prompts for password on internal Apple website using workers
https://bugs.webkit.org/show_bug.cgi?id=146769

Reviewed by Sam Weinig.

Not sure how to make a regression test for this. Sure would be nice to have one though.

* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Added. Calls through to the
base class copy constructor to copy data members of the base class (the lack of this was
the bug). Also initializes all the data members of this class.
(WebCore::ThreadableLoaderOptions::isolatedCopy): Changed to call the constructor above.

* loader/ThreadableLoader.h: Added new constructor.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/ThreadableLoader.cpp
trunk/Source/WebCore/loader/ThreadableLoader.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186591 => 186592)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 14:41:30 UTC (rev 186591)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 15:27:43 UTC (rev 186592)
@@ -1,3 +1,20 @@
+2015-07-09  Darin Adler  da...@apple.com
+
+REGRESSION (r182866): repeated prompts for password on internal Apple website using workers
+https://bugs.webkit.org/show_bug.cgi?id=146769
+
+Reviewed by Sam Weinig.
+
+Not sure how to make a regression test for this. Sure would be nice to have one though.
+
+* loader/ThreadableLoader.cpp:
+(WebCore::ThreadableLoaderOptions::ThreadableLoaderOptions): Added. Calls through to the
+base class copy constructor to copy data members of the base class (the lack of this was
+the bug). Also initializes all the data members of this class.
+(WebCore::ThreadableLoaderOptions::isolatedCopy): Changed to call the constructor above.
+
+* loader/ThreadableLoader.h: Added new constructor.
+
 2015-07-09  Chris Fleizach  cfleiz...@apple.com
 
 AX: VoiceOver cannot get to any content in Yahoo Mail messages table


Modified: trunk/Source/WebCore/loader/ThreadableLoader.cpp (186591 => 186592)

--- trunk/Source/WebCore/loader/ThreadableLoader.cpp	2015-07-09 14:41:30 UTC (rev 186591)
+++ trunk/Source/WebCore/loader/ThreadableLoader.cpp	2015-07-09 15:27:43 UTC (rev 186592)
@@ -51,15 +51,22 @@
 {
 }
 
+ThreadableLoaderOptions::ThreadableLoaderOptions(const ResourceLoaderOptions baseOptions, PreflightPolicy preflightPolicy, CrossOriginRequestPolicy crossOriginRequestPolicy, RefPtrSecurityOrigin securityOrigin, String initiator)
+: ResourceLoaderOptions(baseOptions)
+, preflightPolicy(preflightPolicy)
+, crossOriginRequestPolicy(crossOriginRequestPolicy)
+, securityOrigin(WTF::move(securityOrigin))
+, initiator(WTF::move(initiator))
+{
+}
+
 std::unique_ptrThreadableLoaderOptions ThreadableLoaderOptions::isolatedCopy() const
 {
-std::unique_ptrThreadableLoaderOptions copy = std::make_uniqueThreadableLoaderOptions();
-copy-preflightPolicy = preflightPolicy;
-copy-crossOriginRequestPolicy = crossOriginRequestPolicy;
+RefPtrSecurityOrigin securityOriginCopy;
 if (securityOrigin)
-copy-securityOrigin = securityOrigin-isolatedCopy();
-copy-initiator = initiator.isolatedCopy();
-return copy;
+securityOriginCopy = securityOrigin-isolatedCopy();
+return std::make_uniqueThreadableLoaderOptions(*this, preflightPolicy, crossOriginRequestPolicy,
+WTF::move(securityOriginCopy), initiator.isolatedCopy());
 }
 
 PassRefPtrThreadableLoader ThreadableLoader::create(ScriptExecutionContext* context, ThreadableLoaderClient* client, const ResourceRequest request, const ThreadableLoaderOptions options)


Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (186591 => 186592)

--- trunk/Source/WebCore/loader/ThreadableLoader.h	2015-07-09 14:41:30 UTC (rev 186591)
+++ trunk/Source/WebCore/loader/ThreadableLoader.h	2015-07-09 15:27:43 UTC (rev 186592)
@@ -59,8 +59,9 @@
 PreventPreflight
 };
 
-struct ThreadableLoaderOptions : public ResourceLoaderOptions {
+struct ThreadableLoaderOptions : ResourceLoaderOptions {
 ThreadableLoaderOptions();
+ThreadableLoaderOptions(const ResourceLoaderOptions, PreflightPolicy, CrossOriginRequestPolicy, RefPtrSecurityOrigin, String initiator);
 ~ThreadableLoaderOptions();
 
 std::unique_ptrThreadableLoaderOptions isolatedCopy() const;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186593] trunk/Source/WebCore

[mrajca]

Title: [186593] trunk/Source/WebCore








Revision 186593
Author mra...@apple.com
Date 2015-07-09 09:26:33 -0700 (Thu, 09 Jul 2015)


Log Message
Media Session: report to chrome client 'hasActiveMediaElements' changes
https://bugs.webkit.org/show_bug.cgi?id=146745

Reviewed by Eric Carlson.

* Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper
  method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.
(WebCore::MediaSession::removeMediaElement):
(WebCore::MediaSession::changeActiveMediaElements):
(WebCore::MediaSession::addActiveMediaElement):
(WebCore::MediaSession::releaseSession):
* Modules/mediasession/MediaSession.h:
* Modules/mediasession/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::hasActiveMediaElements):
* Modules/mediasession/MediaSessionManager.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp
trunk/Source/WebCore/Modules/mediasession/MediaSession.h
trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.cpp
trunk/Source/WebCore/Modules/mediasession/MediaSessionManager.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186592 => 186593)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 16:26:33 UTC (rev 186593)
@@ -1,3 +1,21 @@
+2015-07-08  Matt Rajca  mra...@apple.com
+
+Media Session: report to chrome client 'hasActiveMediaElements' changes
+https://bugs.webkit.org/show_bug.cgi?id=146745
+
+Reviewed by Eric Carlson.
+
+* Modules/mediasession/MediaSession.cpp: All updates to active media elements are now funneled through a helper
+  method that will invoke the 'hasMediaSessionWithActiveMediaElementsDidChange' callback when necessary.
+(WebCore::MediaSession::removeMediaElement):
+(WebCore::MediaSession::changeActiveMediaElements):
+(WebCore::MediaSession::addActiveMediaElement):
+(WebCore::MediaSession::releaseSession):
+* Modules/mediasession/MediaSession.h:
+* Modules/mediasession/MediaSessionManager.cpp:
+(WebCore::MediaSessionManager::hasActiveMediaElements):
+* Modules/mediasession/MediaSessionManager.h:
+
 2015-07-09  Darin Adler  da...@apple.com
 
 REGRESSION (r182866): repeated prompts for password on internal Apple website using workers


Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (186592 => 186593)

--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp	2015-07-09 15:27:43 UTC (rev 186592)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp	2015-07-09 16:26:33 UTC (rev 186593)
@@ -115,14 +115,33 @@
 ASSERT(m_participatingElements.contains(element));
 m_participatingElements.remove(element);
 
-m_activeParticipatingElements.remove(element);
+changeActiveMediaElements([]() {
+m_activeParticipatingElements.remove(element);
+});
+
 if (m_iteratedActiveParticipatingElements)
 m_iteratedActiveParticipatingElements-remove(element);
 }
 
+void MediaSession::changeActiveMediaElements(std::functionvoid(void) worker)
+{
+if (Page *page = m_document.page()) {
+bool hadActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+
+worker();
+
+bool hasActiveMediaElements = MediaSessionManager::singleton().hasActiveMediaElements();
+if (hadActiveMediaElements != hasActiveMediaElements)
+page-chrome().client().hasMediaSessionWithActiveMediaElementsDidChange(hasActiveMediaElements);
+} else
+worker();
+}
+
 void MediaSession::addActiveMediaElement(HTMLMediaElement element)
 {
-m_activeParticipatingElements.add(element);
+changeActiveMediaElements([]() {
+m_activeParticipatingElements.add(element);
+});
 }
 
 bool MediaSession::isMediaElementActive(HTMLMediaElement element)
@@ -130,7 +149,7 @@
 return m_activeParticipatingElements.contains(element);
 }
 
-bool MediaSession::hasActiveMediaElements()
+bool MediaSession::hasActiveMediaElements() const
 {
 return !m_activeParticipatingElements.isEmpty();
 }
@@ -171,8 +190,10 @@
 // 1. Let media session be the current media session.
 // 2. Indefinitely pause all of media session's active participating media elements.
 // 3. Reset media session's active participating media elements to an empty list.
-while (!m_activeParticipatingElements.isEmpty())
-m_activeParticipatingElements.takeAny()-pause();
+changeActiveMediaElements([]() {
+while (!m_activeParticipatingElements.isEmpty())
+m_activeParticipatingElements.takeAny()-pause();
+});
 
 // 4. Run the media session release algorithm for media session.
 releaseInternal();


Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.h (186592 => 186593)

--- 

[webkit-changes] [186597] trunk

[achristensen]

Title: [186597] trunk








Revision 186597
Author achristen...@apple.com
Date 2015-07-09 11:36:29 -0700 (Thu, 09 Jul 2015)


Log Message
[Content Extensions] Prevent crashes with plugins.
https://bugs.webkit.org/show_bug.cgi?id=146705
rdar://problem/20855444

Reviewed by Brady Eidson.

Source/WebCore:

* loader/NetscapePlugInStreamLoader.cpp:
(WebCore::NetscapePlugInStreamLoader::create):
Call addPlugInStreamLoader in ResourceLoader::willSendRequest to always add blocked loads.
* loader/NetscapePlugInStreamLoader.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::willSendRequest):
Removed unnecessary early returns.
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::isPlugInStreamLoader):

LayoutTests:

* http/tests/contentextensions/plugin-doesnt-crash-expected.txt: Copied from http/tests/plugins/get-url-expected.txt.
* http/tests/contentextensions/plugin-doesnt-crash.html: Copied from http/tests/plugins/get-url.html.
* http/tests/contentextensions/plugin-doesnt-crash.html.json: Added.
* http/tests/contentextensions/resources/load-me-1.txt: Copied from http/tests/plugins/resources/load-me-1.txt.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.cpp
trunk/Source/WebCore/loader/NetscapePlugInStreamLoader.h
trunk/Source/WebCore/loader/ResourceLoader.cpp
trunk/Source/WebCore/loader/ResourceLoader.h


Added Paths

trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt
trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html
trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json
trunk/LayoutTests/http/tests/contentextensions/resources/load-me-1.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (186596 => 186597)

--- trunk/LayoutTests/ChangeLog	2015-07-09 18:34:42 UTC (rev 186596)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 18:36:29 UTC (rev 186597)
@@ -1,3 +1,16 @@
+2015-07-09  Alex Christensen  achristen...@webkit.org
+
+[Content Extensions] Prevent crashes with plugins.
+https://bugs.webkit.org/show_bug.cgi?id=146705
+rdar://problem/20855444
+
+Reviewed by Brady Eidson.
+
+* http/tests/contentextensions/plugin-doesnt-crash-expected.txt: Copied from http/tests/plugins/get-url-expected.txt.
+* http/tests/contentextensions/plugin-doesnt-crash.html: Copied from http/tests/plugins/get-url.html.
+* http/tests/contentextensions/plugin-doesnt-crash.html.json: Added.
+* http/tests/contentextensions/resources/load-me-1.txt: Copied from http/tests/plugins/resources/load-me-1.txt.
+
 2015-07-09  Brent Fulgham  bfulg...@apple.com
 
 [Win] Skip canvas/philip/tests/2d.text.draw.fontface.notinpage.html


Copied: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt (from rev 186595, trunk/LayoutTests/http/tests/plugins/get-url-expected.txt) (0 => 186597)

--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt	(rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash-expected.txt	2015-07-09 18:36:29 UTC (rev 186597)
@@ -0,0 +1,2 @@
+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/plugin-doesnt-crash.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/load-me-1.txt
+This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds. 


Copied: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html (from rev 186595, trunk/LayoutTests/http/tests/plugins/get-url.html) (0 => 186597)

--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html	(rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html	2015-07-09 18:36:29 UTC (rev 186597)
@@ -0,0 +1,19 @@
+html
+body
+This tests that NPN_GetURLNotify works as expected and does not ASSERT intermittently in debug builds.
+embed name=plg type=application/x-webkit-test-netscape/embed
+script
+function notify()
+{
+if (window.testRunner)
+testRunner.notifyDone();
+}
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+plg.getURLNotify(resources/load-me-1.txt, null, notify);
+/script
+/body
+/html


Added: trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json (0 => 186597)

--- trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json	(rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/plugin-doesnt-crash.html.json	2015-07-09 18:36:29 UTC (rev 186597)
@@ -0,0 +1,10 @@
+[
+{
+action: {
+type: block
+},
+trigger: {
+url-filter: load-me
+}
+}
+]


Copied: trunk/LayoutTests/http/tests/contentextensions/resources/load-me-1.txt (from rev 186595, 

[webkit-changes] [186595] trunk/LayoutTests

[cfleizach]

Title: [186595] trunk/LayoutTests








Revision 186595
Author cfleiz...@apple.com
Date 2015-07-09 11:16:36 -0700 (Thu, 09 Jul 2015)


Log Message
AX: VoiceOver cannot get to any content in Yahoo Mail messages table
https://bugs.webkit.org/show_bug.cgi?id=146674

Unreviewed. Skip a test on windows that needs more WKTR and DRT implementations.

* platform/win/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (186594 => 186595)

--- trunk/LayoutTests/ChangeLog	2015-07-09 18:09:47 UTC (rev 186594)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 18:16:36 UTC (rev 186595)
@@ -3,6 +3,15 @@
 AX: VoiceOver cannot get to any content in Yahoo Mail messages table
 https://bugs.webkit.org/show_bug.cgi?id=146674
 
+Unreviewed. Skip a test on windows that needs more WKTR and DRT implementations.
+
+* platform/win/TestExpectations:
+
+2015-07-09  Chris Fleizach  cfleiz...@apple.com
+
+AX: VoiceOver cannot get to any content in Yahoo Mail messages table
+https://bugs.webkit.org/show_bug.cgi?id=146674
+
 Reviewed by Darin Adler.
 
 * accessibility/aria-table-with-presentational-elements-expected.txt: Added.


Modified: trunk/LayoutTests/platform/win/TestExpectations (186594 => 186595)

--- trunk/LayoutTests/platform/win/TestExpectations	2015-07-09 18:09:47 UTC (rev 186594)
+++ trunk/LayoutTests/platform/win/TestExpectations	2015-07-09 18:16:36 UTC (rev 186595)
@@ -1264,6 +1264,7 @@
 
 # Missing cellForColumnAndRow implementation in DRT
 webkit.org/b/143081 accessibility/table-cell-display-block.html [ Skip ]
+accessibility/aria-table-with-presentational-elements.html [ Skip ]
 
 # Accessibility tests for notifications that don't exist or aren't needed on Mac OS X (or Windows)
 accessibility/aria-checkbox-sends-notification.html [ Skip ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186599] trunk/Source/WebCore

[achristensen]

Title: [186599] trunk/Source/WebCore








Revision 186599
Author achristen...@apple.com
Date 2015-07-09 11:40:34 -0700 (Thu, 09 Jul 2015)


Log Message
[WinCairo] ClearType should be enabled on Cairo port
https://bugs.webkit.org/show_bug.cgi?id=145492

Patch by Karlen Simonyan szkar...@gmail.com on 2015-07-09
Reviewed by Brent Fulgham.

* platform/graphics/win/FontPlatformDataCairoWin.cpp:
(WebCore::FontPlatformData::FontPlatformData):
Use CAIRO_ANTIALIAS_BEST instead of CAIRO_ANTIALIAS_GRAY.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186598 => 186599)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 18:38:39 UTC (rev 186598)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 18:40:34 UTC (rev 186599)
@@ -1,3 +1,14 @@
+2015-07-09  Karlen Simonyan  szkar...@gmail.com
+
+[WinCairo] ClearType should be enabled on Cairo port
+https://bugs.webkit.org/show_bug.cgi?id=145492
+
+Reviewed by Brent Fulgham.
+
+* platform/graphics/win/FontPlatformDataCairoWin.cpp:
+(WebCore::FontPlatformData::FontPlatformData):
+Use CAIRO_ANTIALIAS_BEST instead of CAIRO_ANTIALIAS_GRAY.
+
 2015-07-02  Chris Fleizach  cfleiz...@apple.com
 
 AX: details element should allow expand/close through AX API


Modified: trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp (186598 => 186599)

--- trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp	2015-07-09 18:38:39 UTC (rev 186598)
+++ trunk/Source/WebCore/platform/graphics/win/FontPlatformDataCairoWin.cpp	2015-07-09 18:40:34 UTC (rev 186599)
@@ -77,7 +77,7 @@
// We force antialiasing and disable hinting to provide consistent
// typographic qualities for custom fonts on all platforms.
cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
-   cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY);
+   cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_BEST);
 
 if (syntheticOblique()) {
 static const float syntheticObliqueSkew = -tanf(14 * acosf(0) / 90);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186598] trunk

[cfleizach]

Title: [186598] trunk








Revision 186598
Author cfleiz...@apple.com
Date 2015-07-09 11:38:39 -0700 (Thu, 09 Jul 2015)


Log Message
AX: details element should allow expand/close through AX API
https://bugs.webkit.org/show_bug.cgi?id=146549

Reviewed by Mario Sanchez Prada.

Source/WebCore:

Allow AXExpanded to be writeable for details element, which, when set
will toggle the opening and closing of the element. 
Post a notification when that happens as well.

Modified test: platform/mac/accessibility/details-summary.html

* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::hierarchicalLevel):
(WebCore::AccessibilityNodeObject::setIsExpanded):
(WebCore::shouldUseAccessibilityObjectInnerText):
* accessibility/AccessibilityNodeObject.h:
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::supportsPressAction):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::canSetExpandedAttribute):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityIsAttributeSettable:]):
(-[WebAccessibilityObjectWrapper _accessibilitySetValue:forAttribute:]):
* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::toggleOpen):

LayoutTests:

* platform/mac/accessibility/details-summary-expected.txt:
* platform/mac/accessibility/details-summary.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt
trunk/LayoutTests/platform/mac/accessibility/details-summary.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm




Diff

Modified: trunk/LayoutTests/ChangeLog (186597 => 186598)

--- trunk/LayoutTests/ChangeLog	2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 18:38:39 UTC (rev 186598)
@@ -1,3 +1,13 @@
+2015-07-02  Chris Fleizach  cfleiz...@apple.com
+
+AX: details element should allow expand/close through AX API
+https://bugs.webkit.org/show_bug.cgi?id=146549
+
+Reviewed by Mario Sanchez Prada.
+
+* platform/mac/accessibility/details-summary-expected.txt:
+* platform/mac/accessibility/details-summary.html:
+
 2015-07-09  Alex Christensen  achristen...@webkit.org
 
 [Content Extensions] Prevent crashes with plugins.


Modified: trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt (186597 => 186598)

--- trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt	2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/platform/mac/accessibility/details-summary-expected.txt	2015-07-09 18:38:39 UTC (rev 186598)
@@ -12,8 +12,15 @@
 PASS details1.isExpanded is true
 PASS details1.childAtIndex(0).role is 'AXRole: AXGroup'
 PASS details1.childAtIndex(0).subrole is 'AXSubrole: AXSummary'
+PASS details1.isAttributeSettable('AXExpanded') is true
+PASS details1.isExpanded is false
+PASS details1.isExpanded is false
+PASS details1.isExpanded is true
+PASS details1.isExpanded is true
 PASS details2.subrole is 'AXSubrole: AXDetails'
 PASS details2.isExpanded is false
+Received AXExpandedChanged notification 
+Received AXExpandedChanged notification 
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/platform/mac/accessibility/details-summary.html (186597 => 186598)

--- trunk/LayoutTests/platform/mac/accessibility/details-summary.html	2015-07-09 18:36:29 UTC (rev 186597)
+++ trunk/LayoutTests/platform/mac/accessibility/details-summary.html	2015-07-09 18:38:39 UTC (rev 186598)
@@ -22,15 +22,50 @@
 
 description(This tests some basic attributes about the details element.);
 
+var callbackCount = 0;
 if (window.accessibilityController) {
+window.jsTestIsAsync = true;
 
+var body = accessibilityController.rootElement.childAtIndex(0);
+body.addNotificationListener(function(notification) {
+if (notification == AXExpandedChanged) {
+callbackCount++;
+debug(Received  + notification +  notification );
+
+if (callbackCount == 2) {
+   finishJSTest();
+}
+}
+});
+
 var details1 = accessibilityController.accessibleElementById(details1);
 shouldBe(details1.role, 'AXRole: AXGroup');
 shouldBe(details1.subrole, 'AXSubrole: AXDetails');
 shouldBeTrue(details1.isExpanded);
 shouldBe(details1.childAtIndex(0).role, 'AXRole: AXGroup');
 shouldBe(details1.childAtIndex(0).subrole, 'AXSubrole: AXSummary');
+shouldBeTrue(details1.isAttributeSettable('AXExpanded'));
 
+// Toggle the expanded state.
+

[webkit-changes] [186596] trunk/LayoutTests

[bfulgham]

Title: [186596] trunk/LayoutTests








Revision 186596
Author bfulg...@apple.com
Date 2015-07-09 11:34:42 -0700 (Thu, 09 Jul 2015)


Log Message
[Win] Skip canvas/philip/tests/2d.text.draw.fontface.notinpage.html
https://bugs.webkit.org/show_bug.cgi?id=146795

* platform/win/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (186595 => 186596)

--- trunk/LayoutTests/ChangeLog	2015-07-09 18:16:36 UTC (rev 186595)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 18:34:42 UTC (rev 186596)
@@ -1,3 +1,10 @@
+2015-07-09  Brent Fulgham  bfulg...@apple.com
+
+[Win] Skip canvas/philip/tests/2d.text.draw.fontface.notinpage.html
+https://bugs.webkit.org/show_bug.cgi?id=146795
+
+* platform/win/TestExpectations:
+
 2015-07-09  Chris Fleizach  cfleiz...@apple.com
 
 AX: VoiceOver cannot get to any content in Yahoo Mail messages table


Modified: trunk/LayoutTests/platform/win/TestExpectations (186595 => 186596)

--- trunk/LayoutTests/platform/win/TestExpectations	2015-07-09 18:16:36 UTC (rev 186595)
+++ trunk/LayoutTests/platform/win/TestExpectations	2015-07-09 18:34:42 UTC (rev 186596)
@@ -1741,6 +1741,7 @@
 webkit.org/b/140759 canvas/philip/tests/2d.shadow.enable.blur.html
 webkit.org/b/140759 canvas/philip/tests/2d.shadow.enable.x.html
 webkit.org/b/140759 canvas/philip/tests/2d.shadow.enable.y.html
+webkit.org/b/146795 canvas/philip/tests/2d.text.draw.fontface.notinpage.html [ Pass Failure ]
 
 fast/canvas/canvas-gradient-addStop-error.html [ Failure ]
 fast/canvas/canvas-quadratic-same-endpoint.html [ Failure ]






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186594] trunk/Source/WebCore

[bfulgham]

Title: [186594] trunk/Source/WebCore








Revision 186594
Author bfulg...@apple.com
Date 2015-07-09 11:09:47 -0700 (Thu, 09 Jul 2015)


Log Message
[Win] Honor CACFLayer content scale factor
https://bugs.webkit.org/show_bug.cgi?id=146792

Reviewed by Dean Jackson.

* AVFoundationSupport.py: Check for the CACFLayerSet/GetContentsScale
* platform/graphics/ca/win/PlatformCALayerWin.cpp:
(PlatformCALayerWin::PlatformCALayerWin): Use owner's scale factor (if
present).
(PlatformCALayerWin::contentsScale): Use CACFLayer API if present.
(PlatformCALayerWin::setContentsScale): Ditto.
* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
(PlatformCALayerWinInternal::PlatformCALayerWinInternal): Use owner's scale
factor (if present).
(PlatformCALayerWinInternal::addTile): Use tile parent's scale factor.

Modified Paths

trunk/Source/WebCore/AVFoundationSupport.py
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp
trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp




Diff

Modified: trunk/Source/WebCore/AVFoundationSupport.py (186593 => 186594)

--- trunk/Source/WebCore/AVFoundationSupport.py	2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/AVFoundationSupport.py	2015-07-09 18:09:47 UTC (rev 186594)
@@ -53,3 +53,7 @@
 regexp = re.compile(AVCFURLAssetIsPlayableExtendedMIMEType)
 if fileContains(/include/AVFoundationCF/AVCFAsset.h, regexp):
 print #define HAVE_AVCFURL_PLAYABLE_MIMETYPE 1
+if lookFor(/include/QuartzCore/CACFLayer.h):
+regexp = re.compile(CACFLayerSetContentsScale)
+if fileContains(/include/QuartzCore/CACFLayer.h, regexp):
+print #define HAVE_CACFLAYER_SETCONTENTSSCALE 1


Modified: trunk/Source/WebCore/ChangeLog (186593 => 186594)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 18:09:47 UTC (rev 186594)
@@ -1,3 +1,21 @@
+2015-07-09  Brent Fulgham  bfulg...@apple.com
+
+[Win] Honor CACFLayer content scale factor
+https://bugs.webkit.org/show_bug.cgi?id=146792
+
+Reviewed by Dean Jackson.
+
+* AVFoundationSupport.py: Check for the CACFLayerSet/GetContentsScale
+* platform/graphics/ca/win/PlatformCALayerWin.cpp:
+(PlatformCALayerWin::PlatformCALayerWin): Use owner's scale factor (if
+present).
+(PlatformCALayerWin::contentsScale): Use CACFLayer API if present.
+(PlatformCALayerWin::setContentsScale): Ditto.
+* platform/graphics/ca/win/PlatformCALayerWinInternal.cpp:
+(PlatformCALayerWinInternal::PlatformCALayerWinInternal): Use owner's scale
+factor (if present).
+(PlatformCALayerWinInternal::addTile): Use tile parent's scale factor.
+
 2015-07-08  Matt Rajca  mra...@apple.com
 
 Media Session: report to chrome client 'hasActiveMediaElements' changes


Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp (186593 => 186594)

--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2015-07-09 16:26:33 UTC (rev 186593)
+++ trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWin.cpp	2015-07-09 18:09:47 UTC (rev 186594)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011, 2014-2015 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
 #include PlatformCAAnimationWin.h
 #include PlatformCALayerWinInternal.h
 #include TileController.h
+#include WebCoreHeaderDetection.h
 #include QuartzCore/CoreAnimationCF.h
 #include WebKitSystemInterface/WebKitSystemInterface.h
 #include wtf/CurrentTime.h
@@ -136,6 +137,10 @@
 
 m_layer = adoptCF(CACFLayerCreate(toCACFLayerType(layerType)));
 
+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+CACFLayerSetContentsScale(m_layer.get(), owner ? owner-platformCALayerDeviceScaleFactor() : 1.0f);
+#endif
+
 // Create the PlatformCALayerWinInternal object and point to it in the userdata.
 PlatformCALayerWinInternal* intern = new PlatformCALayerWinInternal(this);
 CACFLayerSetUserData(m_layer.get(), intern);
@@ -582,11 +587,18 @@
 
 float PlatformCALayerWin::contentsScale() const
 {
-return 1;
+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+return CACFLayerGetContentsScale(m_layer.get());
+#else
+return 1.0f;
+#endif
 }
 
-void PlatformCALayerWin::setContentsScale(float)
+void PlatformCALayerWin::setContentsScale(float scaleFactor)
 {
+#if HAVE(CACFLAYER_SETCONTENTSSCALE)
+CACFLayerSetContentsScale(m_layer.get(), scaleFactor);
+#endif
 }
 
 float PlatformCALayerWin::cornerRadius() const


Modified: trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp (186593 => 186594)

--- trunk/Source/WebCore/platform/graphics/ca/win/PlatformCALayerWinInternal.cpp	2015-07-09 16:26:33 UTC (rev 186593)
+++ 

[webkit-changes] [186600] trunk/Source/WebCore

[commit-queue]

Title: [186600] trunk/Source/WebCore








Revision 186600
Author commit-qu...@webkit.org
Date 2015-07-09 11:48:52 -0700 (Thu, 09 Jul 2015)


Log Message
Exposed AVVideoCaptureSource's bounds
https://bugs.webkit.org/show_bug.cgi?id=146760
rdar://problem/21736772

Patch by Matthew Daiter mdai...@apple.com on 2015-07-09
Reviewed by Brent Fulgham.

* platform/mediastream/mac/AVVideoCaptureSource.h:
(WebCore::AVVideoCaptureSource::width): Needed access to video width
(WebCore::AVVideoCaptureSource::height): Needed access to video height

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186599 => 186600)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 18:40:34 UTC (rev 186599)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 18:48:52 UTC (rev 186600)
@@ -1,3 +1,15 @@
+2015-07-09  Matthew Daiter  mdai...@apple.com
+
+Exposed AVVideoCaptureSource's bounds
+https://bugs.webkit.org/show_bug.cgi?id=146760
+rdar://problem/21736772
+
+Reviewed by Brent Fulgham.
+
+* platform/mediastream/mac/AVVideoCaptureSource.h:
+(WebCore::AVVideoCaptureSource::width): Needed access to video width
+(WebCore::AVVideoCaptureSource::height): Needed access to video height
+
 2015-07-09  Karlen Simonyan  szkar...@gmail.com
 
 [WinCairo] ClearType should be enabled on Cairo port


Modified: trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h (186599 => 186600)

--- trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h	2015-07-09 18:40:34 UTC (rev 186599)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.h	2015-07-09 18:48:52 UTC (rev 186600)
@@ -40,6 +40,9 @@
 
 virtual RefPtrRealtimeMediaSourceCapabilities capabilities() const override;
 virtual void captureOutputDidOutputSampleBufferFromConnection(AVCaptureOutput*, CMSampleBufferRef, AVCaptureConnection*) override;
+
+virtual int32_t width() const { return m_width; }
+virtual int32_t height() const { return m_height; }
 
 private:
 AVVideoCaptureSource(AVCaptureDevice*, const AtomicString, PassRefPtrMediaConstraints);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186665] trunk/Tools

[commit-queue]

Title: [186665] trunk/Tools








Revision 186665
Author commit-qu...@webkit.org
Date 2015-07-09 22:31:50 -0700 (Thu, 09 Jul 2015)


Log Message
Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
https://bugs.webkit.org/show_bug.cgi?id=146820

Patch by Dewei Zhu dewei_...@apple.com on 2015-07-09
Reviewed by Ryosuke Niwa.

* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver):
(OSXBrowserDriver.close_browsers):
(OSXBrowserDriver._terminiate_processes):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver):
(OSXChromeCanaryDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
(OSXFirefoxDriver):
(OSXFirefoxNightlyDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py
trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py




Diff

Modified: trunk/Tools/ChangeLog (186664 => 186665)

--- trunk/Tools/ChangeLog	2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/ChangeLog	2015-07-10 05:31:50 UTC (rev 186665)
@@ -1,3 +1,23 @@
+2015-07-09  Dewei Zhu  dewei_...@apple.com
+
+Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
+https://bugs.webkit.org/show_bug.cgi?id=146820
+
+Reviewed by Ryosuke Niwa.
+
+* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+(OSXBrowserDriver):
+(OSXBrowserDriver.close_browsers):
+(OSXBrowserDriver._terminiate_processes):
+* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+(OSXChromeDriver):
+(OSXChromeCanaryDriver):
+* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
+(OSXFirefoxDriver):
+(OSXFirefoxNightlyDriver):
+* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+(OSXSafariDriver):
+
 2015-07-09  Michael Catanzaro  mcatanz...@igalia.com
 
 [GTK] pango should be included in the default jhbuild moduleset


Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (186664 => 186665)

--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py	2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py	2015-07-10 05:31:50 UTC (rev 186665)
@@ -10,7 +10,7 @@
 
 
 class OSXBrowserDriver(BrowserDriver):
-bundle_identifier = None
+process_name = None
 platform = 'osx'
 
 def prepare_env(self, device_id):
@@ -19,7 +19,7 @@
 CGWarpMouseCursorPosition((10, 0))
 
 def close_browsers(self):
-self._terminiate_processes(self.bundle_identifier)
+self._terminiate_processes(self.process_name)
 
 @classmethod
 def _launch_process(cls, build_dir, app_name, url, args):
@@ -34,12 +34,9 @@
 cls._launch_process_with_caffinate(args)
 
 @classmethod
-def _terminiate_processes(cls, bundle_identifier):
-_log.info('Closing all terminating all processes with the bundle identifier %s' % bundle_identifier)
-from AppKit import NSRunningApplication
-processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundle_identifier)
-for process in processes:
-process.terminate()
+def _terminiate_processes(cls, process_name):
+_log.info('Closing all terminating all processes with name %s' % process_name)
+subprocess.call(['/usr/bin/killall', process_name])
 
 @classmethod
 def _launch_process_with_caffinate(cls, args, env=None):


Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (186664 => 186665)

--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py	2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py	2015-07-10 05:31:50 UTC (rev 186665)
@@ -12,7 +12,7 @@
 
 
 class OSXChromeDriver(OSXBrowserDriver):
-bundle_identifier = 'com.google.Chrome'
+process_name = 'Google Chrome'
 browser_name = 'chrome'
 
 def launch_url(self, url, browser_build_path):
@@ -20,7 +20,7 @@
 
 
 class OSXChromeCanaryDriver(OSXBrowserDriver):
-bundle_identifier = 'com.google.Chrome.canary'
+process_name = 'Google Chrome Canary'
 browser_name = 'chrome-canary'
 
 def launch_url(self, url, browser_build_path):


Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (186664 => 186665)

--- 

[webkit-changes] [186664] trunk/Source

[mitz]

Title: [186664] trunk/Source








Revision 186664
Author m...@apple.com
Date 2015-07-09 22:18:53 -0700 (Thu, 09 Jul 2015)


Log Message

Source/WebCore:
WebCore part of Track and expose policies for external URL schemes and App Links separately
https://bugs.webkit.org/show_bug.cgi?id=146822

Reviewed by Anders Carlsson.

* loader/FrameLoaderTypes.h: Added ShouldOpenExternalURLsPolicy::ShouldAllowExternalSchemes,
meaning external schemes are allowed but App Links are not. The opposite state doesn’t
exist.

* page/ContextMenuController.cpp:
(WebCore::ContextMenuController::contextMenuItemSelected): Opening a link in a new window
or in the current window should never open it as an App Link.

Source/WebKit2:
WebKit2 part of Track and expose policies for external URL schemes and App Links separately
https://bugs.webkit.org/show_bug.cgi?id=146822

Reviewed by Anders Carlsson.

* Shared/NavigationActionData.cpp:
(WebKit::NavigationActionData::encode):
(WebKit::NavigationActionData::decode):
* Shared/NavigationActionData.h:
  Replaced the shouldOpenExternalURLsPolicy boolean member with a
  shouldOpenExternalURLsPolicy member whose type is ShouldOpenExternalURLsPolicy, and
  updated encoding and decoding:

* UIProcess/API/APINavigationAction.h:
  Added shouldOpenAppLinks boolean to NavigationAction::create and the constructor. It
  augments the policy in the NavigationActionData with a valude decided in the UI process.
  Replaced shouldOpenExternalURLs() with shouldOpenExternalSchemes() and
  shouldOpenAppLinks() which check the policy and the new m_shouldOpenAppLinks boolean.

* UIProcess/API/Cocoa/WKNavigationAction.mm:
(-[WKNavigationAction _shouldOpenExternalSchemes]): Getter for new property, calls through
  to the NavigationAction.
(-[WKNavigationAction _shouldOpenAppLinks]): Ditto.
(-[WKNavigationAction _shouldOpenExternalURLs]): Now deprecated and returns the
  _shouldOpenExternalSchemes value.
* UIProcess/API/Cocoa/WKNavigationActionPrivate.h: Declared new properties for the two
  policies and deprecated old property.

* UIProcess/Cocoa/NavigationState.mm:
(WebKit::tryAppLink): Changed to use NavigationAction::shouldOpenAppLinks, which
  encapsulates logic that used to be here.

* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::createNewPage): Allow App Links (if already allowed by policy).

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::decidePolicyForNavigationAction): Moved logic from tryAppLink in
  NavigationState.mm here and pass the result to NavigationAction::create.
(WebKit::WebPageProxy::decidePolicyForNewWindowAction): Allow App Links (if already allowed
  by policy).
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::loadRequest): Changed the default policy to not allow App Links (but
  still allow external schemes).

* WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp:
(WKBundleNavigationActionGetShouldTryAppLinks): Added this getter.
* WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h:

* WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp:
(WebKit::InjectedBundleNavigationAction::InjectedBundleNavigationAction):
* WebProcess/InjectedBundle/InjectedBundleNavigationAction.h:
  Added m_shouldTryAppLinks boolean member, initialized from the policy. Updated the
  initialization of m_shouldOpenExternalURLs to account for the new policy.

* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForNavigationAction): Pass the policy
  in the navigation data.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoaderTypes.h
trunk/Source/WebCore/page/ContextMenuController.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/NavigationActionData.cpp
trunk/Source/WebKit2/Shared/NavigationActionData.h
trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionPrivate.h
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm
trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationAction.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleNavigationActionPrivate.h
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleNavigationAction.h
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186663 => 186664)

--- trunk/Source/WebCore/ChangeLog	2015-07-10 05:10:18 UTC (rev 186663)
+++ trunk/Source/WebCore/ChangeLog	2015-07-10 05:18:53 UTC (rev 186664)
@@ -1,3 +1,18 @@
+2015-07-09  Dan Bernstein  m...@apple.com
+
+WebCore part of Track and expose policies for external URL schemes and App Links separately
+

[webkit-changes] [186663] trunk

[dbates]

Title: [186663] trunk








Revision 186663
Author dba...@webkit.org
Date 2015-07-09 22:10:18 -0700 (Thu, 09 Jul 2015)


Log Message
Fetching Content Security Policy report URL should respect same origin policy
https://bugs.webkit.org/show_bug.cgi?id=146754
rdar://problem/18860259

Reviewed by Brady Eidson.

Inspired by Blink r149791 (by Mike West mk...@chromium.org):
https://src.chromium.org/viewvc/blink?revision=149791view=revision

Source/WebCore:

As per http://www.w3.org/TR/2015/CR-CSP2-20150219/#send-violation-reports, fetching the
Content Security Policy report URL should include cookies if and only if the origin of
the protected resource is equal to the origin of the report URL.

Tests: http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled.html
   http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-toggled.html
   http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies.html
   http/tests/security/contentSecurityPolicy/report-same-origin-no-cookies-when-private-browsing-toggled.html
   http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-when-private-browsing-enabled.html
   http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies.html

* loader/PingLoader.cpp:
(WebCore::PingLoader::sendViolationReport):

LayoutTests:

Added additional tests for private browsing mode.

* http/tests/cookies/resources/setCookies.cgi:
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled.html: Added.
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-toggled-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-toggled.html: Added.
* http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies.html: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-no-cookies-when-private-browsing-toggled-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-no-cookies-when-private-browsing-toggled.html: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-when-private-browsing-enabled-expected.txt: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-when-private-browsing-enabled.html: Added.
* http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies.html: Added.
* http/tests/security/contentSecurityPolicy/resources/save-report.php:
* platform/wk2/TestExpectations: Skip private browsing mode tests in WebKit2 until we fix https://bugs.webkit.org/show_bug.cgi?id=115274.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/cookies/resources/setCookies.cgi
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/resources/save-report.php
trunk/LayoutTests/platform/wk2/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/PingLoader.cpp


Added Paths

trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-enabled.html
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-toggled-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies-when-private-browsing-toggled.html
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-cross-origin-no-cookies.html
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-no-cookies-when-private-browsing-toggled-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-no-cookies-when-private-browsing-toggled.html
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-when-private-browsing-enabled-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies-when-private-browsing-enabled.html
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/report-same-origin-with-cookies.html




Diff

Modified: trunk/LayoutTests/ChangeLog (186662 => 186663)

--- trunk/LayoutTests/ChangeLog	2015-07-10 03:45:10 UTC (rev 186662)
+++ 

[webkit-changes] [186666] trunk/Source/WebCore

[zalan]

Title: [18] trunk/Source/WebCore








Revision 18
Author za...@apple.com
Date 2015-07-09 22:55:20 -0700 (Thu, 09 Jul 2015)


Log Message
Plugin create can end up destroying its renderer.
https://bugs.webkit.org/show_bug.cgi?id=146824
rdar://problem/18921429

Reviewed by Andreas Kling.

Plugins can run arbitrary code during initialization. If the plugin
happens to destroy the associated node, its renderer becomes invalid.
This patch checks whether the renderer survived the createPlugin() call.
(This WeakPtr pattern is also used in RenderWidget to avoid dangling pointers.)

Speculative fix. Not reproducible.

* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::loadPlugin):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/SubframeLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186665 => 18)

--- trunk/Source/WebCore/ChangeLog	2015-07-10 05:31:50 UTC (rev 186665)
+++ trunk/Source/WebCore/ChangeLog	2015-07-10 05:55:20 UTC (rev 18)
@@ -1,3 +1,21 @@
+2015-07-09  Zalan Bujtas  za...@apple.com
+
+Plugin create can end up destroying its renderer.
+https://bugs.webkit.org/show_bug.cgi?id=146824
+rdar://problem/18921429
+
+Reviewed by Andreas Kling.
+
+Plugins can run arbitrary code during initialization. If the plugin
+happens to destroy the associated node, its renderer becomes invalid.
+This patch checks whether the renderer survived the createPlugin() call.
+(This WeakPtr pattern is also used in RenderWidget to avoid dangling pointers.)
+
+Speculative fix. Not reproducible.
+
+* loader/SubframeLoader.cpp:
+(WebCore::SubframeLoader::loadPlugin):
+
 2015-07-09  Dan Bernstein  m...@apple.com
 
 WebCore part of Track and expose policies for external URL schemes and App Links separately


Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (186665 => 18)

--- trunk/Source/WebCore/loader/SubframeLoader.cpp	2015-07-10 05:31:50 UTC (rev 186665)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp	2015-07-10 05:55:20 UTC (rev 18)
@@ -391,10 +391,12 @@
 
 bool SubframeLoader::loadPlugin(HTMLPlugInImageElement pluginElement, const URL url, const String mimeType, const VectorString paramNames, const VectorString paramValues, bool useFallback)
 {
+if (useFallback)
+return false;
+
 RenderEmbeddedObject* renderer = pluginElement.renderEmbeddedObject();
-
 // FIXME: This code should not depend on renderer!
-if (!renderer || useFallback)
+if (!renderer)
 return false;
 
 pluginElement.subframeLoaderWillCreatePlugIn(url);
@@ -408,7 +410,11 @@
 loadManually = false;
 #endif
 
+WeakPtrRenderWidget weakRenderer = renderer-createWeakPtr();
+// createPlugin *may* cause this renderer to disappear from underneath.
 RefPtrWidget widget = m_frame.loader().client().createPlugin(contentSize, pluginElement, url, paramNames, paramValues, mimeType, loadManually);
+if (!weakRenderer)
+return false;
 
 if (!widget) {
 if (!renderer-isPluginUnavailable())






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186659] branches/safari-600.8-branch/Source

[matthew_hanson]

Title: [186659] branches/safari-600.8-branch/Source








Revision 186659
Author matthew_han...@apple.com
Date 2015-07-09 17:41:41 -0700 (Thu, 09 Jul 2015)


Log Message
Versioning.

Modified Paths

branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig (186658 => 186659)

--- branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:40:36 UTC (rev 186658)
+++ branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:41:41 UTC (rev 186659)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig (186658 => 186659)

--- branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:40:36 UTC (rev 186658)
+++ branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:41:41 UTC (rev 186659)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (186658 => 186659)

--- branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:40:36 UTC (rev 186658)
+++ branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:41:41 UTC (rev 186659)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig (186658 => 186659)

--- branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:40:36 UTC (rev 186658)
+++ branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:41:41 UTC (rev 186659)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig (186658 => 186659)

--- branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:40:36 UTC (rev 186658)
+++ branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:41:41 UTC (rev 186659)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 1;
+TINY_VERSION = 2;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186658] trunk/Source/WebCore

[beidson]

Title: [186658] trunk/Source/WebCore








Revision 186658
Author beid...@apple.com
Date 2015-07-09 17:40:36 -0700 (Thu, 09 Jul 2015)


Log Message
Followup to r186647

Reviewed by NOBODY.

Thanks, EWS and commit-queue, for not catching this!

* loader/DocumentLoader.h: Add a semi-colon.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentLoader.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186657 => 186658)

--- trunk/Source/WebCore/ChangeLog	2015-07-10 00:31:40 UTC (rev 186657)
+++ trunk/Source/WebCore/ChangeLog	2015-07-10 00:40:36 UTC (rev 186658)
@@ -1,3 +1,13 @@
+2015-07-09  Brady Eidson  beid...@apple.com
+
+Followup to r186647
+
+Reviewed by NOBODY.
+
+Thanks, EWS and commit-queue, for not catching this!
+
+* loader/DocumentLoader.h: Add a semi-colon.
+
 2015-07-09  Dean Jackson  d...@apple.com
 
 REGRESSION: Inline media scrubbing always pauses the video


Modified: trunk/Source/WebCore/loader/DocumentLoader.h (186657 => 186658)

--- trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-10 00:31:40 UTC (rev 186657)
+++ trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-10 00:40:36 UTC (rev 186658)
@@ -449,7 +449,7 @@
 #endif
 
 #ifndef NDEBUG
-bool m_hasEverBeenAttached { false }
+bool m_hasEverBeenAttached { false };
 #endif
 };
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186662] trunk/Source

[timothy_horton]

Title: [186662] trunk/Source








Revision 186662
Author timothy_hor...@apple.com
Date 2015-07-09 20:45:10 -0700 (Thu, 09 Jul 2015)


Log Message
Use CoreAnimation fences instead of synchronous IPC to synchronize resize
https://bugs.webkit.org/show_bug.cgi?id=146294
rdar://problem/21090193

Reviewed by Anders Carlsson.

Because of changes in underlying frameworks, we can no longer depend on
blocking the UI process main thread to be sufficient to synchronize
UI process CA commits with commits coming from the Web process.

Instead, we have to use CoreAnimation fences to perform this synchronization.
Instead of blocking inside waitForAndDispatchImmediately, we'll end up
blocking during the CA commit.

* Platform/mac/LayerHostingContext.mm:
Use HAVE(COREANIMATION_FENCES).

* Platform/IPC/Connection.cpp:
(IPC::Connection::Connection):
(IPC::Connection::processIncomingMessage):
(IPC::Connection::installIncomingSyncMessageCallback):
(IPC::Connection::uninstallIncomingSyncMessageCallback):
Keep track of a set of incoming sync message callbacks, and fire them
(on another queue) when a sync message arrives.

(IPC::Connection::hasIncomingSyncMessage):
* Platform/IPC/Connection.h:
Add a way to check if there are any sync messages in the queue.

* UIProcess/API/mac/WKView.mm:
(-[WKView forceAsyncDrawingAreaSizeUpdate:]):
(-[WKView waitForAsyncDrawingAreaSizeUpdate]):
These are no longer used; do nothing on 10.10+.

* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::sendUpdateGeometry):
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::updateGeometry):
* WebProcess/WebPage/DrawingArea.messages.in:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scaleViewAndUpdateGeometryFenced):
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::updateGeometry):
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
Add a MachSendRight parameter to UpdateGeometry, so that we can send along
a fence port with the geometry update if needed.

* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updateGeometry):
Apply the incoming fence so that geometry changes will be synchronized between processes.

* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
(WebKit::TiledCoreAnimationDrawingAreaProxy::waitForPossibleGeometryUpdate):
Don't wait for DidUpdateGeometry to come in if we're using fences to achieve the same thing.

(WebKit::TiledCoreAnimationDrawingAreaProxy::sendUpdateGeometry):
Create and block us on a fence and send it along with the geometry update.
If a sync message is in the incoming message queue, don't create the fence;
if a sync message comes in at any point after we've installed the fence (but
before the relevant commit completes), invalidate the fence, so that we won't
end up temorarily deadlocked waiting for the fence timeout.

* platform/cocoa/MachSendRight.h:
Export some constructors.

* platform/spi/cocoa/QuartzCoreSPI.h:
Add some SPI.

* wtf/Platform.h:
Add HAVE(COREANIMATION_FENCES)

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Platform.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/cocoa/MachSendRight.h
trunk/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/IPC/Connection.cpp
trunk/Source/WebKit2/Platform/IPC/Connection.h
trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h
trunk/Source/WebKit2/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.messages.in
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm




Diff

Modified: trunk/Source/WTF/ChangeLog (186661 => 186662)

--- trunk/Source/WTF/ChangeLog	2015-07-10 00:45:20 UTC (rev 186661)
+++ trunk/Source/WTF/ChangeLog	2015-07-10 03:45:10 UTC (rev 186662)
@@ -1,3 +1,14 @@
+2015-07-09  Tim Horton  timothy_hor...@apple.com
+
+Use CoreAnimation fences instead of synchronous IPC to synchronize resize
+https://bugs.webkit.org/show_bug.cgi?id=146294
+rdar://problem/21090193
+
+Reviewed by Anders Carlsson.
+
+* wtf/Platform.h:
+Add HAVE(COREANIMATION_FENCES)
+
 2015-07-04  Chris Dumez  cdu...@apple.com
 
 Drop RefPtr::clear() method


Modified: trunk/Source/WTF/wtf/Platform.h (186661 => 186662)

--- trunk/Source/WTF/wtf/Platform.h	

[webkit-changes] [186661] branches/safari-600.8-branch/Source

[matthew_hanson]

Title: [186661] branches/safari-600.8-branch/Source








Revision 186661
Author matthew_han...@apple.com
Date 2015-07-09 17:45:20 -0700 (Thu, 09 Jul 2015)


Log Message
Versioning.

Modified Paths

branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig (186660 => 186661)

--- branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:44:01 UTC (rev 186660)
+++ branches/safari-600.8-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:45:20 UTC (rev 186661)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig (186660 => 186661)

--- branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:44:01 UTC (rev 186660)
+++ branches/safari-600.8-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:45:20 UTC (rev 186661)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (186660 => 186661)

--- branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:44:01 UTC (rev 186660)
+++ branches/safari-600.8-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:45:20 UTC (rev 186661)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig (186660 => 186661)

--- branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:44:01 UTC (rev 186660)
+++ branches/safari-600.8-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:45:20 UTC (rev 186661)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig (186660 => 186661)

--- branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:44:01 UTC (rev 186660)
+++ branches/safari-600.8-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:45:20 UTC (rev 186661)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 8;
-TINY_VERSION = 2;
+TINY_VERSION = 3;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186660] tags/Safari-600.8.2/

[matthew_hanson]

Title: [186660] tags/Safari-600.8.2/








Revision 186660
Author matthew_han...@apple.com
Date 2015-07-09 17:44:01 -0700 (Thu, 09 Jul 2015)


Log Message
New Tag.

Added Paths

tags/Safari-600.8.2/




Diff

Property changes: tags/Safari-600.8.2



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186589] trunk/Source/WebInspectorUI

[mattbaker]

Title: [186589] trunk/Source/WebInspectorUI








Revision 186589
Author mattba...@apple.com
Date 2015-07-09 01:03:55 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: New _javascript_/Probe breakpoint action disappears when clicking continue checkbox
https://bugs.webkit.org/show_bug.cgi?id=146688

Reviewed by Brian Burg.

Delay removal of empty Evaluate and Probe actions until after the breakpoint popover has been dismissed. This
will make the breakpoint editing experience less jarring, by preventing actions from disappearing when clicking
other controls in the popover.

* UserInterface/Models/Breakpoint.js:
(WebInspector.Breakpoint.prototype.didDismissPopover):
Clear empty Evaluate and Probe actions on popover dismissal.

* UserInterface/Views/BreakpointActionView.js:
(WebInspector.BreakpointActionView.prototype._codeMirrorBlurred):
Don't remove actions with empty data on CodeMirror blur.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js
trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186588 => 186589)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 07:35:15 UTC (rev 186588)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 08:03:55 UTC (rev 186589)
@@ -1,5 +1,24 @@
 2015-07-09  Matt Baker  mattba...@apple.com
 
+Web Inspector: New _javascript_/Probe breakpoint action disappears when clicking continue checkbox
+https://bugs.webkit.org/show_bug.cgi?id=146688
+
+Reviewed by Brian Burg.
+
+Delay removal of empty Evaluate and Probe actions until after the breakpoint popover has been dismissed. This
+will make the breakpoint editing experience less jarring, by preventing actions from disappearing when clicking
+other controls in the popover.
+
+* UserInterface/Models/Breakpoint.js:
+(WebInspector.Breakpoint.prototype.didDismissPopover):
+Clear empty Evaluate and Probe actions on popover dismissal.
+
+* UserInterface/Views/BreakpointActionView.js:
+(WebInspector.BreakpointActionView.prototype._codeMirrorBlurred):
+Don't remove actions with empty data on CodeMirror blur.
+
+2015-07-09  Matt Baker  mattba...@apple.com
+
 Web Inspector: new breakpoint action dialog should reuse same action type
 https://bugs.webkit.org/show_bug.cgi?id=137255
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js (186588 => 186589)

--- trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js	2015-07-09 07:35:15 UTC (rev 186588)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js	2015-07-09 08:03:55 UTC (rev 186589)
@@ -533,6 +533,19 @@
 delete this._popover;
 }
 
+didDismissPopover(popover)
+{
+// Remove Evaluate and Probe actions that have no data.
+var emptyActions = this._actions.filter(function(action) {
+if (action.type !== WebInspector.BreakpointAction.Type.Evaluate  action.type !== WebInspector.BreakpointAction.Type.Probe)
+return false;
+return !(action.data  action.data.trim());
+});
+
+for (var action of emptyActions)
+this.removeAction(action);
+}
+
 _showEditBreakpointPopover(boundingClientRect)
 {
 var bounds = WebInspector.Rect.rectFromClientRect(boundingClientRect);


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js (186588 => 186589)

--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js	2015-07-09 07:35:15 UTC (rev 186588)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js	2015-07-09 08:03:55 UTC (rev 186589)
@@ -192,12 +192,7 @@
 _codeMirrorBlurred(event)
 {
 // Throw away the _expression_ if it's just whitespace.
-var data = "" || ).trim();
-
-if (!data.length)
-this._removeAction();
-else
-this._action.data = ""
+this._action.data = "" || ).trim();
 }
 
 _codeMirrorViewportChanged(event)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186585] trunk/Source/WebInspectorUI

[drousso]

Title: [186585] trunk/Source/WebInspectorUI








Revision 186585
Author drou...@apple.com
Date 2015-07-08 23:41:12 -0700 (Wed, 08 Jul 2015)


Log Message
Web Inspector: Copy Rule in the context menu copies hidden properties in the rule
https://bugs.webkit.org/show_bug.cgi?id=146775

Reviewed by Timothy Hatcher.

* UserInterface/Views/CSSStyleDeclarationSection.js:
(WebInspector.CSSStyleDeclarationSection.prototype._generateCSSRuleString):
Now only uses properties from the rule's visibleProperties list.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186584 => 186585)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 06:04:42 UTC (rev 186584)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 06:41:12 UTC (rev 186585)
@@ -1,3 +1,14 @@
+2015-07-08  Devin Rousso  drou...@apple.com
+
+Web Inspector: Copy Rule in the context menu copies hidden properties in the rule
+https://bugs.webkit.org/show_bug.cgi?id=146775
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/CSSStyleDeclarationSection.js:
+(WebInspector.CSSStyleDeclarationSection.prototype._generateCSSRuleString):
+Now only uses properties from the rule's visibleProperties list.
+
 2015-07-08  Timothy Hatcher  timo...@apple.com
 
 Web Inspector: Add page weight and time back to the toolbar dashboard


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (186584 => 186585)

--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js	2015-07-09 06:04:42 UTC (rev 186584)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js	2015-07-09 06:41:12 UTC (rev 186585)
@@ -418,7 +418,7 @@
 
 styleText +=  {\n;
 
-for (var property of this._style.properties) {
+for (var property of this._style.visibleProperties) {
 styleText += .repeat(numMediaQueries + 1) + property.text.trim();
 
 if (!styleText.endsWith(;))






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186588] trunk/Source/WebInspectorUI

[mattbaker]

Title: [186588] trunk/Source/WebInspectorUI








Revision 186588
Author mattba...@apple.com
Date 2015-07-09 00:35:15 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: new breakpoint action dialog should reuse same action type
https://bugs.webkit.org/show_bug.cgi?id=137255

Reviewed by Brian Burg.

* UserInterface/Views/BreakpointActionView.js:
(WebInspector.BreakpointActionView.prototype._appendActionButtonClicked):
Use the view's action type instead of the default.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186587 => 186588)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 07:31:27 UTC (rev 186587)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 07:35:15 UTC (rev 186588)
@@ -1,3 +1,14 @@
+2015-07-09  Matt Baker  mattba...@apple.com
+
+Web Inspector: new breakpoint action dialog should reuse same action type
+https://bugs.webkit.org/show_bug.cgi?id=137255
+
+Reviewed by Brian Burg.
+
+* UserInterface/Views/BreakpointActionView.js:
+(WebInspector.BreakpointActionView.prototype._appendActionButtonClicked):
+Use the view's action type instead of the default.
+
 2015-07-08  Devin Rousso  drou...@apple.com
 
 Web Inspector: Copy Rule in the context menu copies hidden properties in the rule


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js (186587 => 186588)

--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js	2015-07-09 07:31:27 UTC (rev 186587)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointActionView.js	2015-07-09 07:35:15 UTC (rev 186588)
@@ -113,7 +113,7 @@
 
 _appendActionButtonClicked(event)
 {
-var newAction = this._action.breakpoint.createAction(WebInspector.Breakpoint.DefaultBreakpointActionType, this._action);
+var newAction = this._action.breakpoint.createAction(this._action.type, this._action);
 this._delegate.breakpointActionViewAppendActionView(this, newAction);
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186584] trunk

[commit-queue]

Title: [186584] trunk








Revision 186584
Author commit-qu...@webkit.org
Date 2015-07-08 23:04:42 -0700 (Wed, 08 Jul 2015)


Log Message
Fix grammar issue in TypeError attempting to change an unconfigurable property
https://bugs.webkit.org/show_bug.cgi?id=146774

Patch by Joseph Pecoraro pecor...@apple.com on 2015-07-08
Reviewed by Brent Fulgham.

Source/_javascript_Core:

* runtime/JSFunction.cpp:
(JSC::JSFunction::defineOwnProperty):
* runtime/JSObject.cpp:
(JSC::JSObject::defineOwnNonIndexProperty):
* runtime/StringObject.cpp:
(JSC::StringObject::defineOwnProperty):

LayoutTests:

* js/dom/Object-defineProperty-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/js/dom/Object-defineProperty-expected.txt
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/JSFunction.cpp
trunk/Source/_javascript_Core/runtime/JSObject.cpp
trunk/Source/_javascript_Core/runtime/StringObject.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (186583 => 186584)

--- trunk/LayoutTests/ChangeLog	2015-07-09 06:01:01 UTC (rev 186583)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 06:04:42 UTC (rev 186584)
@@ -1,3 +1,12 @@
+2015-07-08  Joseph Pecoraro  pecor...@apple.com
+
+Fix grammar issue in TypeError attempting to change an unconfigurable property
+https://bugs.webkit.org/show_bug.cgi?id=146774
+
+Reviewed by Brent Fulgham.
+
+* js/dom/Object-defineProperty-expected.txt:
+
 2015-07-08  Daniel Bates  dba...@webkit.org
 
 [EFL] vibration/navigator-vibration.html failed after r186265


Modified: trunk/LayoutTests/js/dom/Object-defineProperty-expected.txt (186583 => 186584)

--- trunk/LayoutTests/js/dom/Object-defineProperty-expected.txt	2015-07-09 06:01:01 UTC (rev 186583)
+++ trunk/LayoutTests/js/dom/Object-defineProperty-expected.txt	2015-07-09 06:04:42 UTC (rev 186584)
@@ -24,7 +24,7 @@
 PASS Object.defineProperty({}, 'foo') threw exception TypeError: Property description must be an object..
 PASS Object.defineProperty({}, 'foo', {get:undefined, value:true}).foo threw exception TypeError: Invalid property.  'value' present on property with getter or setter..
 PASS Object.defineProperty({get foo() { return true; } }, 'foo', {configurable:false}).foo is true
-PASS Object.defineProperty(createUnconfigurableProperty({}, 'foo'), 'foo', {configurable: true}) threw exception TypeError: Attempting to configurable attribute of unconfigurable property..
+PASS Object.defineProperty(createUnconfigurableProperty({}, 'foo'), 'foo', {configurable: true}) threw exception TypeError: Attempting to change configurable attribute of unconfigurable property..
 PASS Object.defineProperty(createUnconfigurableProperty({}, 'foo'), 'foo', {writable: true}) threw exception TypeError: Attempting to change writable attribute of unconfigurable property..
 PASS Object.defineProperty(createUnconfigurableProperty({}, 'foo'), 'foo', {enumerable: true}) threw exception TypeError: Attempting to change enumerable attribute of unconfigurable property..
 PASS Object.defineProperty(createUnconfigurableProperty({}, 'foo', false, true), 'foo', {enumerable: false}), 'foo' threw exception TypeError: Attempting to change enumerable attribute of unconfigurable property..
@@ -70,8 +70,8 @@
 PASS Object.defineProperty(Object.defineProperty({}, 'foo', {get: function() { return 1; }, configurable: true}), 'foo', {value:2}).foo is 2
 PASS Object.defineProperty(Object.defineProperty({}, 'foo', {get: function() { return 1; }, configurable: false}), 'foo', {value:2}).foo threw exception TypeError: Attempting to change access mechanism for an unconfigurable property..
 PASS var o = Object.defineProperty(Object.defineProperty({}, 'foo', {get: function() { return 1; }, configurable: true}), 'foo', {value:2}); o.foo = 3; o.foo is 2
-PASS Object.defineProperty(Object.defineProperty({}, 'foo', {value: 1}), 'foo', {value:2, configurable: true}) threw exception TypeError: Attempting to configurable attribute of unconfigurable property..
-PASS Object.defineProperty(Object.defineProperty([], 'foo', {value: 1}), 'foo', {value:2, configurable: true}) threw exception TypeError: Attempting to configurable attribute of unconfigurable property..
+PASS Object.defineProperty(Object.defineProperty({}, 'foo', {value: 1}), 'foo', {value:2, configurable: true}) threw exception TypeError: Attempting to change configurable attribute of unconfigurable property..
+PASS Object.defineProperty(Object.defineProperty([], 'foo', {value: 1}), 'foo', {value:2, configurable: true}) threw exception TypeError: Attempting to change configurable attribute of unconfigurable property..
 PASS var o = Object.defineProperty({}, 'foo', {get:function(){return 42;}, set:function(x){this.result = x;}}); o.foo is 42
 PASS var o = Object.defineProperty({}, 'foo', {get:function(){return 42;}, set:function(x){this.result = x;}}); o.foo = 42; o.result; is 42
 PASS var o = Object.defineProperty({}, 'foo', {get:undefined, 

[webkit-changes] [186586] trunk/Source/WebKit2

[mitz]

Title: [186586] trunk/Source/WebKit2








Revision 186586
Author m...@apple.com
Date 2015-07-09 00:01:49 -0700 (Thu, 09 Jul 2015)


Log Message
[Cocoa] Report the first paint after committing a load as a rendering progress event
https://bugs.webkit.org/show_bug.cgi?id=146765

Reviewed by Tim Horton.

* Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added _WKRenderingProgressEventFirstPaint.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _didCommitLayerTree:]): If this is the first layer tree commit since the load
was committed, and the delegate is observing _WKRenderingProgressEventFirstPaint, call
NavigationState::didFirstPaint.

* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::didFirstPaint): Added. Calls -_webView:renderingProgressDidChange:
with _WKRenderingProgressEventFirstPaint.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h
trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (186585 => 186586)

--- trunk/Source/WebKit2/ChangeLog	2015-07-09 06:41:12 UTC (rev 186585)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-09 07:01:49 UTC (rev 186586)
@@ -1,3 +1,22 @@
+2015-07-09  Dan Bernstein  m...@apple.com
+
+[Cocoa] Report the first paint after committing a load as a rendering progress event
+https://bugs.webkit.org/show_bug.cgi?id=146765
+
+Reviewed by Tim Horton.
+
+* Shared/API/Cocoa/_WKRenderingProgressEvents.h: Added _WKRenderingProgressEventFirstPaint.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _didCommitLayerTree:]): If this is the first layer tree commit since the load
+was committed, and the delegate is observing _WKRenderingProgressEventFirstPaint, call
+NavigationState::didFirstPaint.
+
+* UIProcess/Cocoa/NavigationState.h:
+* UIProcess/Cocoa/NavigationState.mm:
+(WebKit::NavigationState::didFirstPaint): Added. Calls -_webView:renderingProgressDidChange:
+with _WKRenderingProgressEventFirstPaint.
+
 2015-07-08  Jinwoo Song  jinwoo7.s...@samsung.com
 
 [EFL] When closing inspector window, EwkView is not released properly.


Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h (186585 => 186586)

--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h	2015-07-09 06:41:12 UTC (rev 186585)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRenderingProgressEvents.h	2015-07-09 07:01:49 UTC (rev 186586)
@@ -33,7 +33,8 @@
 _WKRenderingProgressEventFirstPaintWithSignificantArea = 1  2,
 _WKRenderingProgressEventReachedSessionRestorationRenderTreeSizeThreshold WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1  3,
 _WKRenderingProgressEventFirstLayoutAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1  4,
-_WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1  5
+_WKRenderingProgressEventFirstPaintAfterSuppressedIncrementalRendering WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1  5,
+_WKRenderingProgressEventFirstPaint WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA) = 1  6,
 } WK_ENUM_AVAILABLE(10_10, 8_0);
 
 #endif


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (186585 => 186586)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-07-09 06:41:12 UTC (rev 186585)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2015-07-09 07:01:49 UTC (rev 186586)
@@ -971,6 +971,8 @@
 _needsResetViewStateAfterCommitLoadForMainFrame = NO;
 [_scrollView setContentOffset:[self _adjustedContentOffset:CGPointZero]];
 [self _updateVisibleContentRects];
+if (_observedRenderingProgressEvents  _WKRenderingProgressEventFirstPaint)
+_navigationState-didFirstPaint();
 }
 
 bool isTransactionAfterPageRestore = layerTreeTransaction.transactionID() = _firstTransactionIDAfterPageRestore;


Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (186585 => 186586)

--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h	2015-07-09 06:41:12 UTC (rev 186585)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h	2015-07-09 07:01:49 UTC (rev 186586)
@@ -73,6 +73,8 @@
 void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem);
 void willRecordNavigationSnapshot(WebBackForwardListItem);
 
+void didFirstPaint();
+
 private:
 class NavigationClient final : public API::NavigationClient {
 public:


Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (186585 => 186586)

--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm	2015-07-09 06:41:12 UTC (rev 186585)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm	2015-07-09 07:01:49 UTC (rev 186586)
@@ 

[webkit-changes] [186587] trunk

[cfleizach]

Title: [186587] trunk








Revision 186587
Author cfleiz...@apple.com
Date 2015-07-09 00:31:27 -0700 (Thu, 09 Jul 2015)


Log Message
AX: VoiceOver cannot get to any content in Yahoo Mail messages table
https://bugs.webkit.org/show_bug.cgi?id=146674

Reviewed by Darin Adler.

Source/WebCore:

A table row could have any number of parent elements in the render tree, but for the purposes
of accessibility we only want to report the AXTable as the parent so that it looks like a sane
data table.

Test: accessibility/aria-table-with-presentational-elements.html

* accessibility/AccessibilityARIAGridRow.cpp:
(WebCore::AccessibilityARIAGridRow::disclosedByRow):
(WebCore::AccessibilityARIAGridRow::parentObjectUnignored):
(WebCore::AccessibilityARIAGridRow::parentTable):
* accessibility/AccessibilityARIAGridRow.h:

LayoutTests:

* accessibility/aria-table-with-presentational-elements-expected.txt: Added.
* accessibility/aria-table-with-presentational-elements.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.cpp
trunk/Source/WebCore/accessibility/AccessibilityARIAGridRow.h


Added Paths

trunk/LayoutTests/accessibility/aria-table-with-presentational-elements-expected.txt
trunk/LayoutTests/accessibility/aria-table-with-presentational-elements.html




Diff

Modified: trunk/LayoutTests/ChangeLog (186586 => 186587)

--- trunk/LayoutTests/ChangeLog	2015-07-09 07:01:49 UTC (rev 186586)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 07:31:27 UTC (rev 186587)
@@ -1,3 +1,13 @@
+2015-07-09  Chris Fleizach  cfleiz...@apple.com
+
+AX: VoiceOver cannot get to any content in Yahoo Mail messages table
+https://bugs.webkit.org/show_bug.cgi?id=146674
+
+Reviewed by Darin Adler.
+
+* accessibility/aria-table-with-presentational-elements-expected.txt: Added.
+* accessibility/aria-table-with-presentational-elements.html: Added.
+
 2015-07-08  Joseph Pecoraro  pecor...@apple.com
 
 Fix grammar issue in TypeError attempting to change an unconfigurable property


Added: trunk/LayoutTests/accessibility/aria-table-with-presentational-elements-expected.txt (0 => 186587)

--- trunk/LayoutTests/accessibility/aria-table-with-presentational-elements-expected.txt	(rev 0)
+++ trunk/LayoutTests/accessibility/aria-table-with-presentational-elements-expected.txt	2015-07-09 07:31:27 UTC (rev 186587)
@@ -0,0 +1,11 @@
+This tests that in an aria table a row will report its parent as the table.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS row.role is 'AXRole: AXRow'
+PASS row.parentElement().role is 'AXRole: AXTable'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: trunk/LayoutTests/accessibility/aria-table-with-presentational-elements.html (0 => 186587)

--- trunk/LayoutTests/accessibility/aria-table-with-presentational-elements.html	(rev 0)
+++ trunk/LayoutTests/accessibility/aria-table-with-presentational-elements.html	2015-07-09 07:31:27 UTC (rev 186587)
@@ -0,0 +1,43 @@
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+script src=""
+/head
+
+body id=body
+
+div id=content
+
+div role=grid id=table
+  div role=presentational aria-label=hello
+ div role=presentational aria-haspopup=true
+ div role=row 
+ div role=gridcellhello/div
+ div role=gridcellhello/div
+ div role=gridcellhello/div
+ /div
+  /div
+  /div
+/div
+
+/div
+
+p id=description/p
+div id=console/div
+
+script
+description(This tests that in an aria table a row will report its parent as the table.);
+
+if (window.accessibilityController) {
+var table = accessibilityController.accessibleElementById(table);
+var row = table.rowAtIndex(0);
+shouldBe(row.role, 'AXRole: AXRow');
+shouldBe(row.parentElement().role, 'AXRole: AXTable');
+
+document.getElementById(content).style.visibility = hidden;
+}
+
+/script
+script src=""
+/body
+/html


Modified: trunk/Source/WebCore/ChangeLog (186586 => 186587)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 07:01:49 UTC (rev 186586)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 07:31:27 UTC (rev 186587)
@@ -1,3 +1,22 @@
+2015-07-09  Chris Fleizach  cfleiz...@apple.com
+
+AX: VoiceOver cannot get to any content in Yahoo Mail messages table
+https://bugs.webkit.org/show_bug.cgi?id=146674
+
+Reviewed by Darin Adler.
+
+A table row could have any number of parent elements in the render tree, but for the purposes
+of accessibility we only want to report the AXTable as the parent so that it looks like a sane
+data table.
+
+Test: accessibility/aria-table-with-presentational-elements.html
+
+* accessibility/AccessibilityARIAGridRow.cpp:
+(WebCore::AccessibilityARIAGridRow::disclosedByRow):
+

[webkit-changes] [186590] trunk/Source/WebInspectorUI

[mattbaker]

Title: [186590] trunk/Source/WebInspectorUI








Revision 186590
Author mattba...@apple.com
Date 2015-07-09 01:58:49 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Rendering Frame segment colors should match those used in original Timelines graph
https://bugs.webkit.org/show_bug.cgi?id=146777

Reviewed by Brian Burg.

* UserInterface/Views/TimelineRecordFrame.css:
(.timeline-record-frame  .frame  .duration):
(.timeline-record-frame  .frame  .duration:last-child):
(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-script):
(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-layout):
(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-paint):
Use same RGB values as TimelineRecordBar.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186589 => 186590)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 08:03:55 UTC (rev 186589)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 08:58:49 UTC (rev 186590)
@@ -1,5 +1,20 @@
 2015-07-09  Matt Baker  mattba...@apple.com
 
+Web Inspector: Rendering Frame segment colors should match those used in original Timelines graph
+https://bugs.webkit.org/show_bug.cgi?id=146777
+
+Reviewed by Brian Burg.
+
+* UserInterface/Views/TimelineRecordFrame.css:
+(.timeline-record-frame  .frame  .duration):
+(.timeline-record-frame  .frame  .duration:last-child):
+(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-script):
+(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-layout):
+(.timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-paint):
+Use same RGB values as TimelineRecordBar.
+
+2015-07-09  Matt Baker  mattba...@apple.com
+
 Web Inspector: New _javascript_/Probe breakpoint action disappears when clicking continue checkbox
 https://bugs.webkit.org/show_bug.cgi?id=146688
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css (186589 => 186590)

--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css	2015-07-09 08:03:55 UTC (rev 186589)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineRecordFrame.css	2015-07-09 08:58:49 UTC (rev 186590)
@@ -51,22 +51,27 @@
 box-sizing: border-box;
 
 min-height: 3px;
-background-color: rgb(221, 221, 221);
-border-bottom: solid 1px rgb(245, 245, 245);
+background-color: rgb(231, 231, 231);
+border-style: solid solid none solid;
+border-width: 1px;
+border-color: rgb(211, 211, 211);
 }
 
 .timeline-record-frame  .frame  .duration:last-child {
-border-bottom-style: none;
+border-bottom-style: solid;
 }
 
 .timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-script {
-background-color: rgb(153, 113, 185);
+background-color: rgb(190, 148, 233);
+border-color: rgb(153, 113, 185);
 }
 
 .timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-layout {
-background-color: rgb(212, 108, 108);
+background-color: rgb(234, 153, 153);
+border-color: rgb(212, 108, 108);
 }
 
 .timeline-record-frame  .frame  .duration.rendering-frame-timeline-record-paint {
-background-color: rgb(152, 188, 77);
+background-color: rgb(176, 204, 105);
+border-color: rgb(152, 188, 77);
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186611] branches/safari-600.8-branch

[matthew_hanson]

Title: [186611] branches/safari-600.8-branch








Revision 186611
Author matthew_han...@apple.com
Date 2015-07-09 14:01:50 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186503. rdar://problem/21707907

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/rendering/RenderBlockFlow.cpp
branches/safari-600.8-branch/Source/WebCore/rendering/RenderBox.cpp
branches/safari-600.8-branch/Source/WebCore/rendering/RenderBox.h


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed.xhtml




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186610 => 186611)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:46 UTC (rev 186610)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:50 UTC (rev 186611)
@@ -1,5 +1,37 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186503. rdar://problem/21707907
+
+2015-07-07  Matthew Hanson  matthew_han...@apple.com
+
+Merge r184885. rdar://problem/21708260
+
+2015-05-26  Zalan Bujtas  za...@apple.com
+
+Overhanging float sets are not cleaned up properly when floating renderer is destroyed.
+https://bugs.webkit.org/show_bug.cgi?id=145323
+rdar://problem/20980628
+
+Reviewed by Dave Hyatt.
+
+This patch ensures when an overhanging float renderer is destroyed,
+all the sibling containers' floating object set(m_floatingObjects) gets properly cleaned up.
+
+When an overhanging float is present, we cache the renderer on the parent and on the affected
+sibling containers too. (RenderBlockFlow::m_floatingObjects) These caches(sets) get cleared and repopulated
+during ::layout(). In order to have a float renderer removed from a set, a layout needs to be initiated on the container.
+This is normally done through RenderBlockFlow::markSiblingsWithFloatsForLayout() and RenderBlockFlow::markAllDescendantsWithFloatsForLayout().
+However, when the float container's parent's writing direction changes (and we promote the children containers to new formatting contexts),
+the layout propagation through siblings does not work anymore.
+
+The avoidsFloats() check in RenderBlockFlow::markSiblingsWithFloatsForLayout() has very little performance gain, but it prevents us
+from propagating layout to siblings when certain properties of the parent container changes.
+
+* fast/block/float/crash-when-floating-object-is-removed-expected.txt: Added.
+* fast/block/float/crash-when-floating-object-is-removed.xhtml: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186502. rdar://problem/21707910
 
 2015-07-07  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed-expected.txt (0 => 186611)

--- branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed-expected.txt	2015-07-09 21:01:50 UTC (rev 186611)
@@ -0,0 +1 @@
+ PASS if no crash or ASSERT in debug.


Added: branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed.xhtml (0 => 186611)

--- branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed.xhtml	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/float/crash-when-floating-object-is-removed.xhtml	2015-07-09 21:01:50 UTC (rev 186611)
@@ -0,0 +1,45 @@
+html xmlns=http://www.w3.org/1999/xhtml
+head
+titleThis tests that sets for overhanging floating objects are cleaned up properly when the floating object is destroyed./title
+script
+  if (window.testRunner)
+testRunner.dumpAsText();
+/script
+style
+  html {
+position: absolute;
+  }
+  
+  .float { 
+float: left; 
+  }
+/style
+/head
+head id=head1 style=-webkit-writing-mode: horizontal-bt;/head
+
+i
+  button id=button1PASS if no crash or ASSERT in debug./button
+/i
+td id=td1
+  body/body
+/td
+i/i
+
+script
+var docElement = document.documentElement;
+function crash() {
+button1 = document.getElementById(button1);
+button1.classList.toggle(float);
+
+head1 = document.getElementById(head1);
+td1 = document.getElementById(td1);
+head1.appendChild(td1);
+
+docElement.offsetTop;
+head1.style.display = list-item;
+docElement.offsetTop;
+button1.classList.toggle(float);

[webkit-changes] [186614] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186614] branches/safari-600.8-branch/Source/WebCore








Revision 186614
Author matthew_han...@apple.com
Date 2015-07-09 14:02:02 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186506. rdar://problem/21707927

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186613 => 186614)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:01:59 UTC (rev 186613)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:02:02 UTC (rev 186614)
@@ -1,5 +1,30 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186506. rdar://problem/21707927
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186380. rdar://problem/21708281
+
+2015-07-06  Dean Jackson  d...@apple.com
+
+Memory corruption in WebGLRenderingContext::simulateVertexAttrib0
+https://bugs.webkit.org/show_bug.cgi?id=146652
+rdar://problem/21567767
+
+Reviewed by Brent Fulgham.
+
+The _expression_ (numVertex + 1) * 4 * sizeof(GC3Dfloat) could potentially
+overflow. Make it use checked arithmetic.
+
+I couldn't make a test case that reliably exercised this.
+
+* html/canvas/WebGLRenderingContextBase.cpp:
+(WebCore::WebGLRenderingContextBase::simulateVertexAttrib0): Used CheckedGC3Dsizeiptr
+for calculating the size of the buffer.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186505. rdar://problem/21707923
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (186613 => 186614)

--- branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2015-07-09 21:01:59 UTC (rev 186613)
+++ branches/safari-600.8-branch/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2015-07-09 21:02:02 UTC (rev 186614)
@@ -20,7 +20,7 @@
  * 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. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include config.h
@@ -85,6 +85,7 @@
 #include runtime/JSCInlines.h
 #include runtime/TypedArrayInlines.h
 #include runtime/Uint32Array.h
+#include wtf/CheckedArithmetic.h
 #include wtf/StdLibExtras.h
 #include wtf/text/CString.h
 #include wtf/text/StringBuilder.h
@@ -541,7 +542,7 @@
 m_stencilFuncMaskBack = 0x;
 m_layerCleared = false;
 m_numGLErrorsToConsoleAllowed = maxGLErrorsAllowedToConsole;
-
+
 m_clearColor[0] = m_clearColor[1] = m_clearColor[2] = m_clearColor[3] = 0;
 m_scissorEnabled = false;
 m_clearDepth = 1;
@@ -556,7 +557,7 @@
 GC3Dint numVertexAttribs = 0;
 m_context-getIntegerv(GraphicsContext3D::MAX_VERTEX_ATTRIBS, numVertexAttribs);
 m_maxVertexAttribs = numVertexAttribs;
-
+
 m_maxTextureSize = 0;
 m_context-getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, m_maxTextureSize);
 m_maxTextureLevel = WebGLTexture::computeLevelCount(m_maxTextureSize, m_maxTextureSize);
@@ -577,7 +578,7 @@
 m_defaultVertexArrayObject = WebGLVertexArrayObjectOES::create(this, WebGLVertexArrayObjectOES::VaoTypeDefault);
 addContextObject(m_defaultVertexArrayObject.get());
 m_boundVertexArrayObject = m_defaultVertexArrayObject;
-
+
 m_vertexAttribValue.resize(m_maxVertexAttribs);
 
 if (!isGLES2NPOTStrict())
@@ -1771,7 +1772,7 @@
 bool WebGLRenderingContext::validateElementArraySize(GC3Dsizei count, GC3Denum type, GC3Dintptr offset)
 {
 RefPtrWebGLBuffer elementArrayBuffer = m_boundVertexArrayObject-getElementArrayBuffer();
-
+
 if (!elementArrayBuffer)
 return false;
 
@@ -1815,7 +1816,7 @@
 // array buffers have enough elements to satisfy that maximum
 // index, skips the expensive per-draw-call iteration in
 // validateIndexArrayPrecise.
-
+
 RefPtrWebGLBuffer elementArrayBuffer = m_boundVertexArrayObject-getElementArrayBuffer();
 
 if (!elementArrayBuffer)
@@ -1874,7 +1875,7 @@
 {
 ASSERT(count = 0  offset = 0);
 unsigned lastIndex = 0;
-
+
 RefPtrWebGLBuffer elementArrayBuffer = m_boundVertexArrayObject-getElementArrayBuffer();
 
 if (!elementArrayBuffer)
@@ -4129,7 +4130,7 @@
 {
 ec = 0;
 Vectoruint8_t data;
-GraphicsContext3D::ImageExtractor imageExtractor(image, domSource, premultiplyAlpha, m_unpackColorspaceConversion == GraphicsContext3D::NONE);  
+GraphicsContext3D::ImageExtractor imageExtractor(image, domSource, premultiplyAlpha, 

[webkit-changes] [186616] branches/safari-600.8-branch

[matthew_hanson]

Title: [186616] branches/safari-600.8-branch








Revision 186616
Author matthew_han...@apple.com
Date 2015-07-09 14:02:10 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186516. rdar://problem/21707896

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/dom/ContainerNode.cpp
branches/safari-600.8-branch/Source/WebCore/dom/ContainerNodeAlgorithms.cpp
branches/safari-600.8-branch/Source/WebCore/dom/ContainerNodeAlgorithms.h
branches/safari-600.8-branch/Source/WebCore/dom/Element.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion.html
branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186615 => 186616)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:06 UTC (rev 186615)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:10 UTC (rev 186616)
@@ -1,5 +1,29 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186516. rdar://problem/21707896
+
+2015-06-10  Chris Dumez  cdu...@apple.com
+
+ASSERT_WITH_SECURITY_IMPLICATION in WebCore::DocumentOrderedMap::getElementById
+https://bugs.webkit.org/show_bug.cgi?id=145857
+rdar://problem/16798440
+
+Reviewed by Darin Adler.
+
+Add layout tests covering different crashes caused by the same bug.
+
+* fast/dom/script-getElementById-during-insertion-expected.txt: Added.
+* fast/dom/script-getElementById-during-insertion.html: Added.
+
+Reduction test case for rdar://problem/16798440.
+
+* fast/dom/script-remove-child-id-map-expected.txt: Added.
+* fast/dom/script-remove-child-id-map.html: Added.
+
+Test imported from Blink r178976.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186505. rdar://problem/21707923
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt (0 => 186616)

--- branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion-expected.txt	2015-07-09 21:02:10 UTC (rev 186616)
@@ -0,0 +1,2 @@
+PASS
+


Added: branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion.html (0 => 186616)

--- branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/dom/script-getElementById-during-insertion.html	2015-07-09 21:02:10 UTC (rev 186616)
@@ -0,0 +1,31 @@
+!DOCTYPE html
+html
+head
+script
+// Tests that we don't crash if a script is being executed as a result of appending a child to it./p
+executedScript = false;
+if (window.testRunner)
+  testRunner.dumpAsText();
+/script
+/head
+body
+div id=test/div
+script
+var elem = document.getElementById(test);
+if (!executedScript) {
+executedScript = true;
+
+document.documentElement.appendChild(elem.cloneNode(true));
+
+var range = document.createRange();
+range.setStartBefore(document.body);
+range.setEndAfter(document.body);
+range.surroundContents(document.head.appendChild(document.createElement(script)));
+} else {
+var span = document.createElement(span);
+document.documentElement.appendChild(span);
+span.innerHTML = 'PASSbr/';
+}
+/script
+/body
+/html


Added: branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map-expected.txt (0 => 186616)

--- branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map-expected.txt	2015-07-09 21:02:10 UTC (rev 186616)
@@ -0,0 +1,10 @@
+Passes if it doesn't crash and the child is not in the id map
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS document.getElementById('child') is null
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map.html (0 => 186616)

--- branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/dom/script-remove-child-id-map.html	2015-07-09 21:02:10 UTC (rev 186616)
@@ -0,0 +1,30 @@
+!DOCTYPE html
+
+script src=""
+
+script

[webkit-changes] [186613] branches/safari-600.8-branch

[matthew_hanson]

Title: [186613] branches/safari-600.8-branch








Revision 186613
Author matthew_han...@apple.com
Date 2015-07-09 14:01:59 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186505. rdar://problem/21707923

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/Modules/websockets/WebSocket.cpp
branches/safari-600.8-branch/Source/WebCore/platform/SchemeRegistry.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html
branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/
branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt
branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html
branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt
branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186612 => 186613)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:54 UTC (rev 186612)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:59 UTC (rev 186613)
@@ -1,5 +1,26 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186505. rdar://problem/21707923
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r185848. rdar://problem/21708274
+
+2015-06-22  Michael Catanzaro  mcatanz...@igalia.com
+
+Web sockets should be treated as active mixed content
+https://bugs.webkit.org/show_bug.cgi?id=140624
+
+Reviewed by Sam Weinig.
+
+* http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html: Added.
+* http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt: Added.
+* http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html: Added.
+* http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame-expected.txt: Added.
+* http/tests/security/mixedContent/websocket/insecure-websocket-in-main-frame.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186504. rdar://problem/21707900
 
 2015-07-07  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html (0 => 186613)

--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-websocket.html	2015-07-09 21:01:59 UTC (rev 186613)
@@ -0,0 +1,30 @@
+script src=""
+script
+window.jsTestIsAsync = true;
+
+function onSocketOpened() {
+alert(WebSocket connection opened.);
+finishJSTest();
+}
+
+function onSocketError() {
+alert(WebSocket connection failed.);
+finishJSTest();
+}
+
+function onSocketClosed() {
+alert(WebSocket closed.);
+finishJSTest();
+}
+
+try {
+var ws = new WebSocket(ws://127.0.0.1:8880/websocket/tests/hybi/echo);
+ws._onopen_ = onSocketOpened;
+ws._onerror_ = onSocketError;
+ws._onclose_ = onSocketClosed;
+} catch (e) {
+alert(Test failed: exception thrown);
+finishJSTest();
+}
+/script
+script src=""


Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt (0 => 186613)

--- branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe-expected.txt	2015-07-09 21:01:59 UTC (rev 186613)
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 21: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-websocket.html was not allowed to run insecure content from ws://127.0.0.1:8880/websocket/tests/hybi/echo.
+
+ALERT: WebSocket connection failed.
+This test loads an iframe that creates an insecure WebSocket connection. We should block the connection and trigger a mixed content callback because the main frame is HTTPS, but the data sent over the socket could be recorded or controlled by an attacker.
+
+


Added: branches/safari-600.8-branch/LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-iframe.html (0 => 186613)

--- 

[webkit-changes] [186610] branches/safari-600.8-branch

[matthew_hanson]

Title: [186610] branches/safari-600.8-branch








Revision 186610
Author matthew_han...@apple.com
Date 2015-07-09 14:01:46 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186502. rdar://problem/21707910

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/rendering/RenderElement.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186609 => 186610)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 20:47:58 UTC (rev 186609)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:46 UTC (rev 186610)
@@ -1,3 +1,26 @@
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186502. rdar://problem/21707910
+
+2015-07-07  Matthew Hanson  matthew_han...@apple.com
+
+Merge r184577. rdar://problem/21708263
+
+2015-05-19  Zalan Bujtas  za...@apple.com
+
+Merged anonymous blocks should invalidate simple line layout path.
+https://bugs.webkit.org/show_bug.cgi?id=145104
+rdar://problem/20980930
+
+Reviewed by Antti Koivisto.
+
+When anonymous blocks are merged together, it's not guaranteed that the final block can use simple line layout.
+This patch ensures that the flow block, where the other block's content gets moved to, is no longer on simple line layout path.
+Whether the final flow block ends up using inline boxes or simple line layout will be determined during the next layout.
+
+* fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt: Added.
+* fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html: Added.
+
 2015-06-16  Alexey Proskuryakov  a...@apple.com
 
 Add expectations for a couple flaky tests:


Added: branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt (0 => 186610)

--- branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt	2015-07-09 21:01:46 UTC (rev 186610)
@@ -0,0 +1,2 @@
+Pass if no crash or assert in debug.
+foo


Added: branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html (0 => 186610)

--- branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html	2015-07-09 21:01:46 UTC (rev 186610)
@@ -0,0 +1,19 @@
+!DOCTYPE html
+html
+head
+titleThis tests when 2 anonymous blocks are merged and the 'to' block has simple line layout path./title
+/head
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+divPass if no crash or assert in debug./divfoodiv id=removethis/divspan
+script
+document.body.offsetWidth;
+var elem = document.getElementById(removethis);
+elem.parentNode.removeChild(elem);
+/script
+/body
+/html


Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186609 => 186610)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 20:47:58 UTC (rev 186609)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:01:46 UTC (rev 186610)
@@ -1,3 +1,28 @@
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186502. rdar://problem/21707910
+
+2015-07-07  Matthew Hanson  matthew_han...@apple.com
+
+Merge r184577. rdar://problem/21708263
+
+2015-05-19  Zalan Bujtas  za...@apple.com
+
+Merged anonymous blocks should invalidate simple line layout path.
+https://bugs.webkit.org/show_bug.cgi?id=145104
+rdar://problem/20980930
+
+Reviewed by Antti Koivisto.
+
+When anonymous blocks are merged together, it's not guaranteed that the final block can use simple line layout.
+This patch ensures that the flow block, where the other block's content gets moved to, is no longer on simple line layout path.
+Whether the final flow block ends up using inline boxes or simple line layout will be determined during the next layout.
+
+Test: 

[webkit-changes] [186612] branches/safari-600.8-branch

[matthew_hanson]

Title: [186612] branches/safari-600.8-branch








Revision 186612
Author matthew_han...@apple.com
Date 2015-07-09 14:01:54 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186504. rdar://problem/21707900

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/rendering/SelectionSubtreeRoot.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186611 => 186612)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:50 UTC (rev 186611)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:01:54 UTC (rev 186612)
@@ -1,5 +1,38 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186504. rdar://problem/21707900
+
+2015-07-07  Matthew Hanson  matthew_han...@apple.com
+
+Merge r185838. rdar://problem/21708257
+
+2015-06-22  Zalan Bujtas  za...@apple.com
+
+REGRESSION(r169105) Dangling renderer pointer in SelectionSubtreeRoot::SelectionSubtreeData.
+https://bugs.webkit.org/show_bug.cgi?id=146116
+rdar://problem/20959369
+
+Reviewed by Brent Fulgham.
+
+This patch ensures that we don't adjust the selection unless the visual selection still matches this subtree root.
+
+When multiple selection roots are present we need to ensure that a RenderObject
+only shows up in one of them.
+RenderView::splitSelectionBetweenSubtrees(), as the name implies, splits the
+selection and sets the selection range (start/end) on each selection root.
+However, SelectionSubtreeRoot::adjustForVisibleSelection() later recomputes the range
+based on visible selection and that could end up collecting renderers as selection start/end
+from another selection subtree.
+RenderObject's holds the last selection state (RenderObject::setSelectionState).
+If we set a renderer first as on selection border and later inside using multiple selection roots,
+we can't clean up selections properly when this object gets destroyed.
+One of the roots ends up with a dangling RenderObject pointer.
+
+* fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt: Added.
+* fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186503. rdar://problem/21707907
 
 2015-07-07  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt (0 => 186612)

--- branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees-expected.txt	2015-07-09 21:01:54 UTC (rev 186612)
@@ -0,0 +1,4 @@
+foo
+Pass if no crash or assert in debug.
+foobar
+


Added: branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html (0 => 186612)

--- branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/regions/crash-when-renderer-is-in-multiple-selection-subtrees.html	2015-07-09 21:01:54 UTC (rev 186612)
@@ -0,0 +1,19 @@
+html id=webtest0
+head
+style
+	:last-child { -webkit-flow-into: foo; }
+/style
+
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+document.write(foobr);
+/script
+/head
+bodyPass if no crash or assert in debug.summary id=webtest5mathmlfemerge/femerge/mathmlfoobartable/table/summary/body
+script
+document.querySelector(#webtest0).appendChild(document.createElement(canvas));
+document.execCommand(SelectAll);
+document.getElementById(webtest5).appendChild(document.createElement(feconvolvematrix));
+/script
+/html


Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186611 => 186612)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:01:50 UTC (rev 186611)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:01:54 UTC (rev 186612)
@@ -1,5 +1,40 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186504. rdar://problem/21707900
+
+2015-07-07  Matthew Hanson  matthew_han...@apple.com
+
+Merge r185838. 

[webkit-changes] [186619] branches/safari-600.8-branch

[matthew_hanson]

Title: [186619] branches/safari-600.8-branch








Revision 186619
Author matthew_han...@apple.com
Date 2015-07-09 14:02:51 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186551. rdar://problem/21716372

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type-expected.txt
branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html
branches/safari-600.8-branch/LayoutTests/http/tests/security/cross-origin-css-expected.txt
branches/safari-600.8-branch/LayoutTests/http/tests/security/cross-origin-css.html
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/css/StyleSheetContents.cpp
branches/safari-600.8-branch/Source/WebCore/dom/ProcessingInstruction.cpp
branches/safari-600.8-branch/Source/WebCore/inspector/InspectorPageAgent.cpp
branches/safari-600.8-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp
branches/safari-600.8-branch/Source/WebCore/loader/cache/CachedCSSStyleSheet.h




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186618 => 186619)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:45 UTC (rev 186618)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:51 UTC (rev 186619)
@@ -1,5 +1,28 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186551. rdar://problem/21716372
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r180020. rdar://problem/21716511
+
+2015-02-12  Chris Dumez  cdu...@apple.com
+
+Drop the quirks-mode exception for CSS MIME types
+https://bugs.webkit.org/show_bug.cgi?id=141501
+
+Reviewed by Alexey Proskuryakov.
+
+Update a couple of layout tests now that we dropped the quirks-mode
+exception for CSS MIME types.
+
+* http/tests/misc/css-accept-any-type-expected.txt:
+* http/tests/misc/css-accept-any-type.html:
+* http/tests/security/cross-origin-css-expected.txt:
+* http/tests/security/cross-origin-css.html:
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186539. rdar://problem/21707873
 
 2015-07-08  Lucas Forschler  lforsch...@apple.com


Modified: branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type-expected.txt (186618 => 186619)

--- branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type-expected.txt	2015-07-09 21:02:45 UTC (rev 186618)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type-expected.txt	2015-07-09 21:02:51 UTC (rev 186619)
@@ -1,3 +1,3 @@
-Test for http://bugs.webkit.org/show_bug.cgi?id=11451 REGRESSION: Dell.com does not render correctly in ToT (stylesheet not loaded).
+This was a test for http://bugs.webkit.org/show_bug.cgi?id=11451 REGRESSION: Dell.com does not render correctly in ToT (stylesheet not loaded): given the security implications of accepting bad MIME types, we're now intentionally breaking this case to match other browsers.
 
 SUCCESS


Modified: branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html (186618 => 186619)

--- branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html	2015-07-09 21:02:45 UTC (rev 186618)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html	2015-07-09 21:02:51 UTC (rev 186619)
@@ -10,14 +10,17 @@
 
 var target = document.getElementById(target);
 var style = getComputedStyle(target);
-target.innerText = style.position == relative ? SUCCESS : FAIL;
+target.innerText = style.position == relative ? FAIL : SUCCESS;
 }
 /script
 /head
 body _onload_=test()
 p
-Test for ia href=""
-REGRESSION: Dell.com does not render correctly in ToT (stylesheet not loaded)/i.
+This was a test for
+ia href=""
+REGRESSION: Dell.com does not render correctly in ToT (stylesheet not loaded)/i:
+given the security implications of accepting bad MIME types, we're now
+intentionally breaking this case to match other browsers.
 /p
 p id=target
 /p


Modified: branches/safari-600.8-branch/LayoutTests/http/tests/security/cross-origin-css-expected.txt (186618 => 186619)

--- branches/safari-600.8-branch/LayoutTests/http/tests/security/cross-origin-css-expected.txt	2015-07-09 21:02:45 UTC (rev 186618)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/security/cross-origin-css-expected.txt	2015-07-09 21:02:51 UTC (rev 186619)
@@ -1,7 +1,11 @@
-LINK Cross-origin, HTML, valid: rgb(255, 255, 0)
-LINK + IMPORT Cross-origin, HTML, invalid: rgba(0, 0, 0, 0)
-LINK Cross-origin, CSS, invalid: rgb(255, 255, 0)
-LINK Same-origin, HTML, invalid: rgb(255, 255, 0)
-IMPORT Cross-origin, HTML, valid: rgb(255, 

[webkit-changes] [186631] branches/safari-600.8-branch

[matthew_hanson]

Title: [186631] branches/safari-600.8-branch








Revision 186631
Author matthew_han...@apple.com
Date 2015-07-09 14:03:34 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186575. rdar://problem/21716377

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186630 => 186631)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:29 UTC (rev 186630)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:34 UTC (rev 186631)
@@ -1,5 +1,28 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186575. rdar://problem/21716377
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r185665. rdar://problem/21716515
+
+2015-06-17  Zalan Bujtas  za...@apple.com
+
+Selection cache produces invalid result when ancestor has float element.
+https://bugs.webkit.org/show_bug.cgi?id=146042
+rdar://problem/20604592
+
+Reviewed by Ryosuke Niwa.
+
+Selection cache already takes floats into account, however it's not enough to check current
+block against floats. Any of the ancestor's float starting from the selection root block
+can impact the selection offsets.
+
+* fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float-expected.txt: Added.
+* fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186571. rdar://problem/21716420
 
 2015-07-08  Lucas Forschler  lforsch...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float-expected.txt (0 => 186631)

--- branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float-expected.txt	2015-07-09 21:03:34 UTC (rev 186631)
@@ -0,0 +1,2 @@
+Pass if no crash or assert in debug.
+bar


Added: branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html (0 => 186631)

--- branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html	2015-07-09 21:03:34 UTC (rev 186631)
@@ -0,0 +1,28 @@
+!DOCTYPE html
+html
+head
+style
+ol {
+	margin: 0px;
+}
+
+.float {
+float: left;
+width: 100px;
+	height: 100px;
+}
+/style
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+olliPass if no crash or assert in debug./li/ol
+div class=floatbar/div
+script
+document.designMode = on;
+document.execCommand(SelectAll);
+/script
+/body
+/html
\ No newline at end of file


Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186630 => 186631)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:29 UTC (rev 186630)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:34 UTC (rev 186631)
@@ -1,5 +1,35 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186575. rdar://problem/21716377
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r185665. rdar://problem/21716515
+
+2015-06-17  Zalan Bujtas  za...@apple.com
+
+Selection cache produces invalid result when ancestor has float element.
+https://bugs.webkit.org/show_bug.cgi?id=146042
+rdar://problem/20604592
+
+Reviewed by Ryosuke Niwa.
+
+Selection cache already takes floats into account, however it's not enough to check current
+block against floats. Any of the ancestor's float starting from the selection root block
+can impact the selection offsets.
+
+Test: fast/block/selection-cache-is-incorrect-when-non-direct-parent-has-float.html
+
+* rendering/LogicalSelectionOffsetCaches.h:
+(WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::ContainingBlockInfo):
+

[webkit-changes] [186626] branches/safari-600.8-branch/Source/WebKit2

[matthew_hanson]

Title: [186626] branches/safari-600.8-branch/Source/WebKit2








Revision 186626
Author matthew_han...@apple.com
Date 2015-07-09 14:03:16 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186559. rdar://problem/21716363

Modified Paths

branches/safari-600.8-branch/Source/WebKit2/ChangeLog
branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186625 => 186626)

--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-09 21:03:13 UTC (rev 186625)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-09 21:03:16 UTC (rev 186626)
@@ -1,5 +1,32 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186559. rdar://problem/21716363
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183861. rdar://problem/21716677
+
+2015-05-05  Alexey Proskuryakov  a...@apple.com
+
+NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
+https://bugs.webkit.org/show_bug.cgi?id=144641
+rdar://problem/20250960
+
+Reviewed by David Kilzer.
+
+* NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):
+Clear the client pointer.
+
+* Shared/Authentication/AuthenticationManager.cpp:
+(WebKit::AuthenticationManager::useCredentialForChallenge):
+(WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+(WebKit::AuthenticationManager::cancelChallenge):
+(WebKit::AuthenticationManager::performDefaultHandling):
+(WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
+Updated comments, which were not accurate, at least on Mac.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186539. rdar://problem/21707873
 
 2015-07-08  Lucas Forschler  lforsch...@apple.com


Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186625 => 186626)

--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-09 21:03:13 UTC (rev 186625)
+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-09 21:03:16 UTC (rev 186626)
@@ -98,7 +98,7 @@
 m_resourceSandboxExtensions.append(resourceSandboxExtension);
 
 ASSERT(RunLoop::isMain());
-
+
 if (reply || parameters.shouldBufferResource)
 m_bufferedData = WebCore::SharedBuffer::create();
 
@@ -161,12 +161,9 @@
 
 // Tell the scheduler about this finished loader soon so it can start more network requests.
 NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
-
 if (m_handle) {
-// Explicit deref() balanced by a ref() in NetworkResourceLoader::start()
-// This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.
-m_handle = 0;
-deref();
+m_handle-setClient(nullptr);
+m_handle = nullptr;
 }
 }
 
@@ -215,7 +212,7 @@
 
 // FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.
 // Such buffering will need to be thread safe, as this callback is happening on a background thread.
-
+
 m_bytesReceived += buffer-size();
 if (m_bufferedData)
 m_bufferedData-append(buffer.get());


Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (186625 => 186626)

--- branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-09 21:03:13 UTC (rev 186625)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-09 21:03:16 UTC (rev 186626)
@@ -116,7 +116,8 @@
 
 AuthenticationClient* coreClient = challenge.authenticationClient();
 if (!coreClient) {
-// This authentication challenge comes from a download.
+// FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+// We should not call Download::receivedCredential in the latter case.
 Download::receivedCredential(challenge, credential);
 return;
 }
@@ -132,7 +133,8 @@
 ASSERT(!challenge.isNull());
 AuthenticationClient* coreClient = challenge.authenticationClient();
 if (!coreClient) {
-// This authentication challenge comes from a download.
+// FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
+// We should not call Download::receivedCredential in the latter case.
 Download::receivedRequestToContinueWithoutCredential(challenge);
 return;
 

[webkit-changes] [186627] branches/safari-600.8-branch

[matthew_hanson]

Title: [186627] branches/safari-600.8-branch








Revision 186627
Author matthew_han...@apple.com
Date 2015-07-09 14:03:20 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186560. rdar://problem/21716387

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h
branches/safari-600.8-branch/Source/WebCore/rendering/line/LineBreaker.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186626 => 186627)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:16 UTC (rev 186626)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:20 UTC (rev 186627)
@@ -1,5 +1,24 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186560. rdar://problem/21716387
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r184653. rdar://problem/21716528
+
+2015-05-20  Antti Koivisto  an...@apple.com
+
+Assertion failure in WebCore::BidiRun::BidiRun()
+https://bugs.webkit.org/show_bug.cgi?id=145203
+rdar://problem/20958973
+
+Reviewed by Andreas Kling.
+
+* fast/text/text-combine-crash-expected.txt: Added.
+* fast/text/text-combine-crash.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186557. rdar://problem/21716382
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash-expected.txt (0 => 186627)

--- branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash-expected.txt	2015-07-09 21:03:20 UTC (rev 186627)
@@ -0,0 +1,21 @@
+CONSOLE MESSAGE: line 149: TypeError: undefined is not an object (evaluating 'document.forms[2].__lookupGetter__')
+CONSOLE MESSAGE: line 1: SyntaxError: Unexpected token ''
+Test passes if there's no crash.
+
+foo   
+
+
+Errlog webtest_fn_1: TypeError: undefined is not an object (evaluating 'document.applets[0].addEventListener')
+Errlog webtest_fn_2: NotFoundError: NotFoundError: DOM Exception 8
+Errlog webtest_fn_3: TypeError: undefined is not an object (evaluating 'document.images[2].contentEditable=true')
+Errlog webtest_fn_8: TypeError: null is not an object (evaluating 'lis.length')
+Errlog webtest_fn_9: TypeError: undefined is not an object (evaluating 'document.anchors[4].setAttribute')
+Errlog webtest_fn_10: NotFoundError: NotFoundError: DOM Exception 8
+Errlog webtest_fn_15: NotFoundError: NotFoundError: DOM Exception 8
+Errlog webtest_fn_16: TypeError: undefined is not an object (evaluating 'elem.parentNode')
+Errlog webtest_fn_18: TypeError: undefined is not an object (evaluating 'document.applets[0].contentEditable=true')
+Errlog webtest_fn_21: TypeError: undefined is not an object (evaluating 'document.anchors[4].appendChild')
+
+Errlog webtest_fn_24: HierarchyRequestError: HierarchyRequestError: DOM Exception 3
+Errlog webtest_fn_25: ReferenceError: Can't find variable: node_16
+


Added: branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash.html (0 => 186627)

--- branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/text/text-combine-crash.html	2015-07-09 21:03:20 UTC (rev 186627)
@@ -0,0 +1,579 @@
+html id=webtest0
+head id=webtest1
+style id=webtest2
+body * {
+-webkit-writing-mode: vertical-lr;
+-webkit-text-combine: horizontal;
+}
+#test {
+height: 7px;
+white-space: pre-wrap;
+}
+/style
+script id=webtest3
+if (window.testRunner)
+testRunner.dumpAsText();
+
+function runTest() {
+document.body.offsetTop;
+var testContainer = document.getElementById('test');
+testContainer.parentNode.removeChild(testContainer);
+}
+/script
+/head
+body class=wf_class2 id=webtest4 _onload_='runTest()'p id=webtest5Test passes if there's no crash./p
+!-- The empty scripts tags are neededscript
+function webtest_fn_12() {
+try {
+var head = document.getElementsByTagName(head)[0];
+var style = document.createElement(style);
+style.innerHTML=@media speech {script
+function webtest_fn_34() {
+document.getElementById(webtest6).appendChild(document.createElementNS(http://www.w3.org/TR/html5/, u)).name=document.applets[0].lookupNamespacePrefix(nonzero, document.body);
+}
+webtest_fn_34();
+/script
+-webkit-flex-order:1024;max-zoom:9223372036854775808%;};
+head.appendChild(style);
+} catch(e) {
+  document.write(Errlog webtest_fn_12:  + e.name + :  + e.message + br);
+}
+}

[webkit-changes] [186608] trunk/Source/WebCore

[commit-queue]

Title: [186608] trunk/Source/WebCore








Revision 186608
Author commit-qu...@webkit.org
Date 2015-07-09 13:47:15 -0700 (Thu, 09 Jul 2015)


Log Message
Implementing platform-specific section of enumerateDevices
https://bugs.webkit.org/show_bug.cgi?id=146461
rdar://problem/21614466

Patch by Matthew Daiter mdai...@apple.com on 2015-07-09
Reviewed by Darin Adler.

* Modules/mediastream/MediaDeviceInfo.cpp: Changed access methods
(WebCore::MediaDeviceInfo::audioInputType): Added AtomicString
permanent refs
(WebCore::MediaDeviceInfo::audioOutputType): Ditto
(WebCore::MediaDeviceInfo::videoInputType): Ditto
* Modules/mediastream/MediaDeviceInfo.h: Changed String refs to values
(WebCore::MediaDeviceInfo::label): Ditto
(WebCore::MediaDeviceInfo::deviceId): Ditto
(WebCore::MediaDeviceInfo::groupId): Ditto
(WebCore::MediaDeviceInfo::kind): Ditto
* platform/mediastream/MediaDevicesPrivate.cpp: Implemented query for
available devices
(WebCore::MediaDevicesPrivate::MediaDevicesPrivate):
(WebCore::MediaDevicesPrivate::create):
(WebCore::MediaDevicesPrivate::availableMediaDevices):
* platform/mediastream/MediaDevicesPrivate.h:
(WebCore::MediaDevicesPrivate::~MediaDevicesPrivate):
* WebCore.xcodeproj/project.pbxproj:
* platform/mediastream/MediaStreamTrackSourcesRequestClient.h: Needed
to tack on extra fields to hold data
(WebCore::TrackSourceInfo::create):
(WebCore::TrackSourceInfo::groupId):
(WebCore::TrackSourceInfo::deviceId):
(WebCore::TrackSourceInfo::TrackSourceInfo):
* platform/mediastream/mac/AVCaptureDeviceManager.mm:
(WebCore::AVCaptureDeviceManager::getSourcesInfo):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.cpp
trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.h
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/mediastream/MediaStreamTrackSourcesRequestClient.h
trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm


Added Paths

trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.cpp
trunk/Source/WebCore/platform/mediastream/MediaDevicesPrivate.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186607 => 186608)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 20:37:49 UTC (rev 186607)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 20:47:15 UTC (rev 186608)
@@ -1,3 +1,38 @@
+2015-07-09  Matthew Daiter  mdai...@apple.com
+
+Implementing platform-specific section of enumerateDevices
+https://bugs.webkit.org/show_bug.cgi?id=146461
+rdar://problem/21614466
+
+Reviewed by Darin Adler.
+
+* Modules/mediastream/MediaDeviceInfo.cpp: Changed access methods
+(WebCore::MediaDeviceInfo::audioInputType): Added AtomicString
+permanent refs
+(WebCore::MediaDeviceInfo::audioOutputType): Ditto
+(WebCore::MediaDeviceInfo::videoInputType): Ditto
+* Modules/mediastream/MediaDeviceInfo.h: Changed String refs to values
+(WebCore::MediaDeviceInfo::label): Ditto
+(WebCore::MediaDeviceInfo::deviceId): Ditto
+(WebCore::MediaDeviceInfo::groupId): Ditto
+(WebCore::MediaDeviceInfo::kind): Ditto
+* platform/mediastream/MediaDevicesPrivate.cpp: Implemented query for
+available devices
+(WebCore::MediaDevicesPrivate::MediaDevicesPrivate):
+(WebCore::MediaDevicesPrivate::create):
+(WebCore::MediaDevicesPrivate::availableMediaDevices):
+* platform/mediastream/MediaDevicesPrivate.h:
+(WebCore::MediaDevicesPrivate::~MediaDevicesPrivate):
+* WebCore.xcodeproj/project.pbxproj:
+* platform/mediastream/MediaStreamTrackSourcesRequestClient.h: Needed
+to tack on extra fields to hold data
+(WebCore::TrackSourceInfo::create):
+(WebCore::TrackSourceInfo::groupId):
+(WebCore::TrackSourceInfo::deviceId):
+(WebCore::TrackSourceInfo::TrackSourceInfo):
+* platform/mediastream/mac/AVCaptureDeviceManager.mm:
+(WebCore::AVCaptureDeviceManager::getSourcesInfo):
+
 2015-07-09  Per Arne Vollan  pe...@outlook.com
 
 [Win] Add memory pressure handler.


Modified: trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.cpp (186607 => 186608)

--- trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.cpp	2015-07-09 20:37:49 UTC (rev 186607)
+++ trunk/Source/WebCore/Modules/mediastream/MediaDeviceInfo.cpp	2015-07-09 20:47:15 UTC (rev 186608)
@@ -30,6 +30,7 @@
 
 #include ContextDestructionObserver.h
 #include ScriptWrappable.h
+#include wtf/NeverDestroyed.h
 
 namespace WebCore {
 
@@ -47,6 +48,24 @@
 {
 }
 
+const AtomicString MediaDeviceInfo::audioInputType()
+{
+static NeverDestroyedAtomicString audioinput(audioinput);
+return audioinput;
+}
+
+const AtomicString MediaDeviceInfo::audioOutputType()
+{
+static NeverDestroyedAtomicString audiooutput(audiooutput);
+return audiooutput;
+}
+
+const AtomicString MediaDeviceInfo::videoInputType()
+{
+static 

[webkit-changes] [186609] trunk/Tools

[drousso]

Title: [186609] trunk/Tools








Revision 186609
Author drou...@apple.com
Date 2015-07-09 13:47:58 -0700 (Thu, 09 Jul 2015)


Log Message
Unreviewed.  Added myself as a committer.

* Scripts/webkitpy/common/config/contributors.json:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json




Diff

Modified: trunk/Tools/ChangeLog (186608 => 186609)

--- trunk/Tools/ChangeLog	2015-07-09 20:47:15 UTC (rev 186608)
+++ trunk/Tools/ChangeLog	2015-07-09 20:47:58 UTC (rev 186609)
@@ -1,3 +1,9 @@
+2015-07-09  Devin Rousso  drou...@apple.com
+
+Unreviewed.  Added myself as a committer.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
 2015-07-09  Timothy Horton  timothy_hor...@apple.com
 
 Add a way to set the default URL from Minibrowser UI


Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (186608 => 186609)

--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2015-07-09 20:47:15 UTC (rev 186608)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2015-07-09 20:47:58 UTC (rev 186609)
@@ -718,6 +718,14 @@
 dnomi
  ]
   },
+  Devin Rousso : {
+ emails : [
+drou...@apple.com
+ ],
+ nicks : [
+drousso
+ ]
+  },
   Dhi Aurrahman : {
  emails : [
 diorah...@rockybars.com






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186623] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186623] branches/safari-600.8-branch/Source/WebCore








Revision 186623
Author matthew_han...@apple.com
Date 2015-07-09 14:03:05 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186556. rdar://problem/21716415

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186622 => 186623)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:02 UTC (rev 186622)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:05 UTC (rev 186623)
@@ -1,5 +1,26 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186556. rdar://problem/21716415
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183398. rdar://problem/21716555
+
+2015-04-27  Darin Adler  da...@apple.com
+
+Crashes under IDBDatabase::closeConnection
+https://bugs.webkit.org/show_bug.cgi?id=141745
+
+Reviewed by Alexey Proskuryakov.
+
+* Modules/indexeddb/IDBDatabase.cpp:
+(WebCore::IDBDatabase::~IDBDatabase): Do the work of close/closeConnection without
+actually calling those functions.
+(WebCore::IDBDatabase::closeConnection): Protect the database so it's not destroyed
+in the middle of this function's execution.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186554. rdar://problem/21716400
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (186622 => 186623)

--- branches/safari-600.8-branch/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp	2015-07-09 21:03:02 UTC (rev 186622)
+++ branches/safari-600.8-branch/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp	2015-07-09 21:03:05 UTC (rev 186623)
@@ -70,7 +70,26 @@
 
 IDBDatabase::~IDBDatabase()
 {
-close();
+// This does what IDBDatabase::close does, but without any ref/deref of the
+// database since it is already in the process of being deleted. The logic here
+// is also simpler since we know there are no transactions (since they ref the
+// database when they are alive).
+
+ASSERT(m_transactions.isEmpty());
+
+if (!m_closePending) {
+m_closePending = true;
+m_backend-close(m_databaseCallbacks);
+}
+
+if (auto* context = scriptExecutionContext()) {
+// Remove any pending versionchange events scheduled to fire on this
+// connection. They would have been scheduled by the backend when another
+// connection called setVersion, but the frontend connection is being
+// closed before they could fire.
+for (auto event : m_enqueuedEvents)
+context-eventQueue().cancelEvent(*event);
+}
 }
 
 int64_t IDBDatabase::nextTransactionId()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186621] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186621] branches/safari-600.8-branch/Source/WebCore








Revision 186621
Author matthew_han...@apple.com
Date 2015-07-09 14:03:00 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186554. rdar://problem/21716400

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/html/HTMLMediaElement.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186620 => 186621)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:02:56 UTC (rev 186620)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:00 UTC (rev 186621)
@@ -1,5 +1,23 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186554. rdar://problem/21716400
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r182918. rdar://problem/21716544
+
+2015-04-16  Brady Eidson  beid...@apple.com
+
+Media element can manipulate DOM during Document destruction.
+rdar://problem/20553898 and https://bugs.webkit.org/show_bug.cgi?id=143780
+
+Reviewed by Jer Noble.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::configureMediaControls): Bail if the element has no active document.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186553. rdar://problem/21716372
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/html/HTMLMediaElement.cpp (186620 => 186621)

--- branches/safari-600.8-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-07-09 21:02:56 UTC (rev 186620)
+++ branches/safari-600.8-branch/Source/WebCore/html/HTMLMediaElement.cpp	2015-07-09 21:03:00 UTC (rev 186621)
@@ -155,7 +155,7 @@
 {
 value = ~flags;
 }
-
+
 #if !LOG_DISABLED
 static String urlForLoggingMedia(const URL url)
 {
@@ -173,7 +173,7 @@
 #endif
 
 #ifndef LOG_MEDIA_EVENTS
-// Default to not logging events because so many are generated they can overwhelm the rest of 
+// Default to not logging events because so many are generated they can overwhelm the rest of
 // the logging.
 #define LOG_MEDIA_EVENTS 0
 #endif
@@ -245,7 +245,7 @@
 ASSERT(m_mediaElement);
 m_mediaElement-endIgnoringTrackDisplayUpdateRequests();
 }
-
+
 private:
 HTMLMediaElement* m_mediaElement;
 };
@@ -643,7 +643,7 @@
 {
 HTMLElement::finishParsingChildren();
 m_parsingInProgress = false;
-
+
 #if ENABLE(VIDEO_TRACK)
 if (!RuntimeEnabledFeatures::sharedFeatures().webkitVideoTrackEnabled())
 return;
@@ -786,7 +786,7 @@
 LOG(Media, HTMLMediaElement::scheduleEvent - scheduling '%s', eventName.string().ascii().data());
 #endif
 RefPtrEvent event = Event::create(eventName, false, true);
-
+
 // Don't set the event target, the event queue will set it in GenericEventQueue::timerFired and setting it here
 // will trigger an ASSERT if this element has been marked for deletion.
 
@@ -817,7 +817,7 @@
 m_pendingActionFlags = 0;
 }
 
-PassRefPtrMediaError HTMLMediaElement::error() const 
+PassRefPtrMediaError HTMLMediaElement::error() const
 {
 return m_error;
 }
@@ -874,7 +874,7 @@
 canPlay = ASCIILiteral(probably);
 break;
 }
-
+
 LOG(Media, HTMLMediaElement::canPlayType(%s, %s, %s) - %s, mimeType.utf8().data(), keySystem.utf8().data(), url.stringCenterEllipsizedToLength().utf8().data(), canPlay.utf8().data());
 
 return canPlay;
@@ -883,9 +883,9 @@
 void HTMLMediaElement::load()
 {
 RefHTMLMediaElement protect(*this); // loadInternal may result in a 'beforeload' event, which can make arbitrary DOM mutations.
-
+
 LOG(Media, HTMLMediaElement::load());
-
+
 if (!m_mediaSession-dataLoadingPermitted(*this))
 return;
 if (ScriptController::processingUserGesture())
@@ -917,7 +917,7 @@
 m_loadState = WaitingForSource;
 m_currentSourceNode = 0;
 
-// 2 - If there are any tasks from the media element's media element event task source in 
+// 2 - If there are any tasks from the media element's media element event task source in
 // one of the task queues, then remove those tasks.
 cancelPendingEventsAndCallbacks();
 
@@ -999,7 +999,7 @@
 m_lastSeekTime = MediaTime::zeroTime();
 
 // The spec doesn't say to block the load event until we actually run the asynchronous section
-// algorithm, but do it now because we won't start that until after the timer fires and the 
+// algorithm, but do it now because we won't start that until after the timer fires and the
 // event may have already fired by then.
 MediaPlayer::Preload effectivePreload = m_mediaSession-effectivePreloadForElement(*this);
 if (effectivePreload != MediaPlayer::None)
@@ -1033,8 +1033,8 @@
 
 clearFlags(m_pendingActionFlags, LoadMediaResource);
 
-// Once the page has allowed an element to load media, it is 

[webkit-changes] [186620] branches/safari-600.8-branch

[matthew_hanson]

Title: [186620] branches/safari-600.8-branch








Revision 186620
Author matthew_han...@apple.com
Date 2015-07-09 14:02:56 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186553. rdar://problem/21716372

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html
branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-reject-any-type-in-strict-mode.html
branches/safari-600.8-branch/Source/_javascript_Core/ChangeLog
branches/safari-600.8-branch/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/inspector/InspectorPageAgent.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/
branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type-expected.txt
branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type.html
branches/safari-600.8-branch/LayoutTests/http/tests/misc/resources/stylesheet-bad-mime-type.php


Removed Paths

branches/safari-600.8-branch/LayoutTests/http/tests/misc/resources/stylesheet.php




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186619 => 186620)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:51 UTC (rev 186619)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:56 UTC (rev 186620)
@@ -1,5 +1,31 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186553. rdar://problem/21716372
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r182829. rdar://problem/21716511
+
+2015-04-14  Chris Dumez  cdu...@apple.com
+
+Regression(r180020): Web Inspector crashes on pages that have a stylesheet with an invalid MIME type
+https://bugs.webkit.org/show_bug.cgi?id=143745
+rdar://problem/20243916
+
+Reviewed by Joseph Pecoraro.
+
+Add layout test that shows the Web inspector on a page that has
+a stylesheet with an invalid MIME type, to make sure we don't
+crash.
+
+* http/tests/inspector/css/bad-mime-type-expected.txt: Added.
+* http/tests/inspector/css/bad-mime-type.html: Added.
+* http/tests/misc/css-accept-any-type.html:
+* http/tests/misc/css-reject-any-type-in-strict-mode.html:
+* http/tests/misc/resources/stylesheet-bad-mime-type.php: Renamed from LayoutTests/http/tests/misc/resources/stylesheet.php.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186551. rdar://problem/21716372
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type-expected.txt (0 => 186620)

--- branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type-expected.txt	2015-07-09 21:02:56 UTC (rev 186620)
@@ -0,0 +1,3 @@
+Tests that showing Web Inspector on a page that has a stylesheet with an invalid MIME type does not crash.
+
+This test passes if it does not crash.


Added: branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type.html (0 => 186620)

--- branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/inspector/css/bad-mime-type.html	2015-07-09 21:02:56 UTC (rev 186620)
@@ -0,0 +1,20 @@
+!DOCTYPE html
+html
+head
+script type=text/_javascript_ src=""
+
+!-- This stylesheet is served with an invalid MIME type --
+link rel=stylesheet href=""
+
+script
+function test()
+{
+InspectorTest.completeTest();
+}
+/script
+/head
+body _onload_=runTest()
+pTests that showing Web Inspector on a page that has a stylesheet with an invalid MIME type does not crash./p
+pThis test passes if it does not crash./p
+/body
+/html


Modified: branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html (186619 => 186620)

--- branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html	2015-07-09 21:02:51 UTC (rev 186619)
+++ branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-accept-any-type.html	2015-07-09 21:02:56 UTC (rev 186620)
@@ -1,7 +1,7 @@
 html
 head
 title/title
-link rel=stylesheet href=""
+link rel=stylesheet href=""
 script
 function test()
 {


Modified: branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-reject-any-type-in-strict-mode.html (186619 => 186620)

--- branches/safari-600.8-branch/LayoutTests/http/tests/misc/css-reject-any-type-in-strict-mode.html	2015-07-09 21:02:51 UTC (rev 186619)
+++ 

[webkit-changes] [186624] branches/safari-600.8-branch

[matthew_hanson]

Title: [186624] branches/safari-600.8-branch








Revision 186624
Author matthew_han...@apple.com
Date 2015-07-09 14:03:10 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186557. rdar://problem/21716382

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/dom/Element.cpp
branches/safari-600.8-branch/Source/WebCore/dom/Element.h
branches/safari-600.8-branch/Source/WebCore/dom/TreeScope.cpp
branches/safari-600.8-branch/Source/WebCore/dom/TreeScope.h


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form.html
branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186623 => 186624)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:05 UTC (rev 186623)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:10 UTC (rev 186624)
@@ -1,5 +1,29 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186557. rdar://problem/21716382
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183436. rdar://problem/21716524
+
+2015-04-27  Daniel Bates  daba...@apple.com
+
+Form control may be associated with the wrong HTML Form element after form id change
+https://bugs.webkit.org/show_bug.cgi?id=133456
+rdar://problem/17095055
+
+Reviewed by Andy Estes.
+
+Add tests to ensure that we associate the correct HTML Form element with a
+select after changing the id of its associated HTML form element.
+
+* fast/forms/change-form-id-to-be-unique-expected.txt: Added.
+* fast/forms/change-form-id-to-be-unique-then-submit-form-expected.txt: Added.
+* fast/forms/change-form-id-to-be-unique-then-submit-form.html: Added.
+* fast/forms/change-form-id-to-be-unique.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186553. rdar://problem/21716372
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-expected.txt (0 => 186624)

--- branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-expected.txt	2015-07-09 21:03:10 UTC (rev 186624)
@@ -0,0 +1 @@
+PASS did not cause an assertion failure.


Added: branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form-expected.txt (0 => 186624)

--- branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form-expected.txt	2015-07-09 21:03:10 UTC (rev 186624)
@@ -0,0 +1,4 @@
+This tests that we submit the form element associated with id a after changing the id of one of the form id=as in a document that contains two such HTML Form elements.
+
+PASS submitted second form.
+


Added: branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form.html (0 => 186624)

--- branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/forms/change-form-id-to-be-unique-then-submit-form.html	2015-07-09 21:03:10 UTC (rev 186624)
@@ -0,0 +1,45 @@
+!DOCTYPE html
+html
+head
+style
+#test-container { visibility: hidden; }
+/style
+script
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+function logMessageAndDone(message)
+{
+document.getElementById(console).textContent = message;
+if (window.testRunner)
+testRunner.notifyDone();
+}
+
+function runTest()
+{
+var search = document.location.search;
+if (search === ?submitted=secondFormElement)
+logMessageAndDone(PASS submitted second form.);
+else if (search === ?submitted=firstFormElement)
+logMessageAndDone(FAIL should have submitted second form, but submitted first form.);
+else {
+document.getElementById(a).id = y; // Changes the id of the first form (traversing the DOM from top-to-bottom).
+document.getElementById(submit).click();
+}
+}
+
+window._onload_ = runTest;
+/script
+/head
+body
+pThis tests that we submit the form element associated with id quot;aquot; after changing the id of 

[webkit-changes] [186630] branches/safari-600.8-branch

[matthew_hanson]

Title: [186630] branches/safari-600.8-branch








Revision 186630
Author matthew_han...@apple.com
Date 2015-07-09 14:03:29 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186571. rdar://problem/21716420

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/platform/graphics/IntRect.h
branches/safari-600.8-branch/Source/WebCore/platform/graphics/filters/FEComposite.cpp
branches/safari-600.8-branch/Source/WebCore/platform/graphics/filters/FilterEffect.cpp
branches/safari-600.8-branch/Source/WebCore/platform/graphics/filters/FilterEffect.h


Added Paths

branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators-expected.svg
branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators.svg




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186629 => 186630)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:25 UTC (rev 186629)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:29 UTC (rev 186630)
@@ -1,5 +1,25 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186571. rdar://problem/21716420
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r185392
+
+2015-06-09  Said Abou-Hallawa  sabouhall...@apple.com
+
+feComposite filter does not clip the paint rect to its effect rect when the operator is 'in' or 'atop'
+https://bugs.webkit.org/show_bug.cgi?id=137856
+
+Reviewed by Darin Adler.
+
+* svg/filters/feComposite-background-rect-control-operators-expected.svg: Added.
+* svg/filters/feComposite-background-rect-control-operators.svg: Added.
+Ensure the painting rect of the feComposite filter with operator 'in' or
+'atop' is clipped to its bounding rectangle
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186560. rdar://problem/21716387
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators-expected.svg (0 => 186630)

--- branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators-expected.svg	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators-expected.svg	2015-07-09 21:03:29 UTC (rev 186630)
@@ -0,0 +1,4 @@
+svg xmlns=http://www.w3.org/2000/svg xmlns:xlink=http://www.w3.org/1999/xlink width=200 height=100
+  rect x=20 y=20 width=60 height=60 fill=green/
+  rect x=120 y=20 width=60 height=60 fill=green/
+/svg
\ No newline at end of file


Added: branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators.svg (0 => 186630)

--- branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators.svg	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/svg/filters/feComposite-background-rect-control-operators.svg	2015-07-09 21:03:29 UTC (rev 186630)
@@ -0,0 +1,14 @@
+svg xmlns=http://www.w3.org/2000/svg xmlns:xlink=http://www.w3.org/1999/xlink width=200 height=100
+  filter id=filter-in filterUnits=objectBoundingBox primitiveUnits=objectBoundingBox x=0 y=0 width=1 height=1
+feFlood flood-color=orange x=0 y=0 width=0.9 height=0.9 result=flood-orange/
+feFlood flood-color=green x=0.1 y=0.1 width=0.9 height=0.9 result=flood-green/
+feComposite x=0.2 y=0.2 width=0.6 height=0.6 operator=in in=flood-green in2=flood-orange/
+  /filter
+  filter id=filter-atop filterUnits=objectBoundingBox primitiveUnits=objectBoundingBox x=0 y=0 width=1 height=1
+feFlood flood-color=orange x=0 y=0 width=0.8 height=0.8 result=flood-orange/
+feFlood flood-color=green x=0.2 y=0.2 width=0.8 height=0.8 result=flood-green/
+feComposite x=0.2 y=0.2 width=0.8 height=0.8 operator=atop in=flood-green in2=flood-orange/
+  /filter
+  rect x=  0 y=0 width=100 height=100 fill=red filter=url(#filter-in)/
+  rect x=100 y=0 width=100 height=100 fill=red filter=url(#filter-atop)/
+/svg
\ No newline at end of file


Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186629 => 186630)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:25 UTC (rev 186629)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:29 UTC (rev 186630)
@@ -1,5 +1,47 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186571. rdar://problem/21716420
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r185392
+
+2015-06-09  Said Abou-Hallawa  sabouhall...@apple.com
+
+feComposite filter does not clip the paint rect to its effect rect when the operator is 'in' or 

[webkit-changes] [186633] branches/safari-600.8-branch

[matthew_hanson]

Title: [186633] branches/safari-600.8-branch








Revision 186633
Author matthew_han...@apple.com
Date 2015-07-09 14:03:46 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186591. rdar://problem/21716407

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/loader/DocumentLoader.cpp
branches/safari-600.8-branch/Source/WebCore/loader/FrameLoaderClient.h
branches/safari-600.8-branch/Source/WebKit2/ChangeLog
branches/safari-600.8-branch/Source/WebKit2/UIProcess/FrameLoadState.h
branches/safari-600.8-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp
branches/safari-600.8-branch/Source/WebKit2/UIProcess/WebPageProxy.h
branches/safari-600.8-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in
branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h
branches/safari-600.8-branch/Tools/ChangeLog
branches/safari-600.8-branch/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/ProvisionalURLChange.mm




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186632 => 186633)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:39 UTC (rev 186632)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:46 UTC (rev 186633)
@@ -1,5 +1,39 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186591. rdar://problem/21716407
+
+2015-07-09  David Kilzer  ddkil...@apple.com
+
+rdar://problem/21716549 Donner: Safari URL And _javascript_ Prompt Origin Spoof Vulnerability
+
+Merge r184151.
+
+2015-05-11  Dan Bernstein  m...@apple.com
+
+WebCore part of rdar://problem/20878075 Trying to navigate to an invalid URL loads about:blank, but -[WKWebView URL] returns the invalid URL
+
+Reviewed by Alexey Proskuryakov.
+
+Test: TestWebKitAPI/Tests/WebKit2Cocoa/ProvisionalURLChange.mm
+
+In some cases, trying to navigate to an invalid URL results in navigation to about:blank.
+When the about:blank load is committed, the UI process still thinks that the provisional
+URL is the original, invalid URL, and updates its state to reflect that that’s the URL that
+has been committed.
+
+The provisional URL changes (1) when a provisional load begins, (2) when a server redirect
+happens, (3) when the client changes the request in willSendRequest, and (4) in this
+about:blank case. For (1) and (2), there are frame loader client callbacks. (3) is client-
+initiated. So this patch addresses (4).
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::maybeLoadEmpty): If our request URL is changing to about:blank and
+while loading the main resource, call FrameLoaderClient::dispatchDidChangeProvisionalURL.
+* loader/FrameLoaderClient.h: Added dispatchDidChangeProvisionalURL with an empty
+implementation.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186577. rdar://problem/21533109
 
 2015-07-08  Lucas Forschler  lforsch...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/loader/DocumentLoader.cpp (186632 => 186633)

--- branches/safari-600.8-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 21:03:39 UTC (rev 186632)
+++ branches/safari-600.8-branch/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 21:03:46 UTC (rev 186633)
@@ -1389,8 +1389,12 @@
 if (!shouldLoadEmpty  !frameLoader()-client().representationExistsForURLScheme(m_request.url().protocol()))
 return false;
 
-if (m_request.url().isEmpty()  !frameLoader()-stateMachine().creatingInitialEmptyDocument())
+if (m_request.url().isEmpty()  !frameLoader()-stateMachine().creatingInitialEmptyDocument()) {
 m_request.setURL(blankURL());
+if (isLoadingMainResource())
+frameLoader()-client().dispatchDidChangeProvisionalURL();
+}
+
 String mimeType = shouldLoadEmpty ? text/html : frameLoader()-client().generatedMIMETypeForURLScheme(m_request.url().protocol());
 m_response = ResourceResponse(m_request.url(), mimeType, 0, String(), String());
 finishedLoading(monotonicallyIncreasingTime());


Modified: branches/safari-600.8-branch/Source/WebCore/loader/FrameLoaderClient.h (186632 => 186633)

--- branches/safari-600.8-branch/Source/WebCore/loader/FrameLoaderClient.h	2015-07-09 21:03:39 UTC (rev 186632)
+++ branches/safari-600.8-branch/Source/WebCore/loader/FrameLoaderClient.h	2015-07-09 21:03:46 UTC (rev 186633)
@@ -153,6 +153,7 @@
 
 virtual void dispatchDidHandleOnloadEvents() = 0;
 virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0;
+virtual void 

[webkit-changes] [186629] branches/safari-600.8-branch/Tools

[matthew_hanson]

Title: [186629] branches/safari-600.8-branch/Tools








Revision 186629
Author matthew_han...@apple.com
Date 2015-07-09 14:03:25 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186568. rdar://problem/21716428

Modified Paths

branches/safari-600.8-branch/Tools/ChangeLog
branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm




Diff

Modified: branches/safari-600.8-branch/Tools/ChangeLog (186628 => 186629)

--- branches/safari-600.8-branch/Tools/ChangeLog	2015-07-09 21:03:23 UTC (rev 186628)
+++ branches/safari-600.8-branch/Tools/ChangeLog	2015-07-09 21:03:25 UTC (rev 186629)
@@ -1,3 +1,17 @@
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186568. rdar://problem/21716428
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r184975. rdar://problem/21716564
+
+2015-05-28  Alexey Proskuryakov  a...@apple.com
+
+Update results of WebKit1.StringTruncator after r184965.
+
+* TestWebKitAPI/Tests/mac/StringTruncator.mm: (TestWebKitAPI::TEST):
+
 2015-06-08  Babak Shafiei  bshaf...@apple.com
 
 Merge r183682.


Modified: branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm (186628 => 186629)

--- branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm	2015-07-09 21:03:23 UTC (rev 186628)
+++ branches/safari-600.8-branch/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm	2015-07-09 21:03:25 UTC (rev 186629)
@@ -34,11 +34,11 @@
 {
 @autoreleasepool {
 #if __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
-EXPECT_STREQ([[WebStringTruncator centerTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], abcdef…tuvwxyz);
+EXPECT_STREQ([[WebStringTruncator centerTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], abcdefg…tuvwxyz);
 #else
 EXPECT_STREQ([[WebStringTruncator centerTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], abcdefg…tuvwxyz);
 #endif
-EXPECT_STREQ([[WebStringTruncator centerTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100] UTF8String], abcde…uvwxyz);
+EXPECT_STREQ([[WebStringTruncator centerTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100] UTF8String], abcdef…uvwxyz);
 EXPECT_STREQ([[WebStringTruncator rightTruncateString:@abcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], abcdefghijklmno…);
 EXPECT_STREQ([[WebStringTruncator centerTruncateString:@ābcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], ābcdefg…tuvwxyz);
 EXPECT_STREQ([[WebStringTruncator rightTruncateString:@ābcdefghijklmnopqrstuvwxyz toWidth:100 withFont:[NSFont fontWithName:@Helvetica size:12]] UTF8String], ābcdefghijklmno…);






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186628] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186628] branches/safari-600.8-branch/Source/WebCore








Revision 186628
Author matthew_han...@apple.com
Date 2015-07-09 14:03:23 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186567. rdar://problem/21716428

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186627 => 186628)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:20 UTC (rev 186627)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:23 UTC (rev 186628)
@@ -1,5 +1,42 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186567. rdar://problem/21716428
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r184965 rdar://problem/21716564
+
+2015-05-28  Myles C. Maxfield  mmaxfi...@apple.com
+
+Crash under ICU with ASAN during editing/selection/move-by-word-visually-crash-test-5.html
+https://bugs.webkit.org/show_bug.cgi?id=145429
+rdar://problem/20992218
+
+Reviewed by Alexey Proskuryakov.
+
+WebKit uses some strings which contain the lower 8-bits of UTF-16 (thereby saving space). However,
+ICU doesn't understand this encoding. When we want to use ICU functions with strings in this encoding,
+we create a UTextProvider which converts our encoded strings to UTF-16 for ICU, one chunk at a time.
+This object contains a vtable which we populate to perform the conversion.
+
+The WebKit function which actually returns the UTF-16 chunks has two relevant arguments: an index into
+the encoded string which ICU is requesting, and a direction from that index which ICU is interested
+in. This function populates a chunk which is characterized by a pointer to a buffer, the length of
+the populated data in the buffer, and an offset into the chunk which represents the index that the
+requested character was put into.
+
+When ICU requests data going backward, we fill in the chunk accordingly, with the requested character
+all the way at the end. We then set the offset equal to the length of the buffer. However, this length
+value is stale from the previous time the function ran. Therefore, ICU was reading the wrong index in
+the chunk when expecting the requested character.
+
+Covered by editing/selection/move-by-word-visually-crash-test-5.html.
+
+* platform/text/icu/UTextProviderLatin1.cpp:
+(WebCore::uTextLatin1Access):
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186560. rdar://problem/21716387
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp (186627 => 186628)

--- branches/safari-600.8-branch/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp	2015-07-09 21:03:20 UTC (rev 186627)
+++ branches/safari-600.8-branch/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp	2015-07-09 21:03:23 UTC (rev 186628)
@@ -104,7 +104,7 @@
 }
 if (index = length  uText-chunkNativeLimit == length) {
 // Off the end of the buffer, but we can't get it.
-uText-chunkOffset = uText-chunkLength;
+uText-chunkOffset = static_castint32_t(index - uText-chunkNativeStart);
 return FALSE;
 }
 } else {
@@ -136,7 +136,7 @@
 if (uText-chunkNativeStart  0)
 uText-chunkNativeStart = 0;
 
-uText-chunkOffset = uText-chunkLength;
+uText-chunkOffset = static_castint32_t(index - uText-chunkNativeStart);
 }
 uText-chunkLength = static_castint32_t(uText-chunkNativeLimit - uText-chunkNativeStart);
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186632] branches/safari-600.8-branch

[matthew_hanson]

Title: [186632] branches/safari-600.8-branch








Revision 186632
Author matthew_han...@apple.com
Date 2015-07-09 14:03:39 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186577. rdar://problem/21533109

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/page/FrameView.cpp
branches/safari-600.8-branch/Source/WebCore/page/FrameView.h
branches/safari-600.8-branch/Source/WebCore/rendering/RenderView.cpp


Added Paths

branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash-expected.txt
branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash.html




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186631 => 186632)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:34 UTC (rev 186631)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:03:39 UTC (rev 186632)
@@ -1,5 +1,46 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186577. rdar://problem/21533109
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r186165. rdar://problem/21533207
+
+2015-06-30  Zalan Bujtas  za...@apple.com
+
+Frame flattening: Hit-testing an iframe could end up destroying the associated inline tree context.
+https://bugs.webkit.org/show_bug.cgi?id=146447
+rdar://problem/20613501
+
+Reviewed by Simon Fraser.
+
+This patch ensures that the render tree associated with the document on which
+the hit-test is initiated does not get laid out, unless it was directly mutated prior to the hittest.
+
+Hit-test requirements:
+1. A clean the render tree before hit-testing gets propagated to the renderers.
+Document::updateLayout() ensures it by calling both updateStyleIfNeeded() and layout() not only on the current tree, but also
+on the ancestors if needed.
+
+2. No render tree mutation while hit-testing the renderers.
+
+When an iframe is being hit-tested, this hit-test could bubble down to the child frame's render view.
+In order to ensure #1, we call Document::updateLayout() on the current (subframe) document.
+If updateStyleIfNeeded() mutates the render tree, we mark it dirty for layout(). However frame flattening also
+marks the parent renderer (RenderIFrame) dirty.
+While calling layout() to clean the current render tree, we end up laying out the parent tree too.
+Laying out the parent tree could end up destroying the inline tree context from where the
+hittest just bubbled down. (InlineFlowBox - RenderWidget - RenderView).
+
+This patch protects the render tree from such unintentional inline tree mutation during hittesting.
+After the initial layout we set a layout disallow flag on the frame view to defer subsequent layouts.
+This patch only changes behavior when frame flattening is enabled, but in future we may always want to enable this.
+
+* fast/frames/flattening/hittest-iframe-while-style-changes-crash-expected.txt: Added.
+* fast/frames/flattening/hittest-iframe-while-style-changes-crash.html: Added.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186575. rdar://problem/21716377
 
 2015-07-08  Lucas Forschler  lforsch...@apple.com


Added: branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash-expected.txt (0 => 186632)

--- branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash-expected.txt	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash-expected.txt	2015-07-09 21:03:39 UTC (rev 186632)
@@ -0,0 +1 @@
+Pass if no crash or assert in debug. 


Added: branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash.html (0 => 186632)

--- branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash.html	(rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/frames/flattening/hittest-iframe-while-style-changes-crash.html	2015-07-09 21:03:39 UTC (rev 186632)
@@ -0,0 +1,27 @@
+!DOCTYPE html
+html
+head
+titleThis tests that hittesting an iframe when frame flattening is on does not crash./title
+script
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+if (window.internals)
+internals.settings.setFrameFlatteningEnabled(true);
+
+function runTest() {
+setTimeout(function() {
+   

[webkit-changes] [186618] branches/safari-600.8-branch

[matthew_hanson]

Title: [186618] branches/safari-600.8-branch








Revision 186618
Author matthew_han...@apple.com
Date 2015-07-09 14:02:45 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186539. rdar://problem/21707873

Modified Paths

branches/safari-600.8-branch/LayoutTests/ChangeLog
branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html
branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp
branches/safari-600.8-branch/Source/WebCore/page/Settings.in
branches/safari-600.8-branch/Source/WebKit/mac/ChangeLog
branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferences.mm
branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
branches/safari-600.8-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-600.8-branch/Source/WebKit2/ChangeLog
branches/safari-600.8-branch/Source/WebKit2/Shared/WebPreferencesDefinitions.h
branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
branches/safari-600.8-branch/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
branches/safari-600.8-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
branches/safari-600.8-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186617 => 186618)

--- branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog	2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,5 +1,22 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186539. rdar://problem/21707873
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r186232 rdar://problem/9091261
+
+2015-07-02  Brady Eidson  beid...@apple.com
+
+Add preference to disable all http-equiv.
+rdar://problem/9091261 and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+Reviewed by Sam Weinig.
+
+* loader/meta-refresh-disabled.html:
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186521. rdar://problem/21707887
 
 2015-07-08  Daniel Bates  daba...@apple.com


Modified: branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html (186617 => 186618)

--- branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html	2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/LayoutTests/loader/meta-refresh-disabled.html	2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,7 +1,7 @@
 head
 script
 if (window.testRunner) {
-testRunner.overridePreference(WebKitMetaRefreshEnabled, 0);
+testRunner.overridePreference(WebKitHTTPEquivEnabled, 0);
 testRunner.dumpAsText();
 testRunner.waitUntilDone();
 }


Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186617 => 186618)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:02:45 UTC (rev 186618)
@@ -1,5 +1,26 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186539. rdar://problem/21707873
+
+2015-07-08  Lucas Forschler  lforsch...@apple.com
+
+Merge r186232 rdar://problem/9091261
+
+2015-07-02  Brady Eidson  beid...@apple.com
+
+Add preference to disable all http-equiv.
+rdar://problem/9091261 and https://bugs.webkit.org/show_bug.cgi?id=146553
+
+Reviewed by Sam Weinig.
+
+No new tests (Covered by existing test)
+
+* dom/Document.cpp:
+(WebCore::Document::processHttpEquiv):
+* page/Settings.in:
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186521. rdar://problem/21707887
 
 2015-07-08  Daniel Bates  daba...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp (186617 => 186618)

--- branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp	2015-07-09 21:02:37 UTC (rev 186617)
+++ branches/safari-600.8-branch/Source/WebCore/dom/Document.cpp	2015-07-09 21:02:45 UTC (rev 186618)
@@ -2811,6 +2811,9 @@
 {
 ASSERT(!equiv.isNull()  !content.isNull());
 
+if (page()  !page()-settings().httpEquivEnabled())
+return;
+
 Frame* frame = this-frame();
 
 HTTPHeaderName headerName;
@@ -2831,9 +2834,6 @@
 break;
 
 case HTTPHeaderName::Refresh: {
-if (page()  !page()-settings().metaRefreshEnabled())
-break;
-
 double delay;
 String urlString;
 if (frame  parseHTTPRefresh(content, true, delay, urlString)) {


Modified: branches/safari-600.8-branch/Source/WebCore/page/Settings.in (186617 => 186618)

--- branches/safari-600.8-branch/Source/WebCore/page/Settings.in	2015-07-09 21:02:37 UTC (rev 186617)

[webkit-changes] [186622] branches/safari-600.8-branch/Source/JavaScriptCore

[matthew_hanson]

Title: [186622] branches/safari-600.8-branch/Source/_javascript_Core








Revision 186622
Author matthew_han...@apple.com
Date 2015-07-09 14:03:02 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186555. rdar://problem/21716357

Modified Paths

branches/safari-600.8-branch/Source/_javascript_Core/ChangeLog
branches/safari-600.8-branch/Source/_javascript_Core/runtime/JSObject.cpp


Added Paths

branches/safari-600.8-branch/Source/_javascript_Core/tests/stress/sparse-array-entry-update-144067.js




Diff

Modified: branches/safari-600.8-branch/Source/_javascript_Core/ChangeLog (186621 => 186622)

--- branches/safari-600.8-branch/Source/_javascript_Core/ChangeLog	2015-07-09 21:03:00 UTC (rev 186621)
+++ branches/safari-600.8-branch/Source/_javascript_Core/ChangeLog	2015-07-09 21:03:02 UTC (rev 186622)
@@ -1,5 +1,33 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186555. rdar://problem/21716357
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183128. rdar://problem/21716620
+
+2015-04-22  Mark Lam  mark@apple.com
+
+SparseArrayEntry's write barrier owner should be the SparseArrayValueMap.
+https://bugs.webkit.org/show_bug.cgi?id=144067
+
+Reviewed by Michael Saboff.
+
+Currently, there are a few places where the JSObject that owns the
+SparseArrayValueMap is designated as the owner of the SparseArrayEntry
+write barrier.  This is a bug and can result in the GC collecting the
+SparseArrayEntry even though it is being referenced by the
+SparseArrayValueMap.  This patch fixes the bug.
+
+* runtime/JSObject.cpp:
+(JSC::JSObject::enterDictionaryIndexingModeWhenArrayStorageAlreadyExists):
+(JSC::JSObject::putIndexedDescriptor):
+* tests/stress/sparse-array-entry-update-144067.js: Added.
+(useMemoryToTriggerGCs):
+(foo):
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186553. rdar://problem/21716372
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/_javascript_Core/runtime/JSObject.cpp (186621 => 186622)

--- branches/safari-600.8-branch/Source/_javascript_Core/runtime/JSObject.cpp	2015-07-09 21:03:00 UTC (rev 186621)
+++ branches/safari-600.8-branch/Source/_javascript_Core/runtime/JSObject.cpp	2015-07-09 21:03:02 UTC (rev 186622)
@@ -555,7 +555,7 @@
 // This will always be a new entry in the map, so no need to check we can write,
 // and attributes are default so no need to set them.
 if (value)
-map-add(this, i).iterator-value.set(vm, this, value);
+map-add(this, i).iterator-value.set(vm, map, value);
 }
 
 DeferGC deferGC(vm.heap);
@@ -1693,12 +1693,13 @@
 void JSObject::putIndexedDescriptor(ExecState* exec, SparseArrayEntry* entryInMap, const PropertyDescriptor descriptor, PropertyDescriptor oldDescriptor)
 {
 VM vm = exec-vm();
+auto map = m_butterfly-arrayStorage()-m_sparseMap.get();
 
 if (descriptor.isDataDescriptor()) {
 if (descriptor.value())
-entryInMap-set(vm, this, descriptor.value());
+entryInMap-set(vm, map, descriptor.value());
 else if (oldDescriptor.isAccessorDescriptor())
-entryInMap-set(vm, this, jsUndefined());
+entryInMap-set(vm, map, jsUndefined());
 entryInMap-attributes = descriptor.attributesOverridingCurrent(oldDescriptor)  ~Accessor;
 return;
 }
@@ -1721,7 +1722,7 @@
 if (setter)
 accessor-setSetter(vm, setter);
 
-entryInMap-set(vm, this, accessor);
+entryInMap-set(vm, map, accessor);
 entryInMap-attributes = descriptor.attributesOverridingCurrent(oldDescriptor)  ~ReadOnly;
 return;
 }


Added: branches/safari-600.8-branch/Source/_javascript_Core/tests/stress/sparse-array-entry-update-144067.js (0 => 186622)

--- branches/safari-600.8-branch/Source/_javascript_Core/tests/stress/sparse-array-entry-update-144067.js	(rev 0)
+++ branches/safari-600.8-branch/Source/_javascript_Core/tests/stress/sparse-array-entry-update-144067.js	2015-07-09 21:03:02 UTC (rev 186622)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 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 

[webkit-changes] [186625] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186625] branches/safari-600.8-branch/Source/WebCore








Revision 186625
Author matthew_han...@apple.com
Date 2015-07-09 14:03:13 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186558. rdar://problem/21716436

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186624 => 186625)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:10 UTC (rev 186624)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:03:13 UTC (rev 186625)
@@ -1,5 +1,27 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186558. rdar://problem/21716436
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183838. rdar://problem/21716569
+
+2015-05-05  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Crash under WebCore::domWindowFromExecState reloading page with inspector open
+https://bugs.webkit.org/show_bug.cgi?id=144636
+
+Reviewed by Mark Lam.
+
+This ensures we create an InjectedScript for the execution context
+(frame) preventing the global object / exec state from getting garbage
+collected before we remove it from our map.
+
+* inspector/PageRuntimeAgent.cpp:
+(WebCore::PageRuntimeAgent::notifyContextCreated):
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186557. rdar://problem/21716382
 
 2015-07-08  Matthew Hanson  matthew_han...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp (186624 => 186625)

--- branches/safari-600.8-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp	2015-07-09 21:03:10 UTC (rev 186624)
+++ branches/safari-600.8-branch/Source/WebCore/inspector/PageRuntimeAgent.cpp	2015-07-09 21:03:13 UTC (rev 186625)
@@ -174,8 +174,13 @@
 void PageRuntimeAgent::notifyContextCreated(const String frameId, JSC::ExecState* scriptState, SecurityOrigin* securityOrigin, bool isPageContext)
 {
 ASSERT(securityOrigin || isPageContext);
+
+InjectedScript result = injectedScriptManager()-injectedScriptFor(scriptState);
+if (result.hasNoValue())
+return;
+
 int executionContextId = injectedScriptManager()-injectedScriptIdFor(scriptState);
-String name = securityOrigin ? securityOrigin-toRawString() : ;
+String name = securityOrigin ? securityOrigin-toRawString() : String();
 m_frontendDispatcher-executionContextCreated(ExecutionContextDescription::create()
 .setId(executionContextId)
 .setIsPageContext(isPageContext)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186603] trunk/Tools

[timothy_horton]

Title: [186603] trunk/Tools








Revision 186603
Author timothy_hor...@apple.com
Date 2015-07-09 12:30:25 -0700 (Thu, 09 Jul 2015)


Log Message
Increase MiniBrowser location bar maximum width
https://bugs.webkit.org/show_bug.cgi?id=146779

Reviewed by Simon Fraser.

* MiniBrowser/mac/BrowserWindow.xib:
Have an enormous maximum width on the location bar, so that it doesn't
stop expanding with the window at 800px.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/mac/BrowserWindow.xib




Diff

Modified: trunk/Tools/ChangeLog (186602 => 186603)

--- trunk/Tools/ChangeLog	2015-07-09 19:25:25 UTC (rev 186602)
+++ trunk/Tools/ChangeLog	2015-07-09 19:30:25 UTC (rev 186603)
@@ -1,3 +1,14 @@
+2015-07-09  Timothy Horton  timothy_hor...@apple.com
+
+Increase MiniBrowser location bar maximum width
+https://bugs.webkit.org/show_bug.cgi?id=146779
+
+Reviewed by Simon Fraser.
+
+* MiniBrowser/mac/BrowserWindow.xib:
+Have an enormous maximum width on the location bar, so that it doesn't
+stop expanding with the window at 800px.
+
 2015-07-08  Brady Eidson  beid...@apple.com
 
 Crash calling [WebView close] in didFinishLoadForFrame callback.


Modified: trunk/Tools/MiniBrowser/mac/BrowserWindow.xib (186602 => 186603)

--- trunk/Tools/MiniBrowser/mac/BrowserWindow.xib	2015-07-09 19:25:25 UTC (rev 186602)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindow.xib	2015-07-09 19:30:25 UTC (rev 186603)
@@ -113,7 +113,7 @@
 toolbarItem implicitItemIdentifier=255D29F2-C9AA-4B4B-BB43-B38FCD6A0BBB label=Location paletteLabel=Location id=59
 nil key=toolTip/
 size key=minSize width=200 height=22/
-size key=maxSize width=800 height=22/
+size key=maxSize width=10 height=22/
 textField key=view verticalHuggingPriority=750 id=10
 rect key=frame x=0.0 y=14 width=565 height=22/
 autoresizingMask key=autoresizingMask widthSizable=YES flexibleMinY=YES/






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186604] trunk/Tools

[timothy_horton]

Title: [186604] trunk/Tools








Revision 186604
Author timothy_hor...@apple.com
Date 2015-07-09 12:31:09 -0700 (Thu, 09 Jul 2015)


Log Message
Add a way to set the default URL from Minibrowser UI
https://bugs.webkit.org/show_bug.cgi?id=146780

Reviewed by Simon Fraser.

* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate didChangeSettings]):
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController fetch:]):
(-[BrowserWindowController reload:]):
(-[BrowserWindowController forceRepaint:]):
(-[BrowserWindowController goBack:]):
(-[BrowserWindowController goForward:]):
(-[BrowserWindowController showHideWebView:]):
(-[BrowserWindowController removeReinsertWebView:]):
(-[BrowserWindowController zoomIn:]):
(-[BrowserWindowController zoomOut:]):
(-[BrowserWindowController resetZoom:]):
(-[BrowserWindowController canZoomIn]):
(-[BrowserWindowController canZoomOut]):
(-[BrowserWindowController canResetZoom]):
(-[BrowserWindowController toggleZoomMode:]):
(-[BrowserWindowController setScale:]):
(-[BrowserWindowController toggleShrinkToFit:]):
(-[BrowserWindowController dumpSourceToConsole:]):
(-[BrowserWindowController find:]):
(-[BrowserWindowController didChangeSettings]):
(-[BrowserWindowController currentURL]):
Get rid of the BrowserController protocol. It was a bad idea and confused
Interface Builder more than I thought possible.

* MiniBrowser/mac/SettingsController.m:
(-[SettingsController _populateMenu]):
(-[SettingsController setDefaultURLToCurrentURL:]):
If we have a BrowserWindowController, grab its URL and set the relevant default.

* MiniBrowser/mac/WK1BrowserWindowController.h:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController currentURL]):
* MiniBrowser/mac/WK2BrowserWindowController.h:
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController currentURL]):
Retrieve the current URL from the WKView/WebView.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/mac/AppDelegate.m
trunk/Tools/MiniBrowser/mac/BrowserWindowController.h
trunk/Tools/MiniBrowser/mac/BrowserWindowController.m
trunk/Tools/MiniBrowser/mac/SettingsController.m
trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.h
trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m
trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.h
trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m




Diff

Modified: trunk/Tools/ChangeLog (186603 => 186604)

--- trunk/Tools/ChangeLog	2015-07-09 19:30:25 UTC (rev 186603)
+++ trunk/Tools/ChangeLog	2015-07-09 19:31:09 UTC (rev 186604)
@@ -1,5 +1,52 @@
 2015-07-09  Timothy Horton  timothy_hor...@apple.com
 
+Add a way to set the default URL from Minibrowser UI
+https://bugs.webkit.org/show_bug.cgi?id=146780
+
+Reviewed by Simon Fraser.
+
+* MiniBrowser/mac/AppDelegate.m:
+(-[BrowserAppDelegate didChangeSettings]):
+* MiniBrowser/mac/BrowserWindowController.h:
+* MiniBrowser/mac/BrowserWindowController.m:
+(-[BrowserWindowController fetch:]):
+(-[BrowserWindowController reload:]):
+(-[BrowserWindowController forceRepaint:]):
+(-[BrowserWindowController goBack:]):
+(-[BrowserWindowController goForward:]):
+(-[BrowserWindowController showHideWebView:]):
+(-[BrowserWindowController removeReinsertWebView:]):
+(-[BrowserWindowController zoomIn:]):
+(-[BrowserWindowController zoomOut:]):
+(-[BrowserWindowController resetZoom:]):
+(-[BrowserWindowController canZoomIn]):
+(-[BrowserWindowController canZoomOut]):
+(-[BrowserWindowController canResetZoom]):
+(-[BrowserWindowController toggleZoomMode:]):
+(-[BrowserWindowController setScale:]):
+(-[BrowserWindowController toggleShrinkToFit:]):
+(-[BrowserWindowController dumpSourceToConsole:]):
+(-[BrowserWindowController find:]):
+(-[BrowserWindowController didChangeSettings]):
+(-[BrowserWindowController currentURL]):
+Get rid of the BrowserController protocol. It was a bad idea and confused
+Interface Builder more than I thought possible.
+
+* MiniBrowser/mac/SettingsController.m:
+(-[SettingsController _populateMenu]):
+(-[SettingsController setDefaultURLToCurrentURL:]):
+If we have a BrowserWindowController, grab its URL and set the relevant default.
+
+* MiniBrowser/mac/WK1BrowserWindowController.h:
+* MiniBrowser/mac/WK1BrowserWindowController.m:
+(-[WK1BrowserWindowController currentURL]):
+* MiniBrowser/mac/WK2BrowserWindowController.h:
+* MiniBrowser/mac/WK2BrowserWindowController.m:
+(-[WK2BrowserWindowController currentURL]):
+Retrieve the current URL from the WKView/WebView.
+
+2015-07-09  Timothy Horton  timothy_hor...@apple.com
+
 Increase MiniBrowser location bar maximum width
 

[webkit-changes] [186605] trunk/Source/JavaScriptCore

[fpizlo]

Title: [186605] trunk/Source/_javascript_Core








Revision 186605
Author fpi...@apple.com
Date 2015-07-09 12:43:28 -0700 (Thu, 09 Jul 2015)


Log Message
OSR exit fuzzing should allow us to select a static exit site
https://bugs.webkit.org/show_bug.cgi?id=146601

Reviewed by Geoffrey Garen.

The original implementation of the fuzzer allows us to trigger an exit based on its index
in the dynamic sequence of exit sites encountered. But there are usually millions of
dynamically encountered exit sites, even if the program only has thousands of static exit
sites. That means that we would at best be able to do a random sampling of exits, and
those would be biased to the hottest exit sites.

This change allows us to also select exit sites based on their index in the static
sequence of exit sites that the compiler compiled. Then, once that static exit site is
selected, we can select which dynamic exit at that exit site we should trigger. Since the
number of static exit sites is usually smallish (it's bounded by program size), we can do
an exhaustive search over all exit sites in most programs.

* dfg/DFGOSRExitFuzz.cpp:
(JSC::numberOfStaticOSRExitFuzzChecks):
(JSC::numberOfOSRExitFuzzChecks):
* dfg/DFGOSRExitFuzz.h:
(JSC::DFG::doOSRExitFuzzing):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::emitOSRExitFuzzCheck):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExit):
* jsc.cpp:
(jscmain):
* runtime/Options.h:
* runtime/TestRunnerUtils.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.cpp
trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.h
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp
trunk/Source/_javascript_Core/jsc.cpp
trunk/Source/_javascript_Core/runtime/Options.h
trunk/Source/_javascript_Core/runtime/TestRunnerUtils.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (186604 => 186605)

--- trunk/Source/_javascript_Core/ChangeLog	2015-07-09 19:31:09 UTC (rev 186604)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-07-09 19:43:28 UTC (rev 186605)
@@ -1,3 +1,36 @@
+2015-07-03  Filip Pizlo  fpi...@apple.com
+
+OSR exit fuzzing should allow us to select a static exit site
+https://bugs.webkit.org/show_bug.cgi?id=146601
+
+Reviewed by Geoffrey Garen.
+
+The original implementation of the fuzzer allows us to trigger an exit based on its index
+in the dynamic sequence of exit sites encountered. But there are usually millions of
+dynamically encountered exit sites, even if the program only has thousands of static exit
+sites. That means that we would at best be able to do a random sampling of exits, and
+those would be biased to the hottest exit sites.
+
+This change allows us to also select exit sites based on their index in the static
+sequence of exit sites that the compiler compiled. Then, once that static exit site is
+selected, we can select which dynamic exit at that exit site we should trigger. Since the
+number of static exit sites is usually smallish (it's bounded by program size), we can do
+an exhaustive search over all exit sites in most programs.
+
+* dfg/DFGOSRExitFuzz.cpp:
+(JSC::numberOfStaticOSRExitFuzzChecks):
+(JSC::numberOfOSRExitFuzzChecks):
+* dfg/DFGOSRExitFuzz.h:
+(JSC::DFG::doOSRExitFuzzing):
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::emitOSRExitFuzzCheck):
+* ftl/FTLLowerDFGToLLVM.cpp:
+(JSC::FTL::DFG::LowerDFGToLLVM::appendOSRExit):
+* jsc.cpp:
+(jscmain):
+* runtime/Options.h:
+* runtime/TestRunnerUtils.h:
+
 2015-07-08  Joseph Pecoraro  pecor...@apple.com
 
 Fix grammar issue in TypeError attempting to change an unconfigurable property


Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.cpp (186604 => 186605)

--- trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.cpp	2015-07-09 19:31:09 UTC (rev 186604)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.cpp	2015-07-09 19:43:28 UTC (rev 186605)
@@ -30,10 +30,16 @@
 
 namespace JSC { namespace DFG {
 
+unsigned g_numberOfStaticOSRExitFuzzChecks;
 unsigned g_numberOfOSRExitFuzzChecks;
 
 } // namespace DFG
 
+unsigned numberOfStaticOSRExitFuzzChecks()
+{
+return DFG::g_numberOfStaticOSRExitFuzzChecks;
+}
+
 unsigned numberOfOSRExitFuzzChecks()
 {
 return DFG::g_numberOfOSRExitFuzzChecks;


Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.h (186604 => 186605)

--- trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.h	2015-07-09 19:31:09 UTC (rev 186604)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExitFuzz.h	2015-07-09 19:43:28 UTC (rev 186605)
@@ -26,8 +26,24 @@
 #ifndef DFGOSRExitFuzz_h
 #define DFGOSRExitFuzz_h
 
+#include Options.h
+
 namespace JSC { namespace DFG {
 
+extern unsigned 

[webkit-changes] [186601] trunk/Source/WebInspectorUI

[nvasilyev]

Title: [186601] trunk/Source/WebInspectorUI








Revision 186601
Author nvasil...@apple.com
Date 2015-07-09 12:16:10 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Align slider knobs in the color picker
https://bugs.webkit.org/show_bug.cgi?id=146778

Also:
- Use half pixel borders on retina
- Remove one pixel white outline to match native OS X color picker more closely

Reviewed by Timothy Hatcher.

* UserInterface/Views/ColorPicker.css:
(.color-picker  .slider  img):
* UserInterface/Views/Slider.css:
(.slider):
(@media (-webkit-min-device-pixel-ratio: 2)):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.css
trunk/Source/WebInspectorUI/UserInterface/Views/Slider.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186600 => 186601)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 18:48:52 UTC (rev 186600)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 19:16:10 UTC (rev 186601)
@@ -1,3 +1,20 @@
+2015-07-09  Nikita Vasilyev  nvasil...@apple.com
+
+Web Inspector: Align slider knobs in the color picker
+https://bugs.webkit.org/show_bug.cgi?id=146778
+
+Also:
+- Use half pixel borders on retina
+- Remove one pixel white outline to match native OS X color picker more closely
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/ColorPicker.css:
+(.color-picker  .slider  img):
+* UserInterface/Views/Slider.css:
+(.slider):
+(@media (-webkit-min-device-pixel-ratio: 2)):
+
 2015-07-09  Matt Baker  mattba...@apple.com
 
 Web Inspector: Rendering Frame segment colors should match those used in original Timelines graph


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.css (186600 => 186601)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.css	2015-07-09 18:48:52 UTC (rev 186600)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.css	2015-07-09 19:16:10 UTC (rev 186601)
@@ -41,6 +41,11 @@
 -webkit-transform-origin: 0 0;
 }
 
+.color-picker  .slider  img {
+left: -4px;
+top: 0;
+}
+
 .color-picker  .brightness {
 left: 215px;
 }


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Slider.css (186600 => 186601)

--- trunk/Source/WebInspectorUI/UserInterface/Views/Slider.css	2015-07-09 18:48:52 UTC (rev 186600)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Slider.css	2015-07-09 19:16:10 UTC (rev 186601)
@@ -26,8 +26,7 @@
 .slider {
 position: absolute;
 height: 11px;
-outline: 1px solid rgb(148, 148, 148);
-border: 1px solid white;
+border: 1px solid hsl(0, 0%, 75%);
 }
 
 .slider  img {
@@ -42,3 +41,9 @@
 .slider  img.dragging {
 content: -webkit-image-set(url(../Images/SliderThumbPressed.png) 1x, url(../Images/sliderthumbpres...@2x.png) 2x);
 }
+
+@media (-webkit-min-device-pixel-ratio: 2) {
+.slider {
+border: 0.5px solid hsl(0, 0%, 50%);
+}
+}






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186602] trunk/Source/WebInspectorUI

[drousso]

Title: [186602] trunk/Source/WebInspectorUI








Revision 186602
Author drou...@apple.com
Date 2015-07-09 12:25:25 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Checkbox disappears when unchecking CSS background style
https://bugs.webkit.org/show_bug.cgi?id=146776

Reviewed by Timothy Hatcher.

* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers.update):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers): Now uses _createCommentedCheckboxMarker.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._createCommentedCheckboxMarker):
Scans the content of the given lineHandle for any commented text and adds an unselected checkbox to
the beginning of that lineHandle's line.
(WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent.update):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent): Now adds commented checkbox markers.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186601 => 186602)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 19:16:10 UTC (rev 186601)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 19:25:25 UTC (rev 186602)
@@ -1,3 +1,19 @@
+2015-07-09  Devin Rousso  drou...@apple.com
+
+Web Inspector: Checkbox disappears when unchecking CSS background style
+https://bugs.webkit.org/show_bug.cgi?id=146776
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Views/CSSStyleDeclarationTextEditor.js:
+(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers.update):
+(WebInspector.CSSStyleDeclarationTextEditor.prototype._updateTextMarkers): Now uses _createCommentedCheckboxMarker.
+(WebInspector.CSSStyleDeclarationTextEditor.prototype._createCommentedCheckboxMarker):
+Scans the content of the given lineHandle for any commented text and adds an unselected checkbox to
+the beginning of that lineHandle's line.
+(WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent.update):
+(WebInspector.CSSStyleDeclarationTextEditor.prototype._resetContent): Now adds commented checkbox markers.
+
 2015-07-09  Nikita Vasilyev  nvasil...@apple.com
 
 Web Inspector: Align slider knobs in the color picker


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js (186601 => 186602)

--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js	2015-07-09 19:16:10 UTC (rev 186601)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationTextEditor.js	2015-07-09 19:25:25 UTC (rev 186602)
@@ -799,34 +799,10 @@
 });
 
 if (!this._codeMirror.getOption(readOnly)) {
-// Matches a comment like: /* -webkit-foo: bar; */
-var commentedPropertyRegex = /\/\*\s*[-\w]+\s*:\s*[^;]+;?\s*\*\//g;
-
 // Look for comments that look like properties and add checkboxes in front of them.
-var lineCount = this._codeMirror.lineCount();
-for (var i = 0; i  lineCount; ++i) {
-var lineContent = this._codeMirror.getLine(i);
-
-var match = commentedPropertyRegex.exec(lineContent);
-while (match) {
-var checkboxElement = document.createElement(input);
-checkboxElement.type = checkbox;
-checkboxElement.checked = false;
-checkboxElement.addEventListener(change, this._propertyCommentCheckboxChanged.bind(this));
-
-var from = {line: i, ch: match.index};
-var to = {line: i, ch: match.index + match[0].length};
-
-var checkboxMarker = this._codeMirror.setUniqueBookmark(from, checkboxElement);
-checkboxMarker.__propertyCheckbox = true;
-
-var commentTextMarker = this._codeMirror.markText(from, to);
-
-checkboxElement.__commentTextMarker = commentTextMarker;
-
-match = commentedPropertyRegex.exec(lineContent);
-}
-}
+this._codeMirror.eachLine(function(lineHandler) {
+this._createCommentedCheckboxMarker(lineHandler);
+}.bind(this));
 }
 
 // Look for colors and make swatches.
@@ -841,6 +817,41 @@
 this._codeMirror.operation(update.bind(this));
 }
 
+_createCommentedCheckboxMarker(lineHandle)
+{
+var lineNumber = lineHandle.lineNo();
+
+// Since lineNumber can be 0, it is also necessary to check if it is a number before returning.
+if (!lineNumber  isNaN(lineNumber))
+return;
+
+// 

[webkit-changes] [186606] trunk

[msaboff]

Title: [186606] trunk








Revision 186606
Author msab...@apple.com
Date 2015-07-09 13:24:39 -0700 (Thu, 09 Jul 2015)


Log Message
REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20
https://bugs.webkit.org/show_bug.cgi?id=146767

Reviewed by Geoffrey Garen.

Source/_javascript_Core:

If the stack check fails at the top most frame, we must use that frame to
generate the exception.  Reverted the code to always use the current frame to
throw an out of stack exception.

* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):

LayoutTests:

New test that generates a call to a function that involves creating a huge
object literal that exceeds the available stack space.

* http/tests/misc/large-js-program-expected.txt: Added.
* http/tests/misc/large-js-program.php: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp


Added Paths

trunk/LayoutTests/http/tests/misc/large-js-program-expected.txt
trunk/LayoutTests/http/tests/misc/large-js-program.php




Diff

Modified: trunk/LayoutTests/ChangeLog (186605 => 186606)

--- trunk/LayoutTests/ChangeLog	2015-07-09 19:43:28 UTC (rev 186605)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 20:24:39 UTC (rev 186606)
@@ -1,3 +1,16 @@
+2015-07-09  Michael Saboff  msab...@apple.com
+
+REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20
+https://bugs.webkit.org/show_bug.cgi?id=146767
+
+Reviewed by Geoffrey Garen.
+
+New test that generates a call to a function that involves creating a huge
+object literal that exceeds the available stack space.
+
+* http/tests/misc/large-js-program-expected.txt: Added.
+* http/tests/misc/large-js-program.php: Added.
+
 2015-07-02  Chris Fleizach  cfleiz...@apple.com
 
 AX: details element should allow expand/close through AX API


Added: trunk/LayoutTests/http/tests/misc/large-js-program-expected.txt (0 => 186606)

--- trunk/LayoutTests/http/tests/misc/large-js-program-expected.txt	(rev 0)
+++ trunk/LayoutTests/http/tests/misc/large-js-program-expected.txt	2015-07-09 20:24:39 UTC (rev 186606)
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 27: RangeError: Maximum call stack size exceeded.
+This tests verifies that a large program doesn't crash _javascript_.
+
+This test should generate an out of stack exception, but have no other output. 
+


Added: trunk/LayoutTests/http/tests/misc/large-js-program.php (0 => 186606)

--- trunk/LayoutTests/http/tests/misc/large-js-program.php	(rev 0)
+++ trunk/LayoutTests/http/tests/misc/large-js-program.php	2015-07-09 20:24:39 UTC (rev 186606)
@@ -0,0 +1,39 @@
+html
+head
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+/script
+/head
+body
+h1This tests verifies that a large program doesn#39;t crash _javascript_./h1
+pThis test should generate an out of stack exception, but have no other output.
+br
+pre id=console/pre
+script src=""
+script
+function print(m)
+{
+document.getElementById(console).innerHTML += m + br;
+}
+
+function foo(o)
+{
+// We should not get to this code, we should throw an out of stack exception calling foo().
+testFailed(We should never get here!);
+}
+
+
+foo({x: 1,
+ a: [
+?php
+for ($i = 0; $i  100; $i++) {
+if ($i != 0)
+echo ,\n;
+echo [0, $i];
+}
+?
+]});
+/script
+/body
+/html


Modified: trunk/Source/_javascript_Core/ChangeLog (186605 => 186606)

--- trunk/Source/_javascript_Core/ChangeLog	2015-07-09 19:43:28 UTC (rev 186605)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-07-09 20:24:39 UTC (rev 186606)
@@ -1,3 +1,17 @@
+2015-07-09  Michael Saboff  msab...@apple.com
+
+REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20
+https://bugs.webkit.org/show_bug.cgi?id=146767
+
+Reviewed by Geoffrey Garen.
+
+If the stack check fails at the top most frame, we must use that frame to
+generate the exception.  Reverted the code to always use the current frame to
+throw an out of stack exception.
+
+* llint/LLIntSlowPaths.cpp:
+(JSC::LLInt::LLINT_SLOW_PATH_DECL):
+
 2015-07-03  Filip Pizlo  fpi...@apple.com
 
 OSR exit fuzzing should allow us to select a static exit site


Modified: trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp (186605 => 186606)

--- trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp	2015-07-09 19:43:28 UTC (rev 186605)
+++ trunk/Source/_javascript_Core/llint/LLIntSlowPaths.cpp	2015-07-09 20:24:39 UTC (rev 186606)
@@ -468,14 +468,6 @@
 #endif
 
 #endif
-// This stack check is done in the prologue for a function call, and the
-// CallFrame is not completely set up yet. For example, if the frame needs
-// a lexical 

[webkit-changes] [186643] trunk/Source/JavaScriptCore

[mark . lam]

Title: [186643] trunk/Source/_javascript_Core








Revision 186643
Author mark@apple.com
Date 2015-07-09 15:58:05 -0700 (Thu, 09 Jul 2015)


Log Message
SymbolTable::entryFor() should do a bounds check before indexing into the localToEntry vector.
https://bugs.webkit.org/show_bug.cgi?id=146807

Reviewed by Filip Pizlo.

When we capture an argument by name and we use arguments, we put all of the
arguments into the scope.  But destructured arguments are put into the scope
anonymously i.e. the SymbolTable knows that the scope offset is in use via
SymbolTable::m_maxScopeOffset, but that ScopeOffset won't appear in
SymbolTable::m_map.

The SymbolTable's m_localToEntry vector is synthesized from its m_map, and will
have a size which is based on the largest ScopeOffset in the m_map.  If we have a
scenario where the anonymous argument is at a higher ScopeOffset than all the
named arguments, then the m_localsToEntry vector will not have an entry for it
i.e. the m_localsToEntry vector will have a size that is = the ScopeOffset of
the anonymous argument.

Hence, SymbolTable::entryFor() should ensure that the requested ScopeOffset is
within the bounds of the m_localToEntry vector before indexing into it.

* runtime/SymbolTable.cpp:
(JSC::SymbolTable::entryFor):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/SymbolTable.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (186642 => 186643)

--- trunk/Source/_javascript_Core/ChangeLog	2015-07-09 22:30:42 UTC (rev 186642)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-07-09 22:58:05 UTC (rev 186643)
@@ -1,3 +1,29 @@
+2015-07-09  Mark Lam  mark@apple.com
+
+SymbolTable::entryFor() should do a bounds check before indexing into the localToEntry vector.
+https://bugs.webkit.org/show_bug.cgi?id=146807
+
+Reviewed by Filip Pizlo.
+
+When we capture an argument by name and we use arguments, we put all of the
+arguments into the scope.  But destructured arguments are put into the scope
+anonymously i.e. the SymbolTable knows that the scope offset is in use via
+SymbolTable::m_maxScopeOffset, but that ScopeOffset won't appear in
+SymbolTable::m_map.
+
+The SymbolTable's m_localToEntry vector is synthesized from its m_map, and will
+have a size which is based on the largest ScopeOffset in the m_map.  If we have a
+scenario where the anonymous argument is at a higher ScopeOffset than all the
+named arguments, then the m_localsToEntry vector will not have an entry for it
+i.e. the m_localsToEntry vector will have a size that is = the ScopeOffset of
+the anonymous argument.
+
+Hence, SymbolTable::entryFor() should ensure that the requested ScopeOffset is
+within the bounds of the m_localToEntry vector before indexing into it.
+
+* runtime/SymbolTable.cpp:
+(JSC::SymbolTable::entryFor):
+
 2015-07-09  Michael Saboff  msab...@apple.com
 
 REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20


Modified: trunk/Source/_javascript_Core/runtime/SymbolTable.cpp (186642 => 186643)

--- trunk/Source/_javascript_Core/runtime/SymbolTable.cpp	2015-07-09 22:30:42 UTC (rev 186642)
+++ trunk/Source/_javascript_Core/runtime/SymbolTable.cpp	2015-07-09 22:58:05 UTC (rev 186643)
@@ -130,7 +130,10 @@
 
 SymbolTableEntry* SymbolTable::entryFor(const ConcurrentJITLocker locker, ScopeOffset offset)
 {
-return localToEntry(locker)[offset.offset()];
+auto toEntryVector = localToEntry(locker);
+if (offset.offset() = toEntryVector.size())
+return nullptr;
+return toEntryVector[offset.offset()];
 }
 
 SymbolTable* SymbolTable::cloneScopePart(VM vm)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186644] trunk

[commit-queue]

Title: [186644] trunk








Revision 186644
Author commit-qu...@webkit.org
Date 2015-07-09 16:02:41 -0700 (Thu, 09 Jul 2015)


Log Message
Rubber banding is broken when using a Mighty Mouse
https://bugs.webkit.org/show_bug.cgi?id=146693

Patch by Wenson Hsieh whs...@berkeley.edu on 2015-07-09
Reviewed by Tim Horton.

Source/WebCore:

Sets the constrain content edge scrolling flag to true by default, causing scrolling
with a Mighty Mouse to not extend beyond the container's edges.

Test: platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html

* rendering/RenderLayer.cpp: Remove code that defaulted the flag to false.
(WebCore::RenderLayer::RenderLayer): Deleted.
* rendering/RenderMarquee.cpp: Added special case for marquees that allows content to scroll.
(WebCore::RenderMarquee::RenderMarquee): See above.

LayoutTests:

* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayer.cpp
trunk/Source/WebCore/rendering/RenderMarquee.cpp


Added Paths

trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt
trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html




Diff

Modified: trunk/LayoutTests/ChangeLog (186643 => 186644)

--- trunk/LayoutTests/ChangeLog	2015-07-09 22:58:05 UTC (rev 186643)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 23:02:41 UTC (rev 186644)
@@ -1,3 +1,13 @@
+2015-07-09  Wenson Hsieh  whs...@berkeley.edu
+
+Rubber banding is broken when using a Mighty Mouse
+https://bugs.webkit.org/show_bug.cgi?id=146693
+
+Reviewed by Tim Horton.
+
+* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt: Added.
+* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html: Added.
+
 2015-07-09  Devin Rousso  drou...@apple.com
 
 Web Inspector: Fix shape-highlight layout tests


Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt (0 => 186644)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt	2015-07-09 23:02:41 UTC (rev 186644)
@@ -0,0 +1,9 @@
+PASS successfullyParsed is true
+
+TEST COMPLETE
+scrollTop: 0
+scrollLeft: 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html (0 => 186644)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html	(rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html	2015-07-09 23:02:41 UTC (rev 186644)
@@ -0,0 +1,65 @@
+html
+head
+style
+#container {
+width: 410px;
+height: 400px;
+overflow-y: scroll;
+}
+
+.cell {
+width: 400px;
+height: 400px;
+}
+
+#cell0 { background-color: #DD; }
+#cell1 { background-color: #FF; }
+#cell2 { background-color: #00DD00; }
+#cell3 { background-color: #66FF66; }
+#cell4 { background-color: #DD; }
+#cell5 { background-color: #FF; }
+/style
+script src=""
+script
+
+function checkScrollOffsets()
+{
+var container = document.getElementById(container);
+debug(scrollTop:  + container.scrollTop);
+debug(scrollLeft:  + container.scrollLeft);
+finishJSTest();
+testRunner.notifyDone();
+}
+
+function testStatelessScrollingAgainstEdge()
+{
+eventSender.mouseMoveTo(100, 100);
+eventSender.mouseScrollByWithWheelAndMomentumPhases(10, 10, none, none, true);
+setTimeout(checkScrollOffsets, 0);
+}
+
+function setup()
+{
+if (window.eventSender) {
+window.jsTestIsAsync = true;
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+eventSender.monitorWheelEvents();
+setTimeout(testStatelessScrollingAgainstEdge, 0);
+}
+}
+/script
+/head
+
+body _onload_=setup();
+div id=container
+div class=cell id=cell0/div
+div class=cell id=cell1/div
+div class=cell id=cell2/div
+div class=cell id=cell3/div
+div 

[webkit-changes] [186645] trunk/Source/WebInspectorUI

[drousso]

Title: [186645] trunk/Source/WebInspectorUI








Revision 186645
Author drou...@apple.com
Date 2015-07-09 16:21:11 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Don't clear the console when navigating to a different page
https://bugs.webkit.org/show_bug.cgi?id=142751

Reviewed by Timothy Hatcher.

* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Controllers/LogManager.js:
(WebInspector.LogManager): No longer distinguishes from page refreshes and page navigations for console clearing.
(WebInspector.LogManager.prototype._delayedMessagesCleared):
(WebInspector.LogManager.prototype._mainResourceDidChange):
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype._sessionStarted):
(WebInspector.LogContentView.prototype._handleContextMenuEvent): Changed context menu keep/clear log text.
(WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
(WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting): Deleted.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js
trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186644 => 186645)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 23:21:11 UTC (rev 186645)
@@ -1,5 +1,23 @@
 2015-07-09  Devin Rousso  drou...@apple.com
 
+Web Inspector: Don't clear the console when navigating to a different page
+https://bugs.webkit.org/show_bug.cgi?id=142751
+
+Reviewed by Timothy Hatcher.
+
+* Localizations/en.lproj/localizedStrings.js:
+* UserInterface/Controllers/LogManager.js:
+(WebInspector.LogManager): No longer distinguishes from page refreshes and page navigations for console clearing.
+(WebInspector.LogManager.prototype._delayedMessagesCleared):
+(WebInspector.LogManager.prototype._mainResourceDidChange):
+* UserInterface/Views/LogContentView.js:
+(WebInspector.LogContentView.prototype._sessionStarted):
+(WebInspector.LogContentView.prototype._handleContextMenuEvent): Changed context menu keep/clear log text.
+(WebInspector.LogContentView.prototype._toggleClearLogOnNavigateSetting):
+(WebInspector.LogContentView.prototype._toggleClearLogOnReloadSetting): Deleted.
+
+2015-07-09  Devin Rousso  drou...@apple.com
+
 Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
 https://bugs.webkit.org/show_bug.cgi?id=146804
 


Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (186644 => 186645)

--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2015-07-09 23:21:11 UTC (rev 186645)
@@ -91,7 +91,7 @@
 localizedStrings[Child Layers] = Child Layers;
 localizedStrings[Children] = Children;
 localizedStrings[Clear Log] = Clear Log;
-localizedStrings[Clear Log on Reload] = Clear Log on Reload;
+localizedStrings[Clear Log on Navigation] = Clear Log on Navigation;
 localizedStrings[Clear Timeline] = Clear Timeline;
 localizedStrings[Clear log (%s or %s)] = Clear log (%s or %s);
 localizedStrings[Click Listener] = Click Listener;
@@ -284,7 +284,7 @@
 localizedStrings[Invoke getter] = Invoke getter;
 localizedStrings[_javascript_  Events] = _javascript_  Events;
 localizedStrings[Jump to Definition] = Jump to Definition;
-localizedStrings[Keep Log on Reload] = Keep Log on Reload;
+localizedStrings[Keep Log on Navigation] = Keep Log on Navigation;
 localizedStrings[Key] = Key;
 localizedStrings[Label] = Label;
 localizedStrings[Latency] = Latency;


Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js (186644 => 186645)

--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js	2015-07-09 23:02:41 UTC (rev 186644)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LogManager.js	2015-07-09 23:21:11 UTC (rev 186645)
@@ -31,9 +31,9 @@
 super();
 
 this._clearMessagesRequested = false;
-this._isPageReload = false;
+this._isNewPageOrReload = false;
 
-this.clearLogOnReloadSetting = new WebInspector.Setting(clear-log-on-reload, true);
+this.clearLogOnNavigateSetting = new WebInspector.Setting(clear-log-on-navigate, true);
 
 WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
 }
@@ -74,14 +74,15 @@
 
 _delayedMessagesCleared()
 {
-if (this._isPageReload) {
-this._isPageReload = false;
-if (this.clearLogOnReloadSetting.value)
-

[webkit-changes] [186646] trunk/Source/WebCore

[bfulgham]

Title: [186646] trunk/Source/WebCore








Revision 186646
Author bfulg...@apple.com
Date 2015-07-09 16:27:24 -0700 (Thu, 09 Jul 2015)


Log Message
[Mac, iOS] The mimeTypeCache should return a reference
https://bugs.webkit.org/show_bug.cgi?id=146809

Reviewed by Eric Carlson.

No new tests: No change in functionality.

Don't copy the mime type cache every time someone asks it a question. Return
by reference instead.

* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::mimeTypeCache):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::mimeTypeCache):
* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
(WebCore::mimeTypeCache):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186645 => 186646)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 23:21:11 UTC (rev 186645)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 23:27:24 UTC (rev 186646)
@@ -1,3 +1,22 @@
+2015-07-09  Brent Fulgham  bfulg...@apple.com
+
+[Mac, iOS] The mimeTypeCache should return a reference
+https://bugs.webkit.org/show_bug.cgi?id=146809
+
+Reviewed by Eric Carlson.
+
+No new tests: No change in functionality.
+
+Don't copy the mime type cache every time someone asks it a question. Return
+by reference instead.
+
+* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+(WebCore::mimeTypeCache):
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+(WebCore::mimeTypeCache):
+* platform/mock/mediasource/MockMediaPlayerMediaSource.cpp:
+(WebCore::mimeTypeCache):
+
 2015-07-09  Wenson Hsieh  whs...@berkeley.edu
 
 Rubber banding is broken when using a Mighty Mouse


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (186645 => 186646)

--- trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp	2015-07-09 23:21:11 UTC (rev 186645)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp	2015-07-09 23:27:24 UTC (rev 186646)
@@ -871,9 +871,9 @@
 m_videoFrameHasDrawn = true;
 }
 
-static HashSetString mimeTypeCache()
+static const HashSetString mimeTypeCache()
 {
-DEPRECATED_DEFINE_STATIC_LOCAL(HashSetString, cache, ());
+static NeverDestroyedHashSetString cache;
 static bool typeListInitialized = false;
 
 if (typeListInitialized)
@@ -888,7 +888,7 @@
 
 CFIndex typeCount = CFArrayGetCount(supportedTypes.get());
 for (CFIndex i = 0; i  typeCount; i++)
-cache.add(static_castCFStringRef(CFArrayGetValueAtIndex(supportedTypes.get(), i)));
+cache.get().add(static_castCFStringRef(CFArrayGetValueAtIndex(supportedTypes.get(), i)));
 
 return cache;
 } 


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (186645 => 186646)

--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm	2015-07-09 23:21:11 UTC (rev 186645)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm	2015-07-09 23:27:24 UTC (rev 186646)
@@ -210,9 +210,9 @@
  class_getInstanceMethod(getAVSampleBufferAudioRendererClass(), @selector(setMuted:));
 }
 
-static HashSetString mimeTypeCache()
+static const HashSetString mimeTypeCache()
 {
-DEPRECATED_DEFINE_STATIC_LOCAL(HashSetString, cache, ());
+static NeverDestroyedHashSetString cache;
 static bool typeListInitialized = false;
 
 if (typeListInitialized)
@@ -221,7 +221,7 @@
 
 NSArray *types = [getAVURLAssetClass() audiovisualMIMETypes];
 for (NSString *mimeType in types)
-cache.add(mimeType);
+cache.get().add(mimeType);
 
 return cache;
 } 


Modified: trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp (186645 => 186646)

--- trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp	2015-07-09 23:21:11 UTC (rev 186645)
+++ trunk/Source/WebCore/platform/mock/mediasource/MockMediaPlayerMediaSource.cpp	2015-07-09 23:27:24 UTC (rev 186646)
@@ -33,6 +33,7 @@
 #include MediaSourcePrivateClient.h
 #include MockMediaSourcePrivate.h
 #include wtf/MainThread.h
+#include wtf/NeverDestroyed.h
 #include wtf/text/WTFString.h
 
 namespace WebCore {
@@ -44,15 +45,15 @@
 supportsType, 0, 0, 0, 0);
 }
 
-static HashSetString mimeTypeCache()
+static const HashSetString mimeTypeCache()
 {
-DEPRECATED_DEFINE_STATIC_LOCAL(HashSetString, cache, ());
+static NeverDestroyedHashSetString cache;

[webkit-changes] [186647] trunk/Source/WebCore

[beidson]

Title: [186647] trunk/Source/WebCore








Revision 186647
Author beid...@apple.com
Date 2015-07-09 16:29:33 -0700 (Thu, 09 Jul 2015)


Log Message
Add better ASSERTs to learn more about what is going wrong in DocumentLoader::detachFromFrame()
https://bugs.webkit.org/show_bug.cgi?id=146816

Reviewed by Alex Christensen.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::attachToFrame): Set the has ever been attached flag to true.
(WebCore::DocumentLoader::detachFromFrame): ASSERT m_frame is non-null, but with a message
  depending on the value of the has ever been attached flag.
* loader/DocumentLoader.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/DocumentLoader.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186646 => 186647)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 23:27:24 UTC (rev 186646)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 23:29:33 UTC (rev 186647)
@@ -1,3 +1,16 @@
+2015-07-09  Brady Eidson  beid...@apple.com
+
+Add better ASSERTs to learn more about what is going wrong in DocumentLoader::detachFromFrame()
+https://bugs.webkit.org/show_bug.cgi?id=146816
+
+Reviewed by Alex Christensen.
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::attachToFrame): Set the has ever been attached flag to true.
+(WebCore::DocumentLoader::detachFromFrame): ASSERT m_frame is non-null, but with a message 
+  depending on the value of the has ever been attached flag.
+* loader/DocumentLoader.h:
+
 2015-07-09  Brent Fulgham  bfulg...@apple.com
 
 [Mac, iOS] The mimeTypeCache should return a reference


Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (186646 => 186647)

--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 23:27:24 UTC (rev 186646)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 23:29:33 UTC (rev 186647)
@@ -905,6 +905,10 @@
 m_frame = frame;
 m_writer.setFrame(frame);
 attachToFrame();
+
+#ifndef NDEBUG
+m_hasEverBeenAttached = true;
+#endif
 }
 
 void DocumentLoader::attachToFrame()
@@ -914,7 +918,12 @@
 
 void DocumentLoader::detachFromFrame()
 {
-ASSERT(m_frame);
+#ifndef NDEBUG
+if (m_hasEverBeenAttached)
+ASSERT_WITH_MESSAGE(m_frame, detachFromFrame() is being called on a DocumentLoader twice without an attachToFrame() inbetween);
+else
+ASSERT_WITH_MESSAGE(m_frame, detachFromFrame() is being called on a DocumentLoader that has never attached to any Frame);
+#endif
 RefPtrFrame protectFrame(m_frame);
 RefDocumentLoader protectLoader(*this);
 


Modified: trunk/Source/WebCore/loader/DocumentLoader.h (186646 => 186647)

--- trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-09 23:27:24 UTC (rev 186646)
+++ trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-09 23:29:33 UTC (rev 186647)
@@ -448,6 +448,9 @@
 HashMapString, std::pairString, uint32_t m_pendingContentExtensionDisplayNoneSelectors;
 #endif
 
+#ifndef NDEBUG
+bool m_hasEverBeenAttached { false }
+#endif
 };
 
 inline void DocumentLoader::recordMemoryCacheLoadForFutureClientNotification(const ResourceRequest request)






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186634] trunk/Source/WebInspectorUI

[drousso]

Title: [186634] trunk/Source/WebInspectorUI








Revision 186634
Author drou...@apple.com
Date 2015-07-09 14:54:11 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Special Logs to Console that do not have an _expression_ should be styled differently, looks like code
https://bugs.webkit.org/show_bug.cgi?id=143840

Reviewed by Timothy Hatcher.

* UserInterface/Controllers/_javascript_LogViewController.js:
(WebInspector.WebInspector._javascript_LogViewController.appendImmediateExecutionWithResult):
Now applies a class to special logs initiated by the user (log element, log object, etc).
* UserInterface/Views/ConsoleCommandView.js:
(WebInspector.ConsoleCommandView): Added className parameter.
* UserInterface/Views/ConsoleMessageView.css:
(.console-user-command.selected-element-log):
(.console-user-command.special-user-log  .console-message-text):
* UserInterface/Views/DOMTreeOutline.js:
(WebInspector.DOMTreeOutline.prototype._populateContextMenu.logElement):
(WebInspector.DOMTreeOutline.prototype._populateContextMenu):
* UserInterface/Views/ObjectPreviewView.js:
(WebInspector.ObjectPreviewView.prototype._contextMenuHandler):
* UserInterface/Views/ObjectTreeBaseTreeElement.js:
(WebInspector.ObjectTreeBaseTreeElement.prototype._logSymbolProperty):
(WebInspector.ObjectTreeBaseTreeElement.prototype._logValue):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageView.css
trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js
trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPreviewView.js
trunk/Source/WebInspectorUI/UserInterface/Views/ObjectTreeBaseTreeElement.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186633 => 186634)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 21:03:46 UTC (rev 186633)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 21:54:11 UTC (rev 186634)
@@ -1,5 +1,29 @@
 2015-07-09  Devin Rousso  drou...@apple.com
 
+Web Inspector: Special Logs to Console that do not have an _expression_ should be styled differently, looks like code
+https://bugs.webkit.org/show_bug.cgi?id=143840
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Controllers/_javascript_LogViewController.js:
+(WebInspector.WebInspector._javascript_LogViewController.appendImmediateExecutionWithResult):
+Now applies a class to special logs initiated by the user (log element, log object, etc).
+* UserInterface/Views/ConsoleCommandView.js:
+(WebInspector.ConsoleCommandView): Added className parameter.
+* UserInterface/Views/ConsoleMessageView.css:
+(.console-user-command.selected-element-log):
+(.console-user-command.special-user-log  .console-message-text):
+* UserInterface/Views/DOMTreeOutline.js:
+(WebInspector.DOMTreeOutline.prototype._populateContextMenu.logElement):
+(WebInspector.DOMTreeOutline.prototype._populateContextMenu):
+* UserInterface/Views/ObjectPreviewView.js:
+(WebInspector.ObjectPreviewView.prototype._contextMenuHandler):
+* UserInterface/Views/ObjectTreeBaseTreeElement.js:
+(WebInspector.ObjectTreeBaseTreeElement.prototype._logSymbolProperty):
+(WebInspector.ObjectTreeBaseTreeElement.prototype._logValue):
+
+2015-07-09  Devin Rousso  drou...@apple.com
+
 Web Inspector: Checkbox disappears when unchecking CSS background style
 https://bugs.webkit.org/show_bug.cgi?id=146776
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js (186633 => 186634)

--- trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js	2015-07-09 21:03:46 UTC (rev 186633)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js	2015-07-09 21:54:11 UTC (rev 186634)
@@ -119,11 +119,11 @@
 consoleSession.element.scrollIntoView();
 }
 
-appendImmediateExecutionWithResult(text, result)
+appendImmediateExecutionWithResult(text, result, addSpecialUserLogClass)
 {
 console.assert(result instanceof WebInspector.RemoteObject);
 
-var commandMessageView = new WebInspector.ConsoleCommandView(text);
+var commandMessageView = new WebInspector.ConsoleCommandView(text, addSpecialUserLogClass ? special-user-log : null);
 this._appendConsoleMessageView(commandMessageView, true);
 
 function saveResultCallback(savedResultIndex)


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js (186633 => 186634)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js	2015-07-09 21:03:46 UTC (rev 186633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleCommandView.js	2015-07-09 21:54:11 UTC (rev 186634)
@@ -29,7 +29,7 

[webkit-changes] [186635] trunk/Source/WebInspectorUI

[drousso]

Title: [186635] trunk/Source/WebInspectorUI








Revision 186635
Author drou...@apple.com
Date 2015-07-09 14:57:32 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
https://bugs.webkit.org/show_bug.cgi?id=146804

Reviewed by Timothy Hatcher.

* UserInterface/Models/CSSRule.js:
(WebInspector.CSSRule.prototype.selectorIsGreater):
Loops through the selectors in a rule to check if their specificity is greater than a given selector's specificity.
* UserInterface/Models/CSSSelector.js:
(WebInspector.CSSSelector.prototype.isGreaterThan):
Determines if the given selector's specificity is greater than this selector's specificity.
(WebInspector.CSSSelector):
* UserInterface/Views/RulesStyleDetailsPanel.js:
(WebInspector.RulesStyleDetailsPanel.prototype.refresh):
If the pseudo-element selector's specificity is greater than the current selector's
specificity, create the pseudo-element's section and add it before the current style.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js
trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js
trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186634 => 186635)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 21:57:32 UTC (rev 186635)
@@ -1,5 +1,24 @@
 2015-07-09  Devin Rousso  drou...@apple.com
 
+Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
+https://bugs.webkit.org/show_bug.cgi?id=146804
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Models/CSSRule.js:
+(WebInspector.CSSRule.prototype.selectorIsGreater):
+Loops through the selectors in a rule to check if their specificity is greater than a given selector's specificity.
+* UserInterface/Models/CSSSelector.js:
+(WebInspector.CSSSelector.prototype.isGreaterThan):
+Determines if the given selector's specificity is greater than this selector's specificity.
+(WebInspector.CSSSelector):
+* UserInterface/Views/RulesStyleDetailsPanel.js:
+(WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+If the pseudo-element selector's specificity is greater than the current selector's
+specificity, create the pseudo-element's section and add it before the current style.
+
+2015-07-09  Devin Rousso  drou...@apple.com
+
 Web Inspector: Special Logs to Console that do not have an _expression_ should be styled differently, looks like code
 https://bugs.webkit.org/show_bug.cgi?id=143840
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (186634 => 186635)

--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js	2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js	2015-07-09 21:57:32 UTC (rev 186635)
@@ -182,6 +182,32 @@
 return Object.shallowEqual(this._id, rule.id);
 }
 
+selectorIsGreater(otherSelectors)
+{
+if (!otherSelectors || !otherSelectors.length)
+return true;
+
+var selectorIsGreater = true;
+
+var selectors = this.matchedSelectors;
+if (!selectors.length)
+selectors = this._selectors;
+
+for (var selector of selectors) {
+for (var otherSelector of otherSelectors) {
+if (selector.isGreaterThan(otherSelector))
+continue;
+
+selectorIsGreater = false;
+}
+
+if (selectorIsGreater)
+return true;
+}
+
+return false;
+}
+
 // Protected
 
 get nodeStyles()


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js (186634 => 186635)

--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js	2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js	2015-07-09 21:57:32 UTC (rev 186635)
@@ -52,4 +52,19 @@
 {
 return this._dynamic;
 }
+
+isGreaterThan(selector)
+{
+if (!selector || !selector.specificity)
+return true;
+
+for (var i = 0; i  this._specificity.length; ++i) {
+if (this._specificity[i] === selector.specificity[i])
+continue;
+
+return this._specificity[i]  selector.specificity[i];
+}
+
+return false;
+}
 };


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (186634 => 186635)

--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js	2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js	2015-07-09 21:57:32 UTC (rev 186635)
@@ -179,7 +179,7 @@
 var 

[webkit-changes] [186639] trunk

[drousso]

Title: [186639] trunk








Revision 186639
Author drou...@apple.com
Date 2015-07-09 15:07:51 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Fix shape-highlight layout tests
https://bugs.webkit.org/show_bug.cgi?id=146080

Reviewed by Joseph Pecoraro.

Source/WebCore:

* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForShapeOutside): Now properly returns the shape margin.

LayoutTests:

* http/tests/inspector/dom/shapes-test.js: Updated.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorOverlay.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (186638 => 186639)

--- trunk/LayoutTests/ChangeLog	2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/LayoutTests/ChangeLog	2015-07-09 22:07:51 UTC (rev 186639)
@@ -1,3 +1,12 @@
+2015-07-09  Devin Rousso  drou...@apple.com
+
+Web Inspector: Fix shape-highlight layout tests
+https://bugs.webkit.org/show_bug.cgi?id=146080
+
+Reviewed by Joseph Pecoraro.
+
+* http/tests/inspector/dom/shapes-test.js: Updated.
+
 2015-07-09  Michael Saboff  msab...@apple.com
 
 REGRESSION (r180248): Repro Crash: com.apple.WebKit.WebContent at com.apple._javascript_Core: JSC::createRangeError + 20


Modified: trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js (186638 => 186639)

--- trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js	2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/LayoutTests/http/tests/inspector/dom/shapes-test.js	2015-07-09 22:07:51 UTC (rev 186639)
@@ -31,11 +31,11 @@
 }
 
 function receivedHighlightObject(error, payload, wasThrown) {
-console.assert(!error, When evaluating code, received unexpected error: + error);
-console.assert(!error, When evaluating code, an exception was thrown: + wasThrown);
+InspectorTest.assert(!error, When evaluating code, received unexpected error: + error);
+InspectorTest.assert(!error, When evaluating code, an exception was thrown: + wasThrown);
 
 var data = ""
-callback(data.elementInfo.shapeOutsideInfo);
+callback(data[0].elementData.shapeOutsideData);
 }
 },
 


Modified: trunk/Source/WebCore/ChangeLog (186638 => 186639)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 22:07:51 UTC (rev 186639)
@@ -1,3 +1,13 @@
+2015-07-09  Devin Rousso  drou...@apple.com
+
+Web Inspector: Fix shape-highlight layout tests
+https://bugs.webkit.org/show_bug.cgi?id=146080
+
+Reviewed by Joseph Pecoraro.
+
+* inspector/InspectorOverlay.cpp:
+(WebCore::buildObjectForShapeOutside): Now properly returns the shape margin.
+
 2015-07-09  Eric Carlson  eric.carl...@apple.com
 
 [Mac] AirPlay to password protected AppleTV fails


Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (186638 => 186639)

--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp	2015-07-09 22:02:21 UTC (rev 186638)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp	2015-07-09 22:07:51 UTC (rev 186639)
@@ -675,7 +675,7 @@
 
 paths.marginShape.apply(info, appendPathSegment);
 
-shapeObject-setMarginShape(shapePath.copyRef());
+shapeObject-setMarginShape(marginShapePath.copyRef());
 }
 }
 






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186641] branches/safari-600.8-branch/Source/WebKit2

[matthew_hanson]

Title: [186641] branches/safari-600.8-branch/Source/WebKit2








Revision 186641
Author matthew_han...@apple.com
Date 2015-07-09 15:28:01 -0700 (Thu, 09 Jul 2015)


Log Message
Roll out r186559. rdar://problem/21716363

Modified Paths

branches/safari-600.8-branch/Source/WebKit2/ChangeLog
branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebKit2/ChangeLog (186640 => 186641)

--- branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/ChangeLog	2015-07-09 22:28:01 UTC (rev 186641)
@@ -1,5 +1,36 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Roll out r186559. rdar://problem/21716363
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186559. rdar://problem/21716363
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r183861. rdar://problem/21716677
+
+2015-05-05  Alexey Proskuryakov  a...@apple.com
+
+NetworkResourceLoader::cleanup() should clear ResourceHandle client pointer.
+https://bugs.webkit.org/show_bug.cgi?id=144641
+rdar://problem/20250960
+
+Reviewed by David Kilzer.
+
+* NetworkProcess/NetworkResourceLoader.cpp: (WebKit::NetworkResourceLoader::cleanup):
+Clear the client pointer.
+
+* Shared/Authentication/AuthenticationManager.cpp:
+(WebKit::AuthenticationManager::useCredentialForChallenge):
+(WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+(WebKit::AuthenticationManager::cancelChallenge):
+(WebKit::AuthenticationManager::performDefaultHandling):
+(WebKit::AuthenticationManager::rejectProtectionSpaceAndContinue):
+Updated comments, which were not accurate, at least on Mac.
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186591. rdar://problem/21716407
 
 2015-07-09  David Kilzer  ddkil...@apple.com


Modified: branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (186640 => 186641)

--- branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-07-09 22:28:01 UTC (rev 186641)
@@ -98,7 +98,7 @@
 m_resourceSandboxExtensions.append(resourceSandboxExtension);
 
 ASSERT(RunLoop::isMain());
-
+
 if (reply || parameters.shouldBufferResource)
 m_bufferedData = WebCore::SharedBuffer::create();
 
@@ -161,9 +161,12 @@
 
 // Tell the scheduler about this finished loader soon so it can start more network requests.
 NetworkProcess::shared().networkResourceLoadScheduler().scheduleRemoveLoader(this);
+
 if (m_handle) {
-m_handle-setClient(nullptr);
-m_handle = nullptr;
+// Explicit deref() balanced by a ref() in NetworkResourceLoader::start()
+// This might cause the NetworkResourceLoader to be destroyed and therefore we do it last.
+m_handle = 0;
+deref();
 }
 }
 
@@ -212,7 +215,7 @@
 
 // FIXME (NetworkProcess): For the memory cache we'll also need to cache the response data here.
 // Such buffering will need to be thread safe, as this callback is happening on a background thread.
-
+
 m_bytesReceived += buffer-size();
 if (m_bufferedData)
 m_bufferedData-append(buffer.get());


Modified: branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (186640 => 186641)

--- branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-09 22:11:53 UTC (rev 186640)
+++ branches/safari-600.8-branch/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp	2015-07-09 22:28:01 UTC (rev 186641)
@@ -116,8 +116,7 @@
 
 AuthenticationClient* coreClient = challenge.authenticationClient();
 if (!coreClient) {
-// FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
-// We should not call Download::receivedCredential in the latter case.
+// This authentication challenge comes from a download.
 Download::receivedCredential(challenge, credential);
 return;
 }
@@ -133,8 +132,7 @@
 ASSERT(!challenge.isNull());
 AuthenticationClient* coreClient = challenge.authenticationClient();
 if (!coreClient) {
-// FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
-// We should not call Download::receivedCredential in 

[webkit-changes] [186636] trunk/Source/WebCore

[eric . carlson]

Title: [186636] trunk/Source/WebCore








Revision 186636
Author eric.carl...@apple.com
Date 2015-07-09 14:59:33 -0700 (Thu, 09 Jul 2015)


Log Message
[Mac] AirPlay to password protected AppleTV fails
https://bugs.webkit.org/show_bug.cgi?id=146812

Reviewed by NOBODY (OOPS!).

* Modules/mediasession/WebMediaSessionManager.cpp:
(WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Initialize previouslyRequestedPicker.
(WebCore::WebMediaSessionManager::clientStateDidChange): Cleanup the logic and add a comment
  to make it slightly easier to follow. Don't begin playing to a device unless playback
  has just started (don't switch in mid-play).
(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Use the last client to
  request the device picker as a fallback in case no other client is a canditate. Add more
  logging to make it possible to debug the selection logic.
(WebCore::WebMediaSessionManager::scheduleDelayedTask): Fiddle with the logging.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186635 => 186636)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 21:57:32 UTC (rev 186635)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 21:59:33 UTC (rev 186636)
@@ -1,3 +1,20 @@
+2015-07-09  Eric Carlson  eric.carl...@apple.com
+
+[Mac] AirPlay to password protected AppleTV fails
+https://bugs.webkit.org/show_bug.cgi?id=146812
+
+Reviewed by Dean Jackson.
+
+* Modules/mediasession/WebMediaSessionManager.cpp:
+(WebCore::WebMediaSessionManager::showPlaybackTargetPicker): Initialize previouslyRequestedPicker.
+(WebCore::WebMediaSessionManager::clientStateDidChange): Cleanup the logic and add a comment
+  to make it slightly easier to follow. Don't begin playing to a device unless playback
+  has just started (don't switch in mid-play).
+(WebCore::WebMediaSessionManager::configurePlaybackTargetClients): Use the last client to
+  request the device picker as a fallback in case no other client is a canditate. Add more
+  logging to make it possible to debug the selection logic.
+(WebCore::WebMediaSessionManager::scheduleDelayedTask): Fiddle with the logging.
+
 2015-07-09  Matthew Daiter  mdai...@apple.com
 
 Implementing platform-specific section of enumerateDevices


Modified: trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (186635 => 186636)

--- trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp	2015-07-09 21:57:32 UTC (rev 186635)
+++ trunk/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp	2015-07-09 21:59:33 UTC (rev 186636)
@@ -54,6 +54,7 @@
 uint64_t contextId { 0 };
 WebCore::MediaProducer::MediaStateFlags flags { WebCore::MediaProducer::IsNotPlaying };
 bool requestedPicker { false };
+bool previouslyRequestedPicker { false };
 bool configurationRequired { true };
 bool playedToEnd { false };
 };
@@ -148,8 +149,10 @@
 return;
 
 auto clientRequestingPicker = m_clientState[index];
-for (auto state : m_clientState)
+for (auto state : m_clientState) {
 state-requestedPicker = state == clientRequestingPicker;
+state-previouslyRequestedPicker = state == clientRequestingPicker;
+}
 
 bool hasActiveRoute = flagsAreSet(m_clientState[index]-flags, MediaProducer::IsPlayingToExternalDevice);
 LOG(Media, WebMediaSessionManager::showPlaybackTargetPicker(%p + %llu) - hasActiveRoute = %i, client, contextId, (int)hasActiveRoute);
@@ -181,26 +184,20 @@
 scheduleDelayedTask(WatchdogTimerConfigurationTask);
 }
 
-if (!m_playbackTarget || !m_playbackTarget-hasActiveRoute())
+if (!m_playbackTarget || !m_playbackTarget-hasActiveRoute() || !flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate))
 return;
 
-if (!flagsAreSet(newFlags, MediaProducer::ExternalDeviceAutoPlayCandidate) || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
-return;
-
 // Do not interrupt another element already playing to a device.
-bool anotherClientHasActiveTarget = false;
 for (auto state : m_clientState) {
 if (state == changedClientState)
 continue;
 
-if (flagsAreSet(state-flags, MediaProducer::IsPlayingToExternalDevice)) {
-if (flagsAreSet(state-flags, MediaProducer::IsPlayingVideo))
-return;
-anotherClientHasActiveTarget = true;
-}
+if (flagsAreSet(state-flags, MediaProducer::IsPlayingToExternalDevice)  flagsAreSet(state-flags, MediaProducer::IsPlayingVideo))
+return;
 }
 
-if (anotherClientHasActiveTarget || !flagsAreSet(newFlags, MediaProducer::IsPlayingVideo))
+// Do not take begin playing to the device unless playback has just started.
+if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || 

[webkit-changes] [186637] branches/safari-600.8-branch/Source/WebCore

[matthew_hanson]

Title: [186637] branches/safari-600.8-branch/Source/WebCore








Revision 186637
Author matthew_han...@apple.com
Date 2015-07-09 15:00:53 -0700 (Thu, 09 Jul 2015)


Log Message
Merge r186508. rdar://problem/21707887

Modified Paths

branches/safari-600.8-branch/Source/WebCore/ChangeLog
branches/safari-600.8-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp




Diff

Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186636 => 186637)

--- branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 21:59:33 UTC (rev 186636)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog	2015-07-09 22:00:53 UTC (rev 186637)
@@ -1,5 +1,24 @@
 2015-07-09  Matthew Hanson  matthew_han...@apple.com
 
+Merge r186508. rdar://problem/21707887
+
+2015-07-08  Matthew Hanson  matthew_han...@apple.com
+
+Merge r186389. rdar://problem/21708243
+
+2015-07-06  Daniel Bates  daba...@apple.com
+
+Fix the Windows build following https://trac.webkit.org/changeset/186388
+(https://bugs.webkit.org/show_bug.cgi?id=144830)
+
+As we for for Mac in WebCoreAVFResourceLoader::startLoading(), instantiate ResourceLoaderOptions
+with ContentSecurityPolicyImposition::DoPolicyCheck.
+
+* platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:
+(WebCore::WebCoreAVCFResourceLoader::startLoading):
+
+2015-07-09  Matthew Hanson  matthew_han...@apple.com
+
 Merge r186591. rdar://problem/21716407
 
 2015-07-09  David Kilzer  ddkil...@apple.com


Modified: branches/safari-600.8-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp (186636 => 186637)

--- branches/safari-600.8-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp	2015-07-09 21:59:33 UTC (rev 186636)
+++ branches/safari-600.8-branch/Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp	2015-07-09 22:00:53 UTC (rev 186637)
@@ -72,7 +72,8 @@
 RetainPtrCFURLRequestRef urlRequest = AVCFAssetResourceLoadingRequestGetURLRequest(m_avRequest.get());
 URL requestURL = CFURLRequestGetURL(urlRequest.get());
 
-CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType));
+// ContentSecurityPolicyImposition::DoPolicyCheck is a placeholder value. It does not affect the request since Content Security Policy does not apply to raw resources.
+CachedResourceRequest request(ResourceRequest(requestURL), ResourceLoaderOptions(SendCallbacks, DoNotSniffContent, BufferData, DoNotAllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, DoSecurityCheck, UseDefaultOriginRestrictionsForType, ContentSecurityPolicyImposition::DoPolicyCheck));
 
 request.mutableResourceRequest().setPriority(ResourceLoadPriorityLow);
 CachedResourceLoader* loader = m_parent-player()-cachedResourceLoader();






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186638] branches/jsc-tailcall/

[lforschler]

Title: [186638] branches/jsc-tailcall/








Revision 186638
Author lforsch...@apple.com
Date 2015-07-09 15:02:21 -0700 (Thu, 09 Jul 2015)


Log Message
New Branch.

Added Paths

branches/jsc-tailcall/




Diff

Property changes: branches/jsc-tailcall



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186640] trunk/Source/WebCore

[commit-queue]

Title: [186640] trunk/Source/WebCore








Revision 186640
Author commit-qu...@webkit.org
Date 2015-07-09 15:11:53 -0700 (Thu, 09 Jul 2015)


Log Message
Expose MediaStream methods to be used in the MediaStream Engine
https://bugs.webkit.org/show_bug.cgi?id=146791
rdar://problem/21747589

Patch by Matthew Daiter mdai...@apple.com on 2015-07-09
Reviewed by Brent Fulgham.

* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::getAudioTracks): Removed const
(WebCore::MediaStream::getVideoTracks): Ditto
* Modules/mediastream/MediaStream.h: Needed to change functions to
override
* platform/mediastream/MediaStreamPrivate.h: Added certain calls to
PrivateClient that exposes methods to be used in the engine

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
trunk/Source/WebCore/Modules/mediastream/MediaStream.h
trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186639 => 186640)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 22:11:53 UTC (rev 186640)
@@ -1,3 +1,19 @@
+2015-07-09  Matthew Daiter  mdai...@apple.com
+
+Expose MediaStream methods to be used in the MediaStream Engine
+https://bugs.webkit.org/show_bug.cgi?id=146791
+rdar://problem/21747589
+
+Reviewed by Brent Fulgham.
+
+* Modules/mediastream/MediaStream.cpp: 
+(WebCore::MediaStream::getAudioTracks): Removed const
+(WebCore::MediaStream::getVideoTracks): Ditto
+* Modules/mediastream/MediaStream.h: Needed to change functions to
+override
+* platform/mediastream/MediaStreamPrivate.h: Added certain calls to
+PrivateClient that exposes methods to be used in the engine
+
 2015-07-09  Devin Rousso  drou...@apple.com
 
 Web Inspector: Fix shape-highlight layout tests


Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (186639 => 186640)

--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2015-07-09 22:11:53 UTC (rev 186640)
@@ -140,12 +140,12 @@
 return nullptr;
 }
 
-VectorRefPtrMediaStreamTrack MediaStream::getAudioTracks() const
+VectorRefPtrMediaStreamTrack MediaStream::getAudioTracks()
 {
 return trackVectorForType(RealtimeMediaSource::Audio);
 }
 
-VectorRefPtrMediaStreamTrack MediaStream::getVideoTracks() const
+VectorRefPtrMediaStreamTrack MediaStream::getVideoTracks()
 {
 return trackVectorForType(RealtimeMediaSource::Video);
 }


Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (186639 => 186640)

--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h	2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h	2015-07-09 22:11:53 UTC (rev 186640)
@@ -64,8 +64,8 @@
 void removeTrack(MediaStreamTrack*);
 MediaStreamTrack* getTrackById(String);
 
-VectorRefPtrMediaStreamTrack getAudioTracks() const;
-VectorRefPtrMediaStreamTrack getVideoTracks() const;
+VectorRefPtrMediaStreamTrack getAudioTracks() override final;
+VectorRefPtrMediaStreamTrack getVideoTracks() override final;
 VectorRefPtrMediaStreamTrack getTracks() const;
 
 RefPtrMediaStream clone();


Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (186639 => 186640)

--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h	2015-07-09 22:07:51 UTC (rev 186639)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h	2015-07-09 22:11:53 UTC (rev 186640)
@@ -39,6 +39,7 @@
 #include MediaStreamTrackPrivate.h
 #include wtf/HashMap.h
 #include wtf/RefCounted.h
+#include wtf/RefPtr.h
 #include wtf/Vector.h
 
 namespace WebCore {
@@ -52,6 +53,8 @@
 virtual void activeStatusChanged() = 0;
 virtual void didAddTrackToPrivate(MediaStreamTrackPrivate) = 0;
 virtual void didRemoveTrackFromPrivate(MediaStreamTrackPrivate) = 0;
+virtual VectorRefPtrMediaStreamTrack getVideoTracks() = 0;
+virtual VectorRefPtrMediaStreamTrack getAudioTracks() = 0;
 };
 
 class MediaStreamPrivate : public RefCountedMediaStreamPrivate {






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186642] trunk/Source/WebCore

[beidson]

Title: [186642] trunk/Source/WebCore








Revision 186642
Author beid...@apple.com
Date 2015-07-09 15:30:42 -0700 (Thu, 09 Jul 2015)


Log Message
DocumentLoader::detachFromFrame() is being called with no current Frame set.
rdar://problem/21293082 and https://bugs.webkit.org/show_bug.cgi?id=146786

Reviewed by Sam Weinig.

No new tests (Unknown how to reproduce).

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::attachToFrame):
(WebCore::DocumentLoader::detachFromFrame): Null check m_frame before dereferencing it.
(WebCore::DocumentLoader::setFrame): Deleted, renamed to attachToFrame(), and take's
  a Frame instead of a Frame*.
* loader/DocumentLoader.h:

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::initForSynthesizedDocument): setFrame is now attachToFrame.
(WebCore::FrameLoader::setPolicyDocumentLoader): Ditto.
(WebCore::FrameLoader::transitionToCommitted): Ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentLoader.cpp
trunk/Source/WebCore/loader/DocumentLoader.h
trunk/Source/WebCore/loader/FrameLoader.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186641 => 186642)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 22:30:42 UTC (rev 186642)
@@ -1,3 +1,24 @@
+2015-07-09  Brady Eidson  beid...@apple.com
+
+DocumentLoader::detachFromFrame() is being called with no current Frame set.
+rdar://problem/21293082 and https://bugs.webkit.org/show_bug.cgi?id=146786 
+
+Reviewed by Sam Weinig.
+
+No new tests (Unknown how to reproduce).
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::attachToFrame):
+(WebCore::DocumentLoader::detachFromFrame): Null check m_frame before dereferencing it.
+(WebCore::DocumentLoader::setFrame): Deleted, renamed to attachToFrame(), and take's
+  a Frame instead of a Frame*.
+* loader/DocumentLoader.h:
+
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::initForSynthesizedDocument): setFrame is now attachToFrame.
+(WebCore::FrameLoader::setPolicyDocumentLoader): Ditto.
+(WebCore::FrameLoader::transitionToCommitted): Ditto.
+
 2015-07-09  Matthew Daiter  mdai...@apple.com
 
 Expose MediaStream methods to be used in the MediaStream Engine


Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (186641 => 186642)

--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-07-09 22:30:42 UTC (rev 186642)
@@ -899,13 +899,11 @@
 m_frame-document()-domWindow()-finishedLoading();
 }
 
-void DocumentLoader::setFrame(Frame* frame)
+void DocumentLoader::attachToFrame(Frame frame)
 {
-if (m_frame == frame)
-return;
-ASSERT(frame  !m_frame);
-m_frame = frame;
-m_writer.setFrame(frame);
+ASSERT(!m_frame);
+m_frame = frame;
+m_writer.setFrame(frame);
 attachToFrame();
 }
 
@@ -930,7 +928,14 @@
 #endif
 
 m_applicationCacheHost-setDOMApplicationCache(nullptr);
-InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+
+// Even though we ASSERT at the top of this method that we have an m_frame, we're seeing crashes where m_frame is null.
+// This means either that a DocumentLoader is detaching twice, or is detaching before ever having attached.
+// Until we figure out how that is happening, null check m_frame before dereferencing it here.
+// rdar://problem/21293082 and https://bugs.webkit.org/show_bug.cgi?id=146786
+if (m_frame)
+InspectorInstrumentation::loaderDetachedFromFrame(*m_frame, *this);
+
 m_frame = nullptr;
 // The call to stopLoading() above should have canceled any pending content policy check.
 ASSERT_WITH_MESSAGE(!m_waitingForContentPolicy, The content policy callback needs a valid frame.);


Modified: trunk/Source/WebCore/loader/DocumentLoader.h (186641 => 186642)

--- trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-09 22:28:01 UTC (rev 186641)
+++ trunk/Source/WebCore/loader/DocumentLoader.h	2015-07-09 22:30:42 UTC (rev 186642)
@@ -88,10 +88,9 @@
 }
 WEBCORE_EXPORT virtual ~DocumentLoader();
 
-WEBCORE_EXPORT void setFrame(Frame*);
+void attachToFrame(Frame);
 Frame* frame() const { return m_frame; }
 
-WEBCORE_EXPORT virtual void attachToFrame();
 WEBCORE_EXPORT virtual void detachFromFrame();
 
 WEBCORE_EXPORT FrameLoader* frameLoader() const;
@@ -281,6 +280,8 @@
 protected:
 WEBCORE_EXPORT DocumentLoader(const ResourceRequest, const SubstituteData);
 
+WEBCORE_EXPORT virtual void attachToFrame();
+
 bool m_deferMainResourceDataLoad;
 
 private:


Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (186641 => 186642)

--- trunk/Source/WebCore/loader/FrameLoader.cpp	2015-07-09 22:28:01 UTC (rev 186641)
+++ 

[webkit-changes] [186649] trunk/Source

[achristensen]

Title: [186649] trunk/Source








Revision 186649
Author achristen...@apple.com
Date 2015-07-09 16:33:25 -0700 (Thu, 09 Jul 2015)


Log Message
[Content Extensions] Add 3 byte jump size.
https://bugs.webkit.org/show_bug.cgi?id=146425

Reviewed by Darin Adler.

Source/WebCore:

* contentextensions/DFABytecode.h:
(WebCore::ContentExtensions::smallestPossibleJumpSize):
* contentextensions/DFABytecodeCompiler.cpp:
(WebCore::ContentExtensions::appendZeroes):
(WebCore::ContentExtensions::DFABytecodeCompiler::compile):
* contentextensions/DFABytecodeInterpreter.cpp:
(WebCore::ContentExtensions::jumpSizeInBytes):
(WebCore::ContentExtensions::getJumpSize):
(WebCore::ContentExtensions::getJumpDistance):
Added DFABytecodeJumpSize::Int24.

Source/WebKit2:

* UIProcess/API/APIUserContentExtensionStore.h:
Increment CurrentContentExtensionFileVersion because of change in the bytecode.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/contentextensions/DFABytecode.h
trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp
trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (186648 => 186649)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 23:33:25 UTC (rev 186649)
@@ -1,3 +1,21 @@
+2015-07-09  Alex Christensen  achristen...@webkit.org
+
+[Content Extensions] Add 3 byte jump size.
+https://bugs.webkit.org/show_bug.cgi?id=146425
+
+Reviewed by Darin Adler.
+
+* contentextensions/DFABytecode.h:
+(WebCore::ContentExtensions::smallestPossibleJumpSize):
+* contentextensions/DFABytecodeCompiler.cpp:
+(WebCore::ContentExtensions::appendZeroes):
+(WebCore::ContentExtensions::DFABytecodeCompiler::compile):
+* contentextensions/DFABytecodeInterpreter.cpp:
+(WebCore::ContentExtensions::jumpSizeInBytes):
+(WebCore::ContentExtensions::getJumpSize):
+(WebCore::ContentExtensions::getJumpDistance):
+Added DFABytecodeJumpSize::Int24.
+
 2015-07-09  Brady Eidson  beid...@apple.com
 
 Add better ASSERTs to learn more about what is going wrong in DocumentLoader::detachFromFrame()


Modified: trunk/Source/WebCore/contentextensions/DFABytecode.h (186648 => 186649)

--- trunk/Source/WebCore/contentextensions/DFABytecode.h	2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecode.h	2015-07-09 23:33:25 UTC (rev 186649)
@@ -83,8 +83,11 @@
 enum DFABytecodeJumpSize {
 Int8 = 0x10,
 Int16 = 0x20,
-Int32 = 0x30,
+Int24 = 0x30,
+Int32 = 0x40,
 };
+const int32_t Int24Max = (1  23) - 1;
+const int32_t Int24Min = -(1  23);
 
 static inline DFABytecodeJumpSize smallestPossibleJumpSize(int32_t longestPossibleJump)
 {
@@ -92,6 +95,8 @@
 return Int8;
 if (longestPossibleJump = std::numeric_limitsint16_t::max()  longestPossibleJump = std::numeric_limitsint16_t::min())
 return Int16;
+if (longestPossibleJump = Int24Max  longestPossibleJump = Int24Min)
+return Int24;
 return Int32;
 }
 


Modified: trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp (186648 => 186649)

--- trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp	2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp	2015-07-09 23:33:25 UTC (rev 186649)
@@ -52,6 +52,10 @@
 case DFABytecodeJumpSize::Int16:
 appendint16_t(bytecode, 0); // This value will be set when linking.
 break;
+case DFABytecodeJumpSize::Int24:
+appenduint16_t(bytecode, 0);
+appendint8_t(bytecode, 0); // These values will be set when linking.
+break;
 case DFABytecodeJumpSize::Int32:
 appendint32_t(bytecode, 0); // This value will be set when linking.
 break;
@@ -374,6 +378,11 @@
 RELEASE_ASSERT(distance == static_castint16_t(distance));
 setBitsint16_t(m_bytecode, linkRecord.jumpLocation, static_castint16_t(distance));
 break;
+case Int24:
+RELEASE_ASSERT(distance = Int24Min  distance = Int24Max);
+setBitsuint16_t(m_bytecode, linkRecord.jumpLocation, static_castuint16_t(distance));
+setBitsint8_t(m_bytecode, linkRecord.jumpLocation + sizeof(int16_t), static_castint8_t(distance  16));
+break;
 case Int32:
 setBitsint32_t(m_bytecode, linkRecord.jumpLocation, distance);
 break;


Modified: trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp (186648 => 186649)

--- trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp	2015-07-09 23:32:15 UTC (rev 186648)
+++ trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp	2015-07-09 23:33:25 UTC (rev 186649)
@@ -54,6 +54,8 @@
 return 

[webkit-changes] [186648] trunk/Source/WebKit2

[andersca]

Title: [186648] trunk/Source/WebKit2








Revision 186648
Author ander...@apple.com
Date 2015-07-09 16:32:15 -0700 (Thu, 09 Jul 2015)


Log Message
SafariViewController loads partial webpage or entirely blank webpage
https://bugs.webkit.org/show_bug.cgi?id=146815
rdar://problem/21734757

Reviewed by Dan Bernstein.

* Platform/spi/ios/UIKitSPI.h:
Add _hostProcessIdentifier getter.

* UIProcess/ApplicationStateTracker.h:
Change ApplicationStateTracker to hold on to a WKContentView instead of a UIView.

* UIProcess/ApplicationStateTracker.mm:
(WebKit::applicationType):
Add a helper function that returns the type of application the web view is hosted by (regular
application, view service or extension).

(WebKit::ApplicationStateTracker::ApplicationStateTracker):
Register notifications and update m_isInBackground. For regular applications, just listen for UIApplication notifications.
For view services, walk the view controller hierarchy and find the service view controller and listen for notifications and use
BKS to find the background state of the host application. For extensions, just use BKSApplicationStateMonitor directly.

(WebKit::isViewService): Deleted.

* UIProcess/ios/WKContentView.mm:
(-[WKContentView willMoveToWindow:]):
If we're moving out of a window, null out the state tracker.

(-[WKContentView didMoveToWindow]):
If we moved to a window, create a new state tracker.

(-[WKContentView isBackground]):
Handle a null application state.

(-[WKContentView _commonInitializationWithProcessPool:configuration:]): Deleted.
Don't create the application state here.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h
trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h
trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm
trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (186647 => 186648)

--- trunk/Source/WebKit2/ChangeLog	2015-07-09 23:29:33 UTC (rev 186647)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-09 23:32:15 UTC (rev 186648)
@@ -1,3 +1,42 @@
+2015-07-09  Anders Carlsson  ander...@apple.com
+
+SafariViewController loads partial webpage or entirely blank webpage
+https://bugs.webkit.org/show_bug.cgi?id=146815
+rdar://problem/21734757
+
+Reviewed by Dan Bernstein.
+
+* Platform/spi/ios/UIKitSPI.h:
+Add _hostProcessIdentifier getter.
+
+* UIProcess/ApplicationStateTracker.h:
+Change ApplicationStateTracker to hold on to a WKContentView instead of a UIView.
+
+* UIProcess/ApplicationStateTracker.mm:
+(WebKit::applicationType):
+Add a helper function that returns the type of application the web view is hosted by (regular
+application, view service or extension).
+
+(WebKit::ApplicationStateTracker::ApplicationStateTracker):
+Register notifications and update m_isInBackground. For regular applications, just listen for UIApplication notifications.
+For view services, walk the view controller hierarchy and find the service view controller and listen for notifications and use
+BKS to find the background state of the host application. For extensions, just use BKSApplicationStateMonitor directly.
+
+(WebKit::isViewService): Deleted.
+
+* UIProcess/ios/WKContentView.mm:
+(-[WKContentView willMoveToWindow:]):
+If we're moving out of a window, null out the state tracker.
+
+(-[WKContentView didMoveToWindow]):
+If we moved to a window, create a new state tracker.
+
+(-[WKContentView isBackground]):
+Handle a null application state.
+
+(-[WKContentView _commonInitializationWithProcessPool:configuration:]): Deleted.
+Don't create the application state here.
+
 2015-07-09  Dan Bernstein  m...@apple.com
 
 [Cocoa] Report the first paint after committing a load as a rendering progress event


Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (186647 => 186648)

--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h	2015-07-09 23:29:33 UTC (rev 186647)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h	2015-07-09 23:32:15 UTC (rev 186648)
@@ -57,6 +57,7 @@
 #import UIKit/UITextInteractionAssistant_Private.h
 #import UIKit/UIViewControllerTransitioning_Private.h
 #import UIKit/UIViewController_Private.h
+#import UIKit/UIViewController_ViewService.h
 #import UIKit/UIView_Private.h
 #import UIKit/UIWKSelectionAssistant.h
 #import UIKit/UIWKTextInteractionAssistant.h
@@ -319,6 +320,10 @@
 + (UIViewController *)viewControllerForView:(UIView *)view;
 @end
 
+@interface UIViewController (ViewService)
+- (pid_t)_hostProcessIdentifier;
+@end
+
 @protocol UIViewControllerContextTransitioningEx UIViewControllerContextTransitioning
 - (void)__runAlongsideAnimations;
 - (void)_interactivityDidChange:(BOOL)isInteractive;


Modified: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h (186647 => 186648)

[webkit-changes] [186650] trunk/Source/WebCore

[cfleizach]

Title: [186650] trunk/Source/WebCore








Revision 186650
Author cfleiz...@apple.com
Date 2015-07-09 16:43:08 -0700 (Thu, 09 Jul 2015)


Log Message
AX: details element should allow expand/close through AX API
https://bugs.webkit.org/show_bug.cgi?id=146549

Reviewed by Mario Sanchez Prada.

Forgot this file with the original commit.

* html/HTMLDetailsElement.cpp:
(WebCore::HTMLDetailsElement::toggleOpen):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLDetailsElement.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (186649 => 186650)

--- trunk/Source/WebCore/ChangeLog	2015-07-09 23:33:25 UTC (rev 186649)
+++ trunk/Source/WebCore/ChangeLog	2015-07-09 23:43:08 UTC (rev 186650)
@@ -1,3 +1,15 @@
+2015-07-09  Chris Fleizach  cfleiz...@apple.com
+
+AX: details element should allow expand/close through AX API
+https://bugs.webkit.org/show_bug.cgi?id=146549
+
+Reviewed by Mario Sanchez Prada.
+
+Forgot this file with the original commit.
+
+* html/HTMLDetailsElement.cpp:
+(WebCore::HTMLDetailsElement::toggleOpen):
+
 2015-07-09  Alex Christensen  achristen...@webkit.org
 
 [Content Extensions] Add 3 byte jump size.


Modified: trunk/Source/WebCore/html/HTMLDetailsElement.cpp (186649 => 186650)

--- trunk/Source/WebCore/html/HTMLDetailsElement.cpp	2015-07-09 23:33:25 UTC (rev 186649)
+++ trunk/Source/WebCore/html/HTMLDetailsElement.cpp	2015-07-09 23:43:08 UTC (rev 186650)
@@ -22,6 +22,7 @@
 #include HTMLDetailsElement.h
 
 #if ENABLE(DETAILS_ELEMENT)
+#include AXObjectCache.h
 #include ElementIterator.h
 #include HTMLSummaryElement.h
 #include InsertionPoint.h
@@ -161,6 +162,10 @@
 void HTMLDetailsElement::toggleOpen()
 {
 setAttribute(openAttr, m_isOpen ? nullAtom : emptyAtom);
+
+// We need to post to the document because toggling this element will delete it.
+if (AXObjectCache* cache = document().existingAXObjectCache())
+cache-postNotification(nullptr, document(), AXObjectCache::AXExpandedChanged);
 }
 
 }






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186652] trunk/Source/WebCore

[dino]

Title: [186652] trunk/Source/WebCore








Revision 186652
Author d...@apple.com
Date 2015-07-09 17:02:50 -0700 (Thu, 09 Jul 2015)


Log Message
REGRESSION: Inline media scrubbing always pauses the video
https://bugs.webkit.org/show_bug.cgi?id=146819
rdar://problem/21572027

Reviewed by Eric Carlson. Joseph Pecoraro also was really
helpful in diagnosing the problem.

When we moved some code from a getter/setter in the child
class to the base class, it was no longer being called due
to the bad way we were implementing inheritance. The solution
was to have the child class explicitly call into the base
class.

The much better solution would have been to rewrite everything
to use ES6 classes or, as a smaller change, assign the __proto__
directly on the child prototype. But I felt that was a bit
too risky at this point.

* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.extend): Describe in a comment why the extend function
is not suitable.
* Modules/mediacontrols/mediaControlsiOS.js: Add a getter/setter for
scrubbing that calls into the base Controller.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (186651 => 186652)

--- trunk/Source/WebCore/ChangeLog	2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/ChangeLog	2015-07-10 00:02:50 UTC (rev 186652)
@@ -1,3 +1,29 @@
+2015-07-09  Dean Jackson  d...@apple.com
+
+REGRESSION: Inline media scrubbing always pauses the video
+https://bugs.webkit.org/show_bug.cgi?id=146819
+rdar://problem/21572027
+
+Reviewed by Eric Carlson. Joseph Pecoraro also was really
+helpful in diagnosing the problem.
+
+When we moved some code from a getter/setter in the child
+class to the base class, it was no longer being called due
+to the bad way we were implementing inheritance. The solution
+was to have the child class explicitly call into the base
+class.
+
+The much better solution would have been to rewrite everything
+to use ES6 classes or, as a smaller change, assign the __proto__
+directly on the child prototype. But I felt that was a bit
+too risky at this point.
+
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.extend): Describe in a comment why the extend function
+is not suitable.
+* Modules/mediacontrols/mediaControlsiOS.js: Add a getter/setter for
+scrubbing that calls into the base Controller.
+
 2015-07-09  Chris Fleizach  cfleiz...@apple.com
 
 AX: details element should allow expand/close through AX API


Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (186651 => 186652)

--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-07-10 00:02:50 UTC (rev 186652)
@@ -132,6 +132,12 @@
 
 extend: function(child)
 {
+// This function doesn't actually do what we want it to. In particular it
+// is not copying the getters and setters to the child class, since they are
+// not enumerable. What we should do is use ES6 classes, or assign the __proto__
+// directly.
+// FIXME: Use ES6 classes.
+
 for (var property in this) {
 if (!child.hasOwnProperty(property))
 child[property] = this[property];


Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (186651 => 186652)

--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js	2015-07-10 00:02:41 UTC (rev 186651)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js	2015-07-10 00:02:50 UTC (rev 186652)
@@ -630,6 +630,21 @@
 return Controller.prototype.controlsAlwaysVisible.call(this);
 },
 
+// Due to the bad way we are faking inheritance here, in particular the extends method
+// on Controller.prototype, we don't copy getters and setters from the prototype. This
+// means we have to implement them again, here in the subclass.
+// FIXME: Use ES6 classes!
+
+get scrubbing()
+{
+return Object.getOwnPropertyDescriptor(Controller.prototype, scrubbing).get.call(this);
+},
+
+set scrubbing(flag)
+{
+Object.getOwnPropertyDescriptor(Controller.prototype, scrubbing).set.call(this, flag);
+},
+
 get pageScaleFactor()
 {
 return this._pageScaleFactor;






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186651] trunk/Source/WebInspectorUI

[timothy]

Title: [186651] trunk/Source/WebInspectorUI








Revision 186651
Author timo...@apple.com
Date 2015-07-09 17:02:41 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Make the TabBar work better with AX
https://bugs.webkit.org/show_bug.cgi?id=146806

Reviewed by Joseph Pecoraro.

* UserInterface/Views/TabBar.js:
(WebInspector.TabBar): Set role to tablist and drop tabIndex.
* UserInterface/Views/TabBarItem.js:
(WebInspector.TabBarItem): Set role to tab and tabIndex.
(WebInspector.TabBarItem.prototype.set selected): Toggle aria-selected.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js
trunk/Source/WebInspectorUI/UserInterface/Views/TabBarItem.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186650 => 186651)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-09 23:43:08 UTC (rev 186650)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-10 00:02:41 UTC (rev 186651)
@@ -1,3 +1,16 @@
+2015-07-09  Timothy Hatcher  timo...@apple.com
+
+Web Inspector: Make the TabBar work better with AX
+https://bugs.webkit.org/show_bug.cgi?id=146806
+
+Reviewed by Joseph Pecoraro.
+
+* UserInterface/Views/TabBar.js:
+(WebInspector.TabBar): Set role to tablist and drop tabIndex.
+* UserInterface/Views/TabBarItem.js:
+(WebInspector.TabBarItem): Set role to tab and tabIndex.
+(WebInspector.TabBarItem.prototype.set selected): Toggle aria-selected.
+
 2015-07-09  Devin Rousso  drou...@apple.com
 
 Web Inspector: Don't clear the console when navigating to a different page


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js (186650 => 186651)

--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js	2015-07-09 23:43:08 UTC (rev 186650)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBar.js	2015-07-10 00:02:41 UTC (rev 186651)
@@ -31,7 +31,7 @@
 
 this._element = element || document.createElement(div);
 this._element.classList.add(tab-bar);
-this._element.tabIndex = 0;
+this._element.setAttribute(role, tablist);
 
 var topBorderElement = document.createElement(div);
 topBorderElement.classList.add(top-border);


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBarItem.js (186650 => 186651)

--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBarItem.js	2015-07-09 23:43:08 UTC (rev 186650)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBarItem.js	2015-07-10 00:02:41 UTC (rev 186651)
@@ -33,6 +33,8 @@
 
 this._element = document.createElement(div);
 this._element.classList.add(WebInspector.TabBarItem.StyleClassName);
+this._element.setAttribute(role, tab);
+this._element.tabIndex = 0;
 if (pinned)
 this._element.classList.add(pinned);
 this._element[WebInspector.TabBarItem.ElementReferenceSymbol] = this;
@@ -100,6 +102,11 @@
 set selected(selected)
 {
 this._element.classList.toggle(selected, selected);
+
+if (selected)
+this._element.setAttribute(aria-selected, true);
+else
+this._element.removeAttribute(aria-selected);
 }
 
 get disabled()






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186653] trunk/Source/WebKit2

[mcatanzaro]

Title: [186653] trunk/Source/WebKit2








Revision 186653
Author mcatanz...@igalia.com
Date 2015-07-09 17:09:11 -0700 (Thu, 09 Jul 2015)


Log Message
[GTK] Crash when spell checker returns no guesses
https://bugs.webkit.org/show_bug.cgi?id=146805

Reviewed by Martin Robinson.

Properly handle ContextMenuItemTagNoGuessesFound in the switch statement.

* UIProcess/API/gtk/WebKitContextMenuActions.cpp:
(webkitContextMenuActionGetForContextMenuItem):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (186652 => 186653)

--- trunk/Source/WebKit2/ChangeLog	2015-07-10 00:02:50 UTC (rev 186652)
+++ trunk/Source/WebKit2/ChangeLog	2015-07-10 00:09:11 UTC (rev 186653)
@@ -1,3 +1,15 @@
+2015-07-09  Michael Catanzaro  mcatanz...@igalia.com
+
+[GTK] Crash when spell checker returns no guesses
+https://bugs.webkit.org/show_bug.cgi?id=146805
+
+Reviewed by Martin Robinson.
+
+Properly handle ContextMenuItemTagNoGuessesFound in the switch statement.
+
+* UIProcess/API/gtk/WebKitContextMenuActions.cpp:
+(webkitContextMenuActionGetForContextMenuItem):
+
 2015-07-09  Alex Christensen  achristen...@webkit.org
 
 [Content Extensions] Add 3 byte jump size.


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp (186652 => 186653)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp	2015-07-10 00:02:50 UTC (rev 186652)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuActions.cpp	2015-07-10 00:09:11 UTC (rev 186653)
@@ -182,6 +182,8 @@
 return WEBKIT_CONTEXT_MENU_ACTION_UNICODE;
 case ContextMenuItemTagSpellingGuess:
 return WEBKIT_CONTEXT_MENU_ACTION_SPELLING_GUESS;
+case ContextMenuItemTagNoGuessesFound:
+return WEBKIT_CONTEXT_MENU_ACTION_NO_GUESSES_FOUND;
 case ContextMenuItemTagIgnoreSpelling:
 return WEBKIT_CONTEXT_MENU_ACTION_IGNORE_SPELLING;
 case ContextMenuItemTagLearnSpelling:






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186654] trunk/Source/WebInspectorUI

[timothy]

Title: [186654] trunk/Source/WebInspectorUI








Revision 186654
Author timo...@apple.com
Date 2015-07-09 17:11:09 -0700 (Thu, 09 Jul 2015)


Log Message
Web Inspector: Storage tab should have a scope bar in the sidebar
https://bugs.webkit.org/show_bug.cgi?id=146799

Reviewed by Mark Lam.

* Localizations/en.lproj/localizedStrings.js: Updated.
* UserInterface/Main.html: Added StorageSidebarPanel.css.
* UserInterface/Views/StorageSidebarPanel.css: Added.
* UserInterface/Views/StorageSidebarPanel.js:
(WebInspector.StorageSidebarPanel):
(WebInspector.StorageSidebarPanel.prototype.hasCustomFilters):
(WebInspector.StorageSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
(WebInspector.StorageSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
(WebInspector.StorageSidebarPanel.prototype._scopeBarSelectionDidChange):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
trunk/Source/WebInspectorUI/UserInterface/Main.html
trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.js


Added Paths

trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.css




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (186653 => 186654)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-07-10 00:09:11 UTC (rev 186653)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-07-10 00:11:09 UTC (rev 186654)
@@ -1,5 +1,22 @@
 2015-07-09  Timothy Hatcher  timo...@apple.com
 
+Web Inspector: Storage tab should have a scope bar in the sidebar
+https://bugs.webkit.org/show_bug.cgi?id=146799
+
+Reviewed by Mark Lam.
+
+* Localizations/en.lproj/localizedStrings.js: Updated.
+* UserInterface/Main.html: Added StorageSidebarPanel.css.
+* UserInterface/Views/StorageSidebarPanel.css: Added.
+* UserInterface/Views/StorageSidebarPanel.js:
+(WebInspector.StorageSidebarPanel):
+(WebInspector.StorageSidebarPanel.prototype.hasCustomFilters):
+(WebInspector.StorageSidebarPanel.prototype.matchTreeElementAgainstCustomFilters.match):
+(WebInspector.StorageSidebarPanel.prototype.matchTreeElementAgainstCustomFilters):
+(WebInspector.StorageSidebarPanel.prototype._scopeBarSelectionDidChange):
+
+2015-07-09  Timothy Hatcher  timo...@apple.com
+
 Web Inspector: Make the TabBar work better with AX
 https://bugs.webkit.org/show_bug.cgi?id=146806
 


Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (186653 => 186654)

--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2015-07-10 00:09:11 UTC (rev 186653)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js	2015-07-10 00:11:09 UTC (rev 186654)
@@ -51,6 +51,7 @@
 localizedStrings[All Changes] = All Changes;
 localizedStrings[All Exceptions] = All Exceptions;
 localizedStrings[All Resources] = All Resources;
+localizedStrings[All Storage] = All Storage;
 localizedStrings[All Uncaught Exceptions] = All Uncaught Exceptions;
 localizedStrings[An error occured trying to\nread the  %s  table.] = An error occured trying to\nread the  %s  table.;
 localizedStrings[An error occurred trying to load the resource.] = An error occurred trying to load the resource.;


Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (186653 => 186654)

--- trunk/Source/WebInspectorUI/UserInterface/Main.html	2015-07-10 00:09:11 UTC (rev 186653)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html	2015-07-10 00:11:09 UTC (rev 186654)
@@ -136,6 +136,7 @@
 link rel=stylesheet href=""
 link rel=stylesheet href=""
 link rel=stylesheet href=""
+link rel=stylesheet href=""
 link rel=stylesheet href=""
 link rel=stylesheet href=""
 link rel=stylesheet href=""


Added: trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.css (0 => 186654)

--- trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.css	(rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/StorageSidebarPanel.css	2015-07-10 00:11:09 UTC (rev 186654)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2015 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 

[webkit-changes] [186655] trunk/Tools

[mcatanzaro]

Title: [186655] trunk/Tools








Revision 186655
Author mcatanz...@igalia.com
Date 2015-07-09 17:20:31 -0700 (Thu, 09 Jul 2015)


Log Message
[GTK] pango should be included in the default jhbuild moduleset
https://bugs.webkit.org/show_bug.cgi?id=146683

Reviewed by Martin Robinson.

Recent releases of pango 1.36 use functions that are only provided by fontconfig 2.12 when
compiled against sufficiently-new versions of fontconfig. Since we depend on both pango and
fontconfig, and pango depends on fontconfig, we must either add pango to our jhbuild
moduleset or else upgrade fontconfig to a recent unstable release (knowing that we will have
the same problem again the next time pango wants to use a new fontconfig feature), or remove
fontconfig (which would make it hard to keep tests working). On the balance, adding pango is
best.

* gtk/jhbuild-optional.modules: Remove pango
* gtk/jhbuild.modules: Add pango and update to latest 1.36.8

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/gtk/jhbuild-optional.modules
trunk/Tools/gtk/jhbuild.modules




Diff

Modified: trunk/Tools/ChangeLog (186654 => 186655)

--- trunk/Tools/ChangeLog	2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/ChangeLog	2015-07-10 00:20:31 UTC (rev 186655)
@@ -1,3 +1,21 @@
+2015-07-09  Michael Catanzaro  mcatanz...@igalia.com
+
+[GTK] pango should be included in the default jhbuild moduleset
+https://bugs.webkit.org/show_bug.cgi?id=146683
+
+Reviewed by Martin Robinson.
+
+Recent releases of pango 1.36 use functions that are only provided by fontconfig 2.12 when
+compiled against sufficiently-new versions of fontconfig. Since we depend on both pango and
+fontconfig, and pango depends on fontconfig, we must either add pango to our jhbuild
+moduleset or else upgrade fontconfig to a recent unstable release (knowing that we will have
+the same problem again the next time pango wants to use a new fontconfig feature), or remove
+fontconfig (which would make it hard to keep tests working). On the balance, adding pango is
+best.
+
+* gtk/jhbuild-optional.modules: Remove pango
+* gtk/jhbuild.modules: Add pango and update to latest 1.36.8
+
 2015-07-09  Devin Rousso  drou...@apple.com
 
 Unreviewed.  Added myself as a committer.


Modified: trunk/Tools/gtk/jhbuild-optional.modules (186654 => 186655)

--- trunk/Tools/gtk/jhbuild-optional.modules	2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/gtk/jhbuild-optional.modules	2015-07-10 00:20:31 UTC (rev 186655)
@@ -56,16 +56,4 @@
 /branch
   /autotools
 
-  autotools id=pango autogen-sh=configure
- autogenargs=--enable-cairo
-dependencies
-  dep package=cairo/
-  dep package=fontconfig/
-/dependencies
-branch module=/pub/GNOME/sources/pango/1.34/pango-1.34.0.tar.xz version=1.34.0
-repo=ftp.gnome.org
-hash=sha256:105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27
-/branch
-  /autotools
-
 /moduleset


Modified: trunk/Tools/gtk/jhbuild.modules (186654 => 186655)

--- trunk/Tools/gtk/jhbuild.modules	2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/gtk/jhbuild.modules	2015-07-10 00:20:31 UTC (rev 186655)
@@ -151,6 +151,7 @@
   dep package=cairo/
   dep package=at-spi2-atk/
   dep package=gdk-pixbuf/
+  dep package=pango/
 /dependencies
 branch module=/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz version=3.16.4
 repo=ftp.gnome.org
@@ -390,4 +391,19 @@
 branch repo=github.com module=EricssonResearch/openwebrtc.git checkoutdir=openwebrtc tag=13516c7f79a0c48bb411464f7613d4b426c70f5b/
   /autotools
 
+  !-- Dependencies listed below this point are not thought to affect test results, and are only
+   included because they themselves depend on other dependencies built by jhbuild. --
+
+  autotools id=pango autogen-sh=configure
+ autogenargs=--enable-cairo
+dependencies
+  dep package=cairo/
+  dep package=fontconfig/
+/dependencies
+branch module=/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz version=1.36.8
+repo=ftp.gnome.org
+hash=sha256:18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07
+/branch
+  /autotools
+
 /moduleset






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186656] tags/Safari-600.1.4.17.1/

[matthew_hanson]

Title: [186656] tags/Safari-600.1.4.17.1/








Revision 186656
Author matthew_han...@apple.com
Date 2015-07-09 17:27:14 -0700 (Thu, 09 Jul 2015)


Log Message
New Tag.

Added Paths

tags/Safari-600.1.4.17.1/




Diff

Property changes: tags/Safari-600.1.4.17.1



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

[webkit-changes] [186657] branches/safari-600.1.4.17-branch/Source

[matthew_hanson]

Title: [186657] branches/safari-600.1.4.17-branch/Source








Revision 186657
Author matthew_han...@apple.com
Date 2015-07-09 17:31:40 -0700 (Thu, 09 Jul 2015)


Log Message
Versioning.

Modified Paths

branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig (186656 => 186657)

--- branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:27:14 UTC (rev 186656)
+++ branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-07-10 00:31:40 UTC (rev 186657)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 17;
-NANO_VERSION = 1;
+NANO_VERSION = 2;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig (186656 => 186657)

--- branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:27:14 UTC (rev 186656)
+++ branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig	2015-07-10 00:31:40 UTC (rev 186657)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 17;
-NANO_VERSION = 1;
+NANO_VERSION = 2;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (186656 => 186657)

--- branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:27:14 UTC (rev 186656)
+++ branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-07-10 00:31:40 UTC (rev 186657)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 17;
-NANO_VERSION = 1;
+NANO_VERSION = 2;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig (186656 => 186657)

--- branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:27:14 UTC (rev 186656)
+++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-07-10 00:31:40 UTC (rev 186657)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 17;
-NANO_VERSION = 1;
+NANO_VERSION = 2;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig (186656 => 186657)

--- branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:27:14 UTC (rev 186656)
+++ branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-07-10 00:31:40 UTC (rev 186657)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 17;
-NANO_VERSION = 1;
+NANO_VERSION = 2;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.






___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes