[webkit-changes] [186896] trunk/Source/WebInspectorUI
Title: [186896] trunk/Source/WebInspectorUI Revision 186896 Author ago...@igalia.com Date 2015-07-16 10:26:55 -0700 (Thu, 16 Jul 2015) Log Message [GTK] Web Inspector: Add new composite record icon for the GTK+ port https://bugs.webkit.org/show_bug.cgi?id=146998 Reviewed by Martin Robinson. * UserInterface/Images/gtk/TimelineRecordComposite.svg: Added. New composite record icon. Modified Paths trunk/Source/WebInspectorUI/ChangeLog Added Paths trunk/Source/WebInspectorUI/UserInterface/Images/gtk/TimelineRecordComposite.svg Diff Modified: trunk/Source/WebInspectorUI/ChangeLog (186895 => 186896) --- trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 17:25:07 UTC (rev 186895) +++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 17:26:55 UTC (rev 186896) @@ -1,3 +1,13 @@ +2015-07-16 Andres Gomez ago...@igalia.com + +[GTK] Web Inspector: Add new composite record icon for the GTK+ port +https://bugs.webkit.org/show_bug.cgi?id=146998 + +Reviewed by Martin Robinson. + +* UserInterface/Images/gtk/TimelineRecordComposite.svg: Added. +New composite record icon. + 2015-07-15 Matt Baker mattba...@apple.com Web Inspector: Resizing TimelineRuler selection on both sides doesn't work with snapping enabled Added: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/TimelineRecordComposite.svg (0 => 186896) --- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/TimelineRecordComposite.svg (rev 0) +++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/TimelineRecordComposite.svg 2015-07-16 17:26:55 UTC (rev 186896) @@ -0,0 +1,27 @@ +?xml version=1.0 encoding=UTF-8? +!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -- +svg xmlns=http://www.w3.org/2000/svg version=1.1 viewBox=0 0 16 16 + defs + radialGradient id=b cx=301 cy=51.5 r=19.5 gradientUnits=userSpaceOnUse gradientTransform=matrix(.97063 1.9684e-8 0 .28611 -291.16 -14.63) + stop stop-color=#fff offset=0/ + stop stop-color=#fff stop-opacity=0 offset=1/ + /radialGradient + radialGradient id=a cx=24.446 cy=35.878 r=20.531 gradientUnits=userSpaceOnUse gradientTransform=matrix(.85696 3.2529e-7 -1.253e-7 .33010 -12.949 .77181) + stop stop-color=#fff offset=0/ + stop stop-color=#dcf6c2 offset=1/ + /radialGradient + linearGradient id=c x1=321.57 x2=311.65 y1=145.52 y2=118.5 gradientUnits=userSpaceOnUse gradientTransform=matrix(.55569 0 0 .55568 -169.27 -70.906) + stop stop-color=#4e9a06 offset=0/ + stop stop-color=#d3f4b2 offset=1/ + /linearGradient + linearGradient id=d x1=491.22 x2=491.22 y1=506.65 y2=732.05 gradientUnits=userSpaceOnUse gradientTransform=matrix(.093294 0 0 .093294 -35.871 -43.769) + stop stop-color=#4e9a06 offset=0/ + stop stop-color=#8ae234 offset=1/ + /linearGradient + /defs + rect width=15.004 height=15.003 x=.49815 y=.49833 fill=url(#a) fill-rule=evenodd stroke=url(#c) stroke-miterlimit=10 rx=1.5143 ry=1.5143 stroke-linejoin=bevel class=filled/ + rect width=12.997 height=13 x=1.5014 y=1.5016 fill=none stroke=#fff stroke-miterlimit=10 ry=.50810 stroke-linejoin=bevel rx=.50812 class=stroked/ + rect width=14 height=14 x=1.0017 y=1.0016 fill=url(#b) fill-rule=evenodd rx=1.9062 ry=1.9062 class=filled/ + path fill=#fff d=m8.7468 4.772c-2.707 0-4.5312 1.887-4.5312 4.3125 0 2.3868 1.7261 4.3438 4.4375 4.3438 0.77681 0 1.6598-0.16116 2.5312-0.53125l0.21875-0.09375a0.25002 0.25002 0 0 0 0.09375 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.03125 -0.09375l-0.46875-1.1562a0.25002 0.25002 0 0 0 0 -0.03125 0.25002 0.25002 0 0 0 -0.09375 -0.09375 0.25002 0.25002 0 0 0 -0.0625 -0.03125 0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.0625 0 0.25002 0.25002 0 0 0 -0.03125 0.03125l-0.1875 0.0625a0.25002 0.25002 0 0 0 -0.03125 0c-0.58568 0.23206-1.1595 0.34375-1.625 0.34375-0.88382 0-1.5432-0.24749-2-0.6875-0.45679-0.44001-0.71875-1.0822-0.71875-1.875 0-1.408 0.89423-2.5312 2.5-2.5312 0.36888 0 0.90663 0.00178 1.75 0.3125l0.21875 0.0625a0.25002 0.25002 0 0 0 0.0625 0 0.25002 0.25002 0 0 0 0.09375 0 0.25002 0.25002 0 0 0 0.125 -0.09375 0.25002 0.25002 0 0 0 0.03125 -0.03125l0.46875-1.125a0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 0 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.03125 -0.0625 0.25002 0.25002 0 0 0 -0.03125 -0.03125 0.25002 0.25002 0 0 0 -0.0625 -0.03125l-0.21875-0.0625c-0.871-0.3467-1.6578-0.4687-2.3112-0.4687z display=block class=filled/ + path fill=url(#d) d=m8.7986 3.7416c-2.707 0-4.5312 1.887-4.5312 4.3125 0 2.3868 1.7261 4.3438 4.4375 4.3438 0.77681 0 1.6598-0.16116 2.5312-0.53125l0.21875-0.09375a0.25002 0.25002 0 0 0 0.09375 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.0625 0.25002 0.25002 0 0 0 0.03125 -0.09375 0.25002 0.25002 0 0 0 -0.03125 -0.09375l-0.46875-1.1562a0.25002 0.25002 0 0 0 0 -0.03125 0.25002 0.25002 0 0 0 -0.09375
[webkit-changes] [186897] trunk/Source/WebKit2
Title: [186897] trunk/Source/WebKit2
Revision 186897
Author beid...@apple.com
Date 2015-07-16 10:39:05 -0700 (Thu, 16 Jul 2015)
Log Message
Review feedback followup for:
REGRESSION(r186088): Crash under WebKit::WebPageProxy::didFailLoadForFrame
rdar://problem/21692212 and https://bugs.webkit.org/show_bug.cgi?id=146988
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::refView): CFRetain instead of Obj-C retain.
(WebKit::PageClientImpl::derefView): CFRelease instead of Obj-C release.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186896 => 186897)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 17:26:55 UTC (rev 186896)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 17:39:05 UTC (rev 186897)
@@ -1,3 +1,14 @@
+2015-07-16 Brady Eidson beid...@apple.com
+
+Review feedback followup for:
+REGRESSION(r186088): Crash under WebKit::WebPageProxy::didFailLoadForFrame
+rdar://problem/21692212 and https://bugs.webkit.org/show_bug.cgi?id=146988
+
+* UIProcess/mac/PageClientImpl.mm:
+(WebKit::PageClientImpl::refView): CFRetain instead of Obj-C retain.
+(WebKit::PageClientImpl::derefView): CFRelease instead of Obj-C release.
+
+
2015-07-16 Michael Catanzaro mcatanz...@igalia.com
[Linux] Seccomp: fix -Wmismatched-tags
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (186896 => 186897)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-07-16 17:26:55 UTC (rev 186896)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-07-16 17:39:05 UTC (rev 186897)
@@ -838,12 +838,12 @@
void PageClientImpl::refView()
{
-[m_wkView retain];
+CFRetain(m_wkView);
}
void PageClientImpl::derefView()
{
-[m_wkView release];
+CFRelease(m_wkView);
}
} // namespace WebKit
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186898] trunk/Source/WebKit/win
Title: [186898] trunk/Source/WebKit/win
Revision 186898
Author bfulg...@apple.com
Date 2015-07-16 10:42:05 -0700 (Thu, 16 Jul 2015)
Log Message
[Win] Gross workaround to fix build after r186858.
* WebView.cpp:
(WebView::unused5): Force export of WebCore symbol through
WebKit.dll.
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebView.cpp
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (186897 => 186898)
--- trunk/Source/WebKit/win/ChangeLog 2015-07-16 17:39:05 UTC (rev 186897)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-16 17:42:05 UTC (rev 186898)
@@ -1,3 +1,11 @@
+2015-07-16 Brent Fulgham bfulg...@apple.com
+
+[Win] Gross workaround to fix build after r186858.
+
+* WebView.cpp:
+(WebView::unused5): Force export of WebCore symbol through
+WebKit.dll.
+
2015-07-15 Brent Fulgham bfulg...@apple.com
[Win] Maintain consistent COM Interfaces
Modified: trunk/Source/WebKit/win/WebView.cpp (186897 => 186898)
--- trunk/Source/WebKit/win/WebView.cpp 2015-07-16 17:39:05 UTC (rev 186897)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-07-16 17:42:05 UTC (rev 186898)
@@ -130,6 +130,7 @@
#include WebCore/PageCache.h
#include WebCore/PageConfiguration.h
#include WebCore/PageGroup.h
+#include WebCore/PathUtilities.h
#include WebCore/PlatformKeyboardEvent.h
#include WebCore/PlatformMouseEvent.h
#include WebCore/PlatformWheelEvent.h
@@ -6680,6 +6681,11 @@
HRESULT WebView::unused5()
{
ASSERT_NOT_REACHED();
+
+// The following line works around a linker issue in MSVC. unused5 should never be called,
+// and this code does nothing more than force the symbol to be included in WebKit dll.
+(void)WebCore::PathUtilities::pathWithShrinkWrappedRects(VectorFloatRect(), 0);
+
return E_FAIL;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186899] trunk/Source/WebKit
Title: [186899] trunk/Source/WebKit Revision 186899 Author bfulg...@apple.com Date 2015-07-16 10:52:05 -0700 (Thu, 16 Jul 2015) Log Message [Win] Unreviewed gardening. * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Move file into the appropriate category in the project. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters Diff Modified: trunk/Source/WebKit/ChangeLog (186898 => 186899) --- trunk/Source/WebKit/ChangeLog 2015-07-16 17:42:05 UTC (rev 186898) +++ trunk/Source/WebKit/ChangeLog 2015-07-16 17:52:05 UTC (rev 186899) @@ -1,3 +1,10 @@ +2015-07-16 Brent Fulgham bfulg...@apple.com + +[Win] Unreviewed gardening. + +* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Move file into the +appropriate category in the project. + 2015-07-14 Lucas Forschler lforsch...@apple.com Teach platformMac.cmake about El Capitan WKSI. Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (186898 => 186899) --- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2015-07-16 17:42:05 UTC (rev 186898) +++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2015-07-16 17:52:05 UTC (rev 186899) @@ -296,7 +296,6 @@ ClCompile Include=..\..\win\WebCoreSupport\AcceleratedCompositingContext.cpp FilterWebCoreSupport/Filter /ClCompile -ClCompile Include=..\..\win\WebCoreSupport\WebVisitedLinkStore.cpp / ClCompile Include=..\..\win\WebApplicationCache.cpp FilterSources/Filter /ClCompile @@ -339,6 +338,9 @@ ClCompile Include=..\..\WebCoreSupport\WebViewGroup.cpp FilterSources/Filter /ClCompile +ClCompile Include=..\..\win\WebCoreSupport\WebVisitedLinkStore.cpp + FilterWebCoreSupport/Filter +/ClCompile /ItemGroup ItemGroup ClInclude Include=..\..\win\WebCoreSupport\EmbeddedWidget.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186919] trunk/Source
Title: [186919] trunk/Source
Revision 186919
Author commit-qu...@webkit.org
Date 2015-07-16 17:29:03 -0700 (Thu, 16 Jul 2015)
Log Message
Web Inspector: [Mac] Save dialog not working when inspector is docked
https://bugs.webkit.org/show_bug.cgi?id=146991
Patch by Joseph Pecoraro pecor...@apple.com on 2015-07-16
Reviewed by Sam Weinig.
Source/WebKit/mac:
* WebCoreSupport/WebInspectorClient.mm:
(WebInspectorFrontendClient::save):
(-[WebInspectorWindowController webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:]):
When the window is nil (docked) use a non-window version of running the dialog.
Source/WebKit2:
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::runOpenPanel):
(WebKit::WebInspectorProxy::platformSave):
When the window is nil (docked) use a non-window version of running the dialog.
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (186918 => 186919)
--- trunk/Source/WebKit/mac/ChangeLog 2015-07-16 23:36:13 UTC (rev 186918)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-17 00:29:03 UTC (rev 186919)
@@ -1,3 +1,15 @@
+2015-07-16 Joseph Pecoraro pecor...@apple.com
+
+Web Inspector: [Mac] Save dialog not working when inspector is docked
+https://bugs.webkit.org/show_bug.cgi?id=146991
+
+Reviewed by Sam Weinig.
+
+* WebCoreSupport/WebInspectorClient.mm:
+(WebInspectorFrontendClient::save):
+(-[WebInspectorWindowController webView:runOpenPanelForFileButtonWithResultListener:allowMultipleFiles:]):
+When the window is nil (docked) use a non-window version of running the dialog.
+
2015-07-13 Simon Fraser simon.fra...@apple.com
[iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm (186918 => 186919)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-07-16 23:36:13 UTC (rev 186918)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebInspectorClient.mm 2015-07-17 00:29:03 UTC (rev 186919)
@@ -347,12 +347,18 @@
panel.nameFieldStringValue = platformURL.lastPathComponent;
panel.directoryURL = [platformURL URLByDeletingLastPathComponent];
-[panel beginSheetModalForWindow:[[m_windowController webView] window] completionHandler:^(NSInteger result) {
+auto completionHandler = ^(NSInteger result) {
if (result == NSFileHandlingPanelCancelButton)
return;
ASSERT(result == NSFileHandlingPanelOKButton);
saveToURL(panel.URL);
-}];
+};
+
+NSWindow *window = [[m_windowController webView] window];
+if (window)
+[panel beginSheetModalForWindow:window completionHandler:completionHandler];
+else
+completionHandler([panel runModal]);
}
void WebInspectorFrontendClient::append(const String suggestedURL, const String content)
@@ -704,7 +710,7 @@
panel.canChooseFiles = YES;
panel.allowsMultipleSelection = allowMultipleFiles;
-[panel beginSheetModalForWindow:_webView.window completionHandler:^(NSInteger result) {
+auto completionHandler = ^(NSInteger result) {
if (result == NSFileHandlingPanelCancelButton) {
[resultListener cancel];
return;
@@ -713,11 +719,16 @@
NSArray *URLs = panel.URLs;
NSMutableArray *filenames = [NSMutableArray arrayWithCapacity:URLs.count];
-for (NSURL *URL in URLs) {
+for (NSURL *URL in URLs)
[filenames addObject:URL.path];
-}
+
[resultListener chooseFilenames:filenames];
-}];
+};
+
+if (_webView.window)
+[panel beginSheetModalForWindow:_webView.window completionHandler:completionHandler];
+else
+completionHandler([panel runModal]);
}
- (void)webView:(WebView *)sender frame:(WebFrame *)frame exceededDatabaseQuotaForSecurityOrigin:(WebSecurityOrigin *)origin database:(NSString *)databaseIdentifier
Modified: trunk/Source/WebKit2/ChangeLog (186918 => 186919)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 23:36:13 UTC (rev 186918)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-17 00:29:03 UTC (rev 186919)
@@ -1,3 +1,15 @@
+2015-07-16 Joseph Pecoraro pecor...@apple.com
+
+Web Inspector: [Mac] Save dialog not working when inspector is docked
+https://bugs.webkit.org/show_bug.cgi?id=146991
+
+Reviewed by Sam Weinig.
+
+* UIProcess/mac/WebInspectorProxyMac.mm:
+(WebKit::runOpenPanel):
+(WebKit::WebInspectorProxy::platformSave):
+When the window is nil (docked) use a non-window version of running the dialog.
+
2015-07-16 Tim Horton timothy_hor...@apple.com
Add shrink-wrapped link highlights
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (186918 => 186919)
[webkit-changes] [186889] trunk/Source/WebKit2
Title: [186889] trunk/Source/WebKit2
Revision 186889
Author carlo...@webkit.org
Date 2015-07-15 23:04:48 -0700 (Wed, 15 Jul 2015)
Log Message
Unreviewed. Follow up to r186887 for GTK+.
Add GTK+ implementation of PageClientImpl::refView/derefView.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::refView):
(WebKit::PageClientImpl::derefView):
* UIProcess/API/gtk/PageClientImpl.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186888 => 186889)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 05:31:55 UTC (rev 186888)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 06:04:48 UTC (rev 186889)
@@ -1,5 +1,16 @@
2015-07-15 Carlos Garcia Campos cgar...@igalia.com
+Unreviewed. Follow up to r186887 for GTK+.
+
+Add GTK+ implementation of PageClientImpl::refView/derefView.
+
+* UIProcess/API/gtk/PageClientImpl.cpp:
+(WebKit::PageClientImpl::refView):
+(WebKit::PageClientImpl::derefView):
+* UIProcess/API/gtk/PageClientImpl.h:
+
+2015-07-15 Carlos Garcia Campos cgar...@igalia.com
+
[GTK] Input method filter is always enabled when the view is focused
https://bugs.webkit.org/show_bug.cgi?id=146965
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (186888 => 186889)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-07-16 05:31:55 UTC (rev 186888)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-07-16 06:04:48 UTC (rev 186889)
@@ -431,4 +431,14 @@
{
}
+void PageClientImpl::refView()
+{
+g_object_ref(m_viewWidget);
+}
+
+void PageClientImpl::derefView()
+{
+g_object_unref(m_viewWidget);
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (186888 => 186889)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-07-16 05:31:55 UTC (rev 186888)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-07-16 06:04:48 UTC (rev 186889)
@@ -135,8 +135,8 @@
virtual void didChangeBackgroundColor() override;
-virtual void refView() override { };
-virtual void derefView() override { };
+virtual void refView() override;
+virtual void derefView() override;
// Members of PageClientImpl class
GtkWidget* m_viewWidget;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186890] trunk/Source/WebCore
Title: [186890] trunk/Source/WebCore
Revision 186890
Author timothy_hor...@apple.com
Date 2015-07-15 23:36:53 -0700 (Wed, 15 Jul 2015)
Log Message
Move indicator rect uniting code to TextIndicatorWindow instead of TextIndicator
https://bugs.webkit.org/show_bug.cgi?id=146992
rdar://problem/21643094
Reviewed by Daniel Bates.
Having to unite all the rects if any overlap is an implementation
detail of the Mac TextIndicatorWindow presentation, not a fundamental
property of TextIndicator.
Other TextIndicator presentations might be able to handle overlapping
rects more effectively, so we shouldn't lose information unless we need to.
This also avoids having a second copy of some constants!
* page/TextIndicator.cpp:
(WebCore::outsetIndicatorRectIncludingShadow): Deleted.
(WebCore::textIndicatorsForTextRectsOverlap): Deleted.
(WebCore::TextIndicator::TextIndicator): Deleted.
* page/mac/TextIndicatorWindow.mm:
(outsetIndicatorRectIncludingShadow):
(textIndicatorsForTextRectsOverlap):
(-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/TextIndicator.cpp
trunk/Source/WebCore/page/mac/TextIndicatorWindow.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (186889 => 186890)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 06:04:48 UTC (rev 186889)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 06:36:53 UTC (rev 186890)
@@ -1,3 +1,29 @@
+2015-07-15 Tim Horton timothy_hor...@apple.com
+
+Move indicator rect uniting code to TextIndicatorWindow instead of TextIndicator
+https://bugs.webkit.org/show_bug.cgi?id=146992
+rdar://problem/21643094
+
+Reviewed by Daniel Bates.
+
+Having to unite all the rects if any overlap is an implementation
+detail of the Mac TextIndicatorWindow presentation, not a fundamental
+property of TextIndicator.
+
+Other TextIndicator presentations might be able to handle overlapping
+rects more effectively, so we shouldn't lose information unless we need to.
+
+This also avoids having a second copy of some constants!
+
+* page/TextIndicator.cpp:
+(WebCore::outsetIndicatorRectIncludingShadow): Deleted.
+(WebCore::textIndicatorsForTextRectsOverlap): Deleted.
+(WebCore::TextIndicator::TextIndicator): Deleted.
+* page/mac/TextIndicatorWindow.mm:
+(outsetIndicatorRectIncludingShadow):
+(textIndicatorsForTextRectsOverlap):
+(-[WebTextIndicatorView initWithFrame:textIndicator:margin:offset:]):
+
2015-07-15 Ryuan Choi ryuan.c...@navercorp.com
[CoordinatedGraphics] Remove setContentsScale from TiledBackingStore
Modified: trunk/Source/WebCore/page/TextIndicator.cpp (186889 => 186890)
--- trunk/Source/WebCore/page/TextIndicator.cpp 2015-07-16 06:04:48 UTC (rev 186889)
+++ trunk/Source/WebCore/page/TextIndicator.cpp 2015-07-16 06:36:53 UTC (rev 186890)
@@ -40,52 +40,8 @@
using namespace WebCore;
-// These should match the values in TextIndicatorWindow.
-// FIXME: Ideally these would only be in one place.
-#if ENABLE(LEGACY_TEXT_INDICATOR_STYLE)
-const float horizontalBorder = 3;
-const float verticalBorder = 1;
-const float dropShadowBlurRadius = 1.5;
-#else
-const float horizontalBorder = 2;
-const float verticalBorder = 1;
-const float dropShadowBlurRadius = 12;
-#endif
-
namespace WebCore {
-static FloatRect outsetIndicatorRectIncludingShadow(const FloatRect rect)
-{
-FloatRect outsetRect = rect;
-outsetRect.inflateX(dropShadowBlurRadius + horizontalBorder);
-outsetRect.inflateY(dropShadowBlurRadius + verticalBorder);
-return outsetRect;
-}
-
-static bool textIndicatorsForTextRectsOverlap(const VectorFloatRect textRects)
-{
-size_t count = textRects.size();
-if (count = 1)
-return false;
-
-VectorFloatRect indicatorRects;
-indicatorRects.reserveInitialCapacity(count);
-
-for (size_t i = 0; i count; ++i) {
-FloatRect indicatorRect = outsetIndicatorRectIncludingShadow(textRects[i]);
-
-for (size_t j = indicatorRects.size(); j; ) {
---j;
-if (indicatorRect.intersects(indicatorRects[j]))
-return true;
-}
-
-indicatorRects.uncheckedAppend(indicatorRect);
-}
-
-return false;
-}
-
RefTextIndicator TextIndicator::create(const TextIndicatorData data)
{
return adoptRef(*new TextIndicator(data));
@@ -189,11 +145,6 @@
: m_data(data)
{
ASSERT(m_data.contentImageScaleFactor != 1 || m_data.contentImage-size() == enclosingIntRect(m_data.selectionRectInRootViewCoordinates).size());
-
-if (textIndicatorsForTextRectsOverlap(m_data.textRectsInBoundingRectCoordinates)) {
-m_data.textRectsInBoundingRectCoordinates[0] = unionRect(m_data.textRectsInBoundingRectCoordinates);
-m_data.textRectsInBoundingRectCoordinates.shrink(1);
-}
}
TextIndicator::~TextIndicator()
Modified:
[webkit-changes] [186892] trunk/Source/WebKit2
Title: [186892] trunk/Source/WebKit2
Revision 186892
Author carlo...@webkit.org
Date 2015-07-16 03:29:51 -0700 (Thu, 16 Jul 2015)
Log Message
REGRESSION(r185415): [GTK] Browsers crash when an input method is enabled
https://bugs.webkit.org/show_bug.cgi?id=146639
Reviewed by Žan Doberšek.
In r185415 I assumed that preedit signals were always emitted
after a keypress was handled by the WebView. However, some input
methods handle the keyboard events before the WebView, and preedit
signals are emitted but no key event has been handled by the
WebView. So, instead of asserting when filter key event completion
handler is nullptr, we should check whether the current event was
generated for a WebView filter request or not. In case the
completion handler is nullptr, we send the event directly to the
page, instead of going through the WebView, since there won't be
editing commands for those events anyway.
* UIProcess/gtk/InputMethodFilter.cpp:
(WebKit::InputMethodFilter::handleKeyboardEvent):
(WebKit::InputMethodFilter::handleKeyboardEventWithCompositionResults):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186891 => 186892)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 08:57:12 UTC (rev 186891)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 10:29:51 UTC (rev 186892)
@@ -1,3 +1,25 @@
+2015-07-16 Carlos Garcia Campos cgar...@igalia.com
+
+REGRESSION(r185415): [GTK] Browsers crash when an input method is enabled
+https://bugs.webkit.org/show_bug.cgi?id=146639
+
+Reviewed by Žan Doberšek.
+
+In r185415 I assumed that preedit signals were always emitted
+after a keypress was handled by the WebView. However, some input
+methods handle the keyboard events before the WebView, and preedit
+signals are emitted but no key event has been handled by the
+WebView. So, instead of asserting when filter key event completion
+handler is nullptr, we should check whether the current event was
+generated for a WebView filter request or not. In case the
+completion handler is nullptr, we send the event directly to the
+page, instead of going through the WebView, since there won't be
+editing commands for those events anyway.
+
+* UIProcess/gtk/InputMethodFilter.cpp:
+(WebKit::InputMethodFilter::handleKeyboardEvent):
+(WebKit::InputMethodFilter::handleKeyboardEventWithCompositionResults):
+
2015-07-15 Carlos Garcia Campos cgar...@igalia.com
Unreviewed. Follow up to r186887 for GTK+.
Modified: trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp (186891 => 186892)
--- trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp 2015-07-16 08:57:12 UTC (rev 186891)
+++ trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp 2015-07-16 10:29:51 UTC (rev 186892)
@@ -20,6 +20,7 @@
#include config.h
#include InputMethodFilter.h
+#include NativeWebKeyboardEvent.h
#include WebPageProxy.h
#include WebCore/Color.h
#include WebCore/CompositionResults.h
@@ -127,9 +128,11 @@
}
#endif
-ASSERT(m_filterKeyEventCompletionHandler);
-m_filterKeyEventCompletionHandler(CompositionResults(simpleString), faked);
-m_filterKeyEventCompletionHandler = nullptr;
+if (m_filterKeyEventCompletionHandler) {
+m_filterKeyEventCompletionHandler(CompositionResults(simpleString), faked);
+m_filterKeyEventCompletionHandler = nullptr;
+} else
+m_page-handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_castGdkEvent*(event), CompositionResults(simpleString), faked, VectorString()));
}
void InputMethodFilter::handleKeyboardEventWithCompositionResults(GdkEventKey* event, ResultsToSend resultsToSend, EventFakedForComposition faked)
@@ -141,10 +144,11 @@
}
#endif
-ASSERT(m_filterKeyEventCompletionHandler);
-m_filterKeyEventCompletionHandler(CompositionResults(CompositionResults::WillSendCompositionResultsSoon), faked);
-m_filterKeyEventCompletionHandler = nullptr;
-
+if (m_filterKeyEventCompletionHandler) {
+m_filterKeyEventCompletionHandler(CompositionResults(CompositionResults::WillSendCompositionResultsSoon), faked);
+m_filterKeyEventCompletionHandler = nullptr;
+} else
+m_page-handleKeyboardEvent(NativeWebKeyboardEvent(reinterpret_castGdkEvent*(event), CompositionResults(CompositionResults::WillSendCompositionResultsSoon), faked, VectorString()));
if (resultsToSend Composition !m_confirmedComposition.isNull())
m_page-confirmComposition(m_confirmedComposition, -1, 0);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186891] trunk
Title: [186891] trunk
Revision 186891
Author commit-qu...@webkit.org
Date 2015-07-16 01:57:12 -0700 (Thu, 16 Jul 2015)
Log Message
Web Inspector: update $$() to return an Array
https://bugs.webkit.org/show_bug.cgi?id=146964
Patch by Joseph Pecoraro pecor...@apple.com on 2015-07-16
Reviewed by Brian Burg.
Source/WebCore:
Test: inspector/console/command-line-api.html
* inspector/CommandLineAPIModuleSource.js:
Update $$(...) to return an array.
Also InjectedScriptHost.type was renamed to subtype
a while ago.
LayoutTests:
* inspector/console/command-line-api-expected.txt: Added.
* inspector/console/command-line-api.html: Added.
Add back a command line api test.
* platform/efl/inspector/console/command-line-api-expected.txt: Removed.
* platform/mac/inspector/console/command-line-api-expected.txt: Removed.
Remove old platform expected results for the old version of this test.
* platform/win/TestExpectations:
Speculatively skipping on Windows since other inspector/console tests are skipped.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/CommandLineAPIModuleSource.js
Added Paths
trunk/LayoutTests/inspector/console/command-line-api-expected.txt
trunk/LayoutTests/inspector/console/command-line-api.html
Removed Paths
trunk/LayoutTests/platform/efl/inspector/console/
trunk/LayoutTests/platform/mac/inspector/console/
Diff
Modified: trunk/LayoutTests/ChangeLog (186890 => 186891)
--- trunk/LayoutTests/ChangeLog 2015-07-16 06:36:53 UTC (rev 186890)
+++ trunk/LayoutTests/ChangeLog 2015-07-16 08:57:12 UTC (rev 186891)
@@ -1,3 +1,21 @@
+2015-07-16 Joseph Pecoraro pecor...@apple.com
+
+Web Inspector: update $$() to return an Array
+https://bugs.webkit.org/show_bug.cgi?id=146964
+
+Reviewed by Brian Burg.
+
+* inspector/console/command-line-api-expected.txt: Added.
+* inspector/console/command-line-api.html: Added.
+Add back a command line api test.
+
+* platform/efl/inspector/console/command-line-api-expected.txt: Removed.
+* platform/mac/inspector/console/command-line-api-expected.txt: Removed.
+Remove old platform expected results for the old version of this test.
+
+* platform/win/TestExpectations:
+Speculatively skipping on Windows since other inspector/console tests are skipped.
+
2015-07-15 Dean Jackson d...@apple.com
Tag WebGL layers with sRGB colorspace
Added: trunk/LayoutTests/inspector/console/command-line-api-expected.txt (0 => 186891)
--- trunk/LayoutTests/inspector/console/command-line-api-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2015-07-16 08:57:12 UTC (rev 186891)
@@ -0,0 +1,35 @@
+CONSOLE MESSAGE: line 27: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
+Tests that command line api works.
+
+
+STEP: String(keys([3,4]))
+0,1
+
+STEP: String(values([3,4]))
+3,4
+
+STEP: String($0)
+[object HTMLParagraphElement]
+
+STEP: String($('foo'))
+CONSOLE: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $(#%s)
+null
+
+STEP: String($('#foo'))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', document.body))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', 'non-node'))
+[object HTMLParagraphElement]
+
+STEP: String($('#foo', $('#bar')))
+null
+
+STEP: String($$('p'))
+[object HTMLParagraphElement],[object HTMLParagraphElement]
+
+STEP: String($$('p', document.body))
+[object HTMLParagraphElement],[object HTMLParagraphElement]
+
Added: trunk/LayoutTests/inspector/console/command-line-api.html (0 => 186891)
--- trunk/LayoutTests/inspector/console/command-line-api.html (rev 0)
+++ trunk/LayoutTests/inspector/console/command-line-api.html 2015-07-16 08:57:12 UTC (rev 186891)
@@ -0,0 +1,66 @@
+!doctype html
+html
+head
+script src=""
+script
+function test()
+{
+var currentStepIndex = 0;
+var steps = [
+String(keys([3,4])),
+String(values([3,4])),
+String($0),
+String($('foo')),
+String($('#foo')),
+String($('#foo', document.body)),
+String($('#foo', 'non-node')),
+String($('#foo', $('#bar'))),
+String($$('p')),
+String($$('p', document.body)),
+];
+
+var consoleMessage = null;
+
+function runSteps()
+{
+for (var step of steps) {
+WebInspector.runtimeManager.evaluateInInspectedWindow(step, test, true, true, false, false, false, function(result, wasThrown) {
+InspectorTest.log(\nSTEP: + steps[currentStepIndex]);
+if (consoleMessage) {
+InspectorTest.log(CONSOLE: + consoleMessage.messageText);
+consoleMessage = null;
+}
+
[webkit-changes] [186893] trunk/Source/WebKit2
Title: [186893] trunk/Source/WebKit2
Revision 186893
Author mcatanz...@igalia.com
Date 2015-07-16 08:34:03 -0700 (Thu, 16 Jul 2015)
Log Message
[Linux] Seccomp: fix -Wmismatched-tags
https://bugs.webkit.org/show_bug.cgi?id=146990
Reviewed by Žan Doberšek.
WebProcessCreationParameters is a struct nowadays, not a class, so declare it appropriately.
* Shared/linux/SeccompFilters/SyscallPolicy.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186892 => 186893)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 10:29:51 UTC (rev 186892)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 15:34:03 UTC (rev 186893)
@@ -1,3 +1,14 @@
+2015-07-16 Michael Catanzaro mcatanz...@igalia.com
+
+[Linux] Seccomp: fix -Wmismatched-tags
+https://bugs.webkit.org/show_bug.cgi?id=146990
+
+Reviewed by Žan Doberšek.
+
+WebProcessCreationParameters is a struct nowadays, not a class, so declare it appropriately.
+
+* Shared/linux/SeccompFilters/SyscallPolicy.h:
+
2015-07-16 Carlos Garcia Campos cgar...@igalia.com
REGRESSION(r185415): [GTK] Browsers crash when an input method is enabled
Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.h (186892 => 186893)
--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.h 2015-07-16 10:29:51 UTC (rev 186892)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SyscallPolicy.h 2015-07-16 15:34:03 UTC (rev 186893)
@@ -34,7 +34,7 @@
namespace WebKit {
-class WebProcessCreationParameters;
+struct WebProcessCreationParameters;
class SyscallPolicy {
public:
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186894] trunk/Source/WebCore
Title: [186894] trunk/Source/WebCore
Revision 186894
Author ander...@apple.com
Date 2015-07-16 10:21:40 -0700 (Thu, 16 Jul 2015)
Log Message
Headers that use WEBCORE_EXPORT should include PlatformExportMacros.h
https://bugs.webkit.org/show_bug.cgi?id=146984
Reviewed by Daniel Bates.
* contentextensions/DFA.h:
* dom/ContextDestructionObserver.h:
* dom/DeviceOrientationData.h:
* dom/ExceptionCodePlaceholder.h:
* editing/cocoa/HTMLConverter.h:
* html/track/AudioTrack.h:
* loader/FrameLoaderStateMachine.h:
* loader/appcache/ApplicationCacheHost.h:
* loader/cache/CachedResourceHandle.h:
* platform/URL.h:
* platform/animation/Animation.h:
* platform/audio/AudioHardwareListener.h:
* platform/audio/AudioSession.h:
* platform/graphics/transforms/AffineTransform.h:
* platform/network/Credential.h:
* platform/network/CredentialBase.h:
* platform/network/ResourceHandleClient.h:
* platform/network/mac/AuthenticationMac.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/contentextensions/DFA.h
trunk/Source/WebCore/dom/ContextDestructionObserver.h
trunk/Source/WebCore/dom/DeviceOrientationData.h
trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h
trunk/Source/WebCore/editing/cocoa/HTMLConverter.h
trunk/Source/WebCore/html/track/AudioTrack.h
trunk/Source/WebCore/loader/FrameLoaderStateMachine.h
trunk/Source/WebCore/loader/appcache/ApplicationCacheHost.h
trunk/Source/WebCore/loader/cache/CachedResourceHandle.h
trunk/Source/WebCore/platform/URL.h
trunk/Source/WebCore/platform/animation/Animation.h
trunk/Source/WebCore/platform/audio/AudioHardwareListener.h
trunk/Source/WebCore/platform/audio/AudioSession.h
trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h
trunk/Source/WebCore/platform/network/Credential.h
trunk/Source/WebCore/platform/network/CredentialBase.h
trunk/Source/WebCore/platform/network/ResourceHandleClient.h
trunk/Source/WebCore/platform/network/mac/AuthenticationMac.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (186893 => 186894)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 15:34:03 UTC (rev 186893)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 17:21:40 UTC (rev 186894)
@@ -1,3 +1,29 @@
+2015-07-15 Anders Carlsson ander...@apple.com
+
+Headers that use WEBCORE_EXPORT should include PlatformExportMacros.h
+https://bugs.webkit.org/show_bug.cgi?id=146984
+
+Reviewed by Daniel Bates.
+
+* contentextensions/DFA.h:
+* dom/ContextDestructionObserver.h:
+* dom/DeviceOrientationData.h:
+* dom/ExceptionCodePlaceholder.h:
+* editing/cocoa/HTMLConverter.h:
+* html/track/AudioTrack.h:
+* loader/FrameLoaderStateMachine.h:
+* loader/appcache/ApplicationCacheHost.h:
+* loader/cache/CachedResourceHandle.h:
+* platform/URL.h:
+* platform/animation/Animation.h:
+* platform/audio/AudioHardwareListener.h:
+* platform/audio/AudioSession.h:
+* platform/graphics/transforms/AffineTransform.h:
+* platform/network/Credential.h:
+* platform/network/CredentialBase.h:
+* platform/network/ResourceHandleClient.h:
+* platform/network/mac/AuthenticationMac.h:
+
2015-07-16 Joseph Pecoraro pecor...@apple.com
Web Inspector: update $$() to return an Array
Modified: trunk/Source/WebCore/contentextensions/DFA.h (186893 => 186894)
--- trunk/Source/WebCore/contentextensions/DFA.h 2015-07-16 15:34:03 UTC (rev 186893)
+++ trunk/Source/WebCore/contentextensions/DFA.h 2015-07-16 17:21:40 UTC (rev 186894)
@@ -30,6 +30,7 @@
#include ContentExtensionsDebugging.h
#include DFANode.h
+#include PlatformExportMacros.h
#include wtf/Vector.h
namespace WebCore {
Modified: trunk/Source/WebCore/dom/ContextDestructionObserver.h (186893 => 186894)
--- trunk/Source/WebCore/dom/ContextDestructionObserver.h 2015-07-16 15:34:03 UTC (rev 186893)
+++ trunk/Source/WebCore/dom/ContextDestructionObserver.h 2015-07-16 17:21:40 UTC (rev 186894)
@@ -27,6 +27,8 @@
#ifndef ContextDestructionObserver_h
#define ContextDestructionObserver_h
+#include PlatformExportMacros.h
+
namespace WebCore {
class ScriptExecutionContext;
Modified: trunk/Source/WebCore/dom/DeviceOrientationData.h (186893 => 186894)
--- trunk/Source/WebCore/dom/DeviceOrientationData.h 2015-07-16 15:34:03 UTC (rev 186893)
+++ trunk/Source/WebCore/dom/DeviceOrientationData.h 2015-07-16 17:21:40 UTC (rev 186894)
@@ -26,6 +26,7 @@
#ifndef DeviceOrientationData_h
#define DeviceOrientationData_h
+#include PlatformExportMacros.h
#include wtf/Ref.h
#include wtf/RefCounted.h
Modified: trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h (186893 => 186894)
--- trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h 2015-07-16 15:34:03 UTC (rev 186893)
+++ trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h 2015-07-16 17:21:40 UTC (rev 186894)
@@ -31,6 +31,7 @@
#ifndef ExceptionCodePlaceholder_h
#define ExceptionCodePlaceholder_h
+#include
[webkit-changes] [186895] trunk/Source/WebCore
Title: [186895] trunk/Source/WebCore
Revision 186895
Author beid...@apple.com
Date 2015-07-16 10:25:07 -0700 (Thu, 16 Jul 2015)
Log Message
WebKit document.cookie mis-parsing.
rdar://problem/21715050 and https://bugs.webkit.org/show_bug.cgi?id=146976
Reviewed by Sam Weinig.
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::createCookies): Use new SPI if available.
(WebCore::setCookiesFromDOM):
* platform/spi/cf/CFNetworkSPI.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (186894 => 186895)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 17:21:40 UTC (rev 186894)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 17:25:07 UTC (rev 186895)
@@ -1,3 +1,15 @@
+2015-07-16 Brady Eidson beid...@apple.com
+
+WebKit document.cookie mis-parsing.
+rdar://problem/21715050 and https://bugs.webkit.org/show_bug.cgi?id=146976
+
+Reviewed by Sam Weinig.
+
+* platform/network/cf/CookieJarCFNet.cpp:
+(WebCore::createCookies): Use new SPI if available.
+(WebCore::setCookiesFromDOM):
+* platform/spi/cf/CFNetworkSPI.h:
+
2015-07-15 Anders Carlsson ander...@apple.com
Headers that use WEBCORE_EXPORT should include PlatformExportMacros.h
Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (186894 => 186895)
--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-16 17:21:40 UTC (rev 186894)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-16 17:25:07 UTC (rev 186895)
@@ -28,6 +28,7 @@
#if USE(CFNETWORK)
+#include CFNetworkSPI.h
#include Cookie.h
#include URL.h
#include NetworkStorageSession.h
@@ -112,6 +113,15 @@
#endif
}
+static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
+{
+#if (PLATFORM(IOS) __IPHONE_OS_VERSION_MIN_REQUIRED = 9)
+return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
+#else
+return CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
+#endif
+}
+
void setCookiesFromDOM(const NetworkStorageSession session, const URL firstParty, const URL url, const String value)
{
// rdar://problem/5632883 CFHTTPCookieStorage stores an empty cookie, which would be sent as Cookie: =.
@@ -130,10 +140,8 @@
(const void**)s_setCookieKeyCF, (const void**)cookieStringCF, 1,
kCFTypeDictionaryKeyCallBacks, kCFTypeDictionaryValueCallBacks));
-RetainPtrCFArrayRef cookiesCF = adoptCF(CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault,
-headerFieldsCF.get(), urlCF.get()));
-
-CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(cookiesCF.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
+RetainPtrCFArrayRef unfilteredCookies = adoptCF(createCookies(headerFieldsCF.get(), urlCF.get()));
+CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(unfilteredCookies.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
}
String cookiesForDOM(const NetworkStorageSession session, const URL firstParty, const URL url)
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (186894 => 186895)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-16 17:21:40 UTC (rev 186894)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-16 17:25:07 UTC (rev 186895)
@@ -31,6 +31,7 @@
#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
#include CFNetwork/CFHTTPCookies.h
+#include CFNetwork/CFHTTPCookiesPriv.h
#include CFNetwork/CFURLCachePriv.h
#include CFNetwork/CFURLProtocolPriv.h
#include CFNetwork/CFURLRequest.h
@@ -123,6 +124,7 @@
#if (TARGET_OS_IPHONE __IPHONE_OS_VERSION_MIN_REQUIRED = 9) || (PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100)
EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
+EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
#endif
#if defined(__OBJC__)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186900] trunk/LayoutTests
Title: [186900] trunk/LayoutTests Revision 186900 Author ddkil...@apple.com Date 2015-07-16 11:23:26 -0700 (Thu, 16 Jul 2015) Log Message Mark fast/canvas/canvas-too-large-to-draw.html as crashing on El Capitan Fix is tracked by rdar://problem/21857102. * platform/mac/TestExpectations: Mark test as crashing: - fast/canvas/canvas-too-large-to-draw.html Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations Diff Modified: trunk/LayoutTests/ChangeLog (186899 => 186900) --- trunk/LayoutTests/ChangeLog 2015-07-16 17:52:05 UTC (rev 186899) +++ trunk/LayoutTests/ChangeLog 2015-07-16 18:23:26 UTC (rev 186900) @@ -1,3 +1,12 @@ +2015-07-16 David Kilzer ddkil...@apple.com + +Mark fast/canvas/canvas-too-large-to-draw.html as crashing on El Capitan + +Fix is tracked by rdar://problem/21857102. + +* platform/mac/TestExpectations: Mark test as crashing: +- fast/canvas/canvas-too-large-to-draw.html + 2015-07-16 Joseph Pecoraro pecor...@apple.com Web Inspector: update $$() to return an Array Modified: trunk/LayoutTests/platform/mac/TestExpectations (186899 => 186900) --- trunk/LayoutTests/platform/mac/TestExpectations 2015-07-16 17:52:05 UTC (rev 186899) +++ trunk/LayoutTests/platform/mac/TestExpectations 2015-07-16 18:23:26 UTC (rev 186900) @@ -1293,3 +1293,5 @@ [ Yosemite ] fast/canvas/webgl/oes-texture-half-float-linear.html [ Pass Failure ] +# rdar://problem/21857102 +[ ElCapitan+ ] fast/canvas/canvas-too-large-to-draw.html [ Crash ] ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186901] trunk/Source/WebInspectorUI
Title: [186901] trunk/Source/WebInspectorUI Revision 186901 Author ago...@igalia.com Date 2015-07-16 11:31:21 -0700 (Thu, 16 Jul 2015) Log Message [GTK] Web Inspector: Add new Network icon for the GTK+ port https://bugs.webkit.org/show_bug.cgi?id=147002 Reviewed by Martin Robinson. * UserInterface/Images/gtk/Network.svg: Added. Icon for the new Network tab. Modified Paths trunk/Source/WebInspectorUI/ChangeLog Added Paths trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Network.svg Diff Modified: trunk/Source/WebInspectorUI/ChangeLog (186900 => 186901) --- trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 18:23:26 UTC (rev 186900) +++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 18:31:21 UTC (rev 186901) @@ -1,5 +1,15 @@ 2015-07-16 Andres Gomez ago...@igalia.com +[GTK] Web Inspector: Add new Network icon for the GTK+ port +https://bugs.webkit.org/show_bug.cgi?id=147002 + +Reviewed by Martin Robinson. + +* UserInterface/Images/gtk/Network.svg: Added. +Icon for the new Network tab. + +2015-07-16 Andres Gomez ago...@igalia.com + [GTK] Web Inspector: Add new composite record icon for the GTK+ port https://bugs.webkit.org/show_bug.cgi?id=146998 Added: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Network.svg (0 => 186901) --- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Network.svg (rev 0) +++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Network.svg 2015-07-16 18:31:21 UTC (rev 186901) @@ -0,0 +1,6 @@ +?xml version=1.0 encoding=UTF-8? +!-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -- +svg xmlns=http://www.w3.org/2000/svg version=1.1 viewBox=0 0 16 16 + path fill=#000 d=m4.5761 6.9615c-0.3214 0-0.6383 0.0939-0.8438 0.292l-3.7323 3.8625 3.7972 3.862c0.20533 0.19837 0.45753 0.29208 0.77891 0.29209h1.0385v-1.0385c-0.519-0.26678-0.13457-0.54909-0.32454-0.74645l-1.3306-1.3306h4.7708c0.54867 0.0073 1.0385-0.48982 1.0385-1.0385 0-0.54872-0.48987-1.0463-1.0385-1.0385h-4.8032l1.2657-1.3306c0.1897-0.1985 0.4218-0.4806 0.4218-0.7474v-1.0385z class=filled/ + path fill=#000 d=m11.424 9.0385c0.32136-0.415 0.63832-0.093988 0.84381-0.29209l3.732-3.862-3.797-3.8621c-0.205-0.19836-0.458-0.29207-0.779-0.29208h-1.0385v1.0385c0.52 0.26678 0.13457 0.54909 0.32454 0.74645l1.3306 1.3306h-5.3874c-0.54867-0.00727-1.0385 0.48982-1.0385 1.0385 0 0.54872 0.48987 1.0463 1.0385 1.0385h5.4199l-1.2657 1.3306c-0.19 0.1977-0.423 0.4798-0.423 0.7466v1.0385z class=filled/ +/svg ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186902] branches/safari-600.1.4.17-branch/Source
Title: [186902] branches/safari-600.1.4.17-branch/Source Revision 186902 Author bshaf...@apple.com Date 2015-07-16 12:16:04 -0700 (Thu, 16 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 (186901 => 186902) --- branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-07-16 18:31:21 UTC (rev 186901) +++ branches/safari-600.1.4.17-branch/Source/_javascript_Core/Configurations/Version.xcconfig 2015-07-16 19:16:04 UTC (rev 186902) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 17; -NANO_VERSION = 2; +NANO_VERSION = 3; 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 (186901 => 186902) --- branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig 2015-07-16 18:31:21 UTC (rev 186901) +++ branches/safari-600.1.4.17-branch/Source/WebCore/Configurations/Version.xcconfig 2015-07-16 19:16:04 UTC (rev 186902) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 17; -NANO_VERSION = 2; +NANO_VERSION = 3; 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 (186901 => 186902) --- branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-07-16 18:31:21 UTC (rev 186901) +++ branches/safari-600.1.4.17-branch/Source/WebInspectorUI/Configurations/Version.xcconfig 2015-07-16 19:16:04 UTC (rev 186902) @@ -2,7 +2,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 17; -NANO_VERSION = 2; +NANO_VERSION = 3; 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 (186901 => 186902) --- branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-07-16 18:31:21 UTC (rev 186901) +++ branches/safari-600.1.4.17-branch/Source/WebKit/mac/Configurations/Version.xcconfig 2015-07-16 19:16:04 UTC (rev 186902) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 17; -NANO_VERSION = 2; +NANO_VERSION = 3; 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 (186901 => 186902) --- branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-07-16 18:31:21 UTC (rev 186901) +++ branches/safari-600.1.4.17-branch/Source/WebKit2/Configurations/Version.xcconfig 2015-07-16 19:16:04 UTC (rev 186902) @@ -25,7 +25,7 @@ MINOR_VERSION = 1; TINY_VERSION = 4; MICRO_VERSION = 17; -NANO_VERSION = 2; +NANO_VERSION = 3; 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
[webkit-changes] [186907] trunk/Source/WebCore
Title: [186907] trunk/Source/WebCore
Revision 186907
Author beid...@apple.com
Date 2015-07-16 13:24:29 -0700 (Thu, 16 Jul 2015)
Log Message
Rolling out part of r186895 until rdar://problem/21861167 is resolved.
https://bugs.webkit.org/show_bug.cgi?id=146976
* platform/network/cf/CookieJarCFNet.cpp:
(WebCore::createCookies): Don’t use this new SPI quite yet.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (186906 => 186907)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 20:19:25 UTC (rev 186906)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 20:24:29 UTC (rev 186907)
@@ -1,3 +1,11 @@
+2015-07-16 Brady Eidson beid...@apple.com
+
+Rolling out part of r186895 until rdar://problem/21861167 is resolved.
+https://bugs.webkit.org/show_bug.cgi?id=146976
+
+* platform/network/cf/CookieJarCFNet.cpp:
+(WebCore::createCookies): Don’t use this new SPI quite yet.
+
2015-07-16 Filip Pizlo fpi...@apple.com
Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (186906 => 186907)
--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-16 20:19:25 UTC (rev 186906)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-16 20:24:29 UTC (rev 186907)
@@ -115,11 +115,13 @@
static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
{
-#if (PLATFORM(IOS) __IPHONE_OS_VERSION_MIN_REQUIRED = 9)
-return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#else
+// FIXME: There's a bug in this new CFNetwork SPI tracked by rdar://problem/21861167.
+// Once that bug is resolved, restore this conditional:
+//#if (PLATFORM(IOS) __IPHONE_OS_VERSION_MIN_REQUIRED = 9)
+//return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
+//#else
+
return CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
-#endif
}
void setCookiesFromDOM(const NetworkStorageSession session, const URL firstParty, const URL url, const String value)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186904] trunk/Source/WebKit2
Title: [186904] trunk/Source/WebKit2
Revision 186904
Author mcatanz...@igalia.com
Date 2015-07-16 13:06:43 -0700 (Thu, 16 Jul 2015)
Log Message
REGRESSION(r186464): [SOUP] ASSERTION FAILED: !m_messageReceiverMapCount when closing any tab
https://bugs.webkit.org/show_bug.cgi?id=147006
Reviewed by Anders Carlsson.
Remove the message receiver before it is deallocated.
* UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
(WebKit::CustomProtocolManagerProxy::~CustomProtocolManagerProxy):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186903 => 186904)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 19:30:46 UTC (rev 186903)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 20:06:43 UTC (rev 186904)
@@ -1,3 +1,15 @@
+2015-07-16 Michael Catanzaro mcatanz...@igalia.com
+
+REGRESSION(r186464): [SOUP] ASSERTION FAILED: !m_messageReceiverMapCount when closing any tab
+https://bugs.webkit.org/show_bug.cgi?id=147006
+
+Reviewed by Anders Carlsson.
+
+Remove the message receiver before it is deallocated.
+
+* UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp:
+(WebKit::CustomProtocolManagerProxy::~CustomProtocolManagerProxy):
+
2015-07-16 Brady Eidson beid...@apple.com
Review feedback followup for:
Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp (186903 => 186904)
--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2015-07-16 19:30:46 UTC (rev 186903)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/CustomProtocolManagerProxySoup.cpp 2015-07-16 20:06:43 UTC (rev 186904)
@@ -39,6 +39,7 @@
CustomProtocolManagerProxy::~CustomProtocolManagerProxy()
{
+m_childProcessProxy-removeMessageReceiver(Messages::CustomProtocolManagerProxy::messageReceiverName());
}
void CustomProtocolManagerProxy::startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest request)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186905] trunk/LayoutTests
Title: [186905] trunk/LayoutTests
Revision 186905
Author timothy_hor...@apple.com
Date 2015-07-16 13:07:09 -0700 (Thu, 16 Jul 2015)
Log Message
Rebaseline test for Windows.
* platform/win/fast/shrink-wrap: Added.
* platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
Added Paths
trunk/LayoutTests/platform/win/fast/shrink-wrap/
trunk/LayoutTests/platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (186904 => 186905)
--- trunk/LayoutTests/ChangeLog 2015-07-16 20:06:43 UTC (rev 186904)
+++ trunk/LayoutTests/ChangeLog 2015-07-16 20:07:09 UTC (rev 186905)
@@ -1,3 +1,10 @@
+2015-07-16 Tim Horton timothy_hor...@apple.com
+
+Rebaseline test for Windows.
+
+* platform/win/fast/shrink-wrap: Added.
+* platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt: Added.
+
2015-07-16 Keith Miller keith_mil...@apple.com
Remove leak of objects between isolated worlds on custom events, message events, and pop state events.
Added: trunk/LayoutTests/platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt (0 => 186905)
--- trunk/LayoutTests/platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/fast/shrink-wrap/rect-shrink-wrap-expected.txt 2015-07-16 20:07:09 UTC (rev 186905)
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (0,0) size 800x600
+ RenderText {#text} at (0,0) size 0x0
+layer at (0,0) size 800x600
+ RenderHTMLCanvas {CANVAS} at (0,0) size 800x600
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186903] trunk
Title: [186903] trunk Revision 186903 Author fpi...@apple.com Date 2015-07-16 12:30:46 -0700 (Thu, 16 Jul 2015) Log Message Remove leak of objects between isolated worlds on custom events, message events, and pop state events. https://bugs.webkit.org/show_bug.cgi?id=118884 Patch by Keith Miller keith_mil...@apple.com on 2015-07-16 Reviewed by Filip Pizlo. Source/WebCore: Tests: fast/events/event-leak-objects.html fast/events/event-properties-gc.html Fixes an issue where objects passed as certain properties of events could cross isolated worlds. This was fixed by checking that any object passed by an event must be serializable or originate from the same isolated world as the one it is currently being accessed in. In the case of MessageEvents and PopStateEvents we cache the values of the data and state properties, respectively, as they may be a deserialized object. In case an object was deserialized in a world with elevated privileges we also check the cached value is from the same world, if it is from a different world we recompute it. For testing purposes, I added a new function to Internals that determines whether a JSObject originated in the current world. * CMakeLists.txt: * WebCore.xcodeproj/project.pbxproj: * bindings/js/DOMWrapperWorld.h: (WebCore::worldForDOMObject): * bindings/js/JSBindingsAllInOne.cpp: * bindings/js/JSCustomEventCustom.cpp: Copied from Source/WebCore/dom/CustomEvent.cpp. (WebCore::JSCustomEvent::detail): * bindings/js/JSMessageEventCustom.cpp: (WebCore::JSMessageEvent::data): * bindings/js/JSPopStateEventCustom.cpp: (WebCore::JSPopStateEvent::state): * dom/CustomEvent.cpp: (WebCore::CustomEvent::initCustomEvent): (WebCore::CustomEvent::trySerializeDetail): * dom/CustomEvent.h: * dom/CustomEvent.idl: * dom/MessageEvent.cpp: (WebCore::MessageEvent::initMessageEvent): (WebCore::MessageEvent::trySerializeData): * dom/MessageEvent.h: * dom/PopStateEvent.cpp: (WebCore::PopStateEvent::trySerializeState): * dom/PopStateEvent.h: * testing/Internals.cpp: (WebCore::Internals::isFromCurrentWorld): * testing/Internals.h: * testing/Internals.idl: LayoutTests: These tests ensure ensure objects are not leaked across isolated worlds and that those properties are not prematurely garbage collected. * fast/events/constructors/custom-event-constructor-expected.txt: * fast/events/constructors/custom-event-constructor.html: * fast/events/event-leak-objects-expected.txt: Added. * fast/events/event-leak-objects.html: Added. * fast/events/event-properties-gc-expected.txt: Added. * fast/events/event-properties-gc.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html trunk/Source/WebCore/CMakeLists.txt trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp trunk/Source/WebCore/dom/CustomEvent.cpp trunk/Source/WebCore/dom/CustomEvent.h trunk/Source/WebCore/dom/CustomEvent.idl trunk/Source/WebCore/dom/MessageEvent.cpp trunk/Source/WebCore/dom/MessageEvent.h trunk/Source/WebCore/dom/PopStateEvent.cpp trunk/Source/WebCore/dom/PopStateEvent.h trunk/Source/WebCore/testing/Internals.cpp trunk/Source/WebCore/testing/Internals.h trunk/Source/WebCore/testing/Internals.idl Added Paths trunk/LayoutTests/fast/events/event-leak-objects-expected.txt trunk/LayoutTests/fast/events/event-leak-objects.html trunk/LayoutTests/fast/events/event-properties-gc-expected.txt trunk/LayoutTests/fast/events/event-properties-gc.html trunk/Source/WebCore/bindings/js/JSCustomEventCustom.cpp Diff Modified: trunk/LayoutTests/ChangeLog (186902 => 186903) --- trunk/LayoutTests/ChangeLog 2015-07-16 19:16:04 UTC (rev 186902) +++ trunk/LayoutTests/ChangeLog 2015-07-16 19:30:46 UTC (rev 186903) @@ -1,3 +1,20 @@ +2015-07-16 Keith Miller keith_mil...@apple.com + +Remove leak of objects between isolated worlds on custom events, message events, and pop state events. +https://bugs.webkit.org/show_bug.cgi?id=118884 + +Reviewed by Filip Pizlo. + +These tests ensure ensure objects are not leaked across isolated worlds and that those properties are not prematurely +garbage collected. + +* fast/events/constructors/custom-event-constructor-expected.txt: +* fast/events/constructors/custom-event-constructor.html: +* fast/events/event-leak-objects-expected.txt: Added. +* fast/events/event-leak-objects.html: Added. +* fast/events/event-properties-gc-expected.txt: Added. +* fast/events/event-properties-gc.html: Added. + 2015-07-16 David Kilzer ddkil...@apple.com Mark fast/canvas/canvas-too-large-to-draw.html as crashing
[webkit-changes] [186906] trunk
Title: [186906] trunk
Revision 186906
Author fpi...@apple.com
Date 2015-07-16 13:19:25 -0700 (Thu, 16 Jul 2015)
Log Message
Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
Source/WebCore:
* CMakeLists.txt:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/DOMWrapperWorld.h:
(WebCore::currentWorld):
(WebCore::worldForDOMObject): Deleted.
* bindings/js/JSBindingsAllInOne.cpp:
* bindings/js/JSCustomEventCustom.cpp:
(WebCore::JSCustomEvent::detail): Deleted.
* bindings/js/JSMessageEventCustom.cpp:
(WebCore::JSMessageEvent::data):
* bindings/js/JSPopStateEventCustom.cpp:
(WebCore::JSPopStateEvent::state):
* dom/CustomEvent.cpp:
(WebCore::CustomEvent::initCustomEvent):
(WebCore::CustomEvent::eventInterface):
(WebCore::CustomEvent::trySerializeDetail): Deleted.
* dom/CustomEvent.h:
* dom/CustomEvent.idl:
* dom/MessageEvent.cpp:
(WebCore::MessageEvent::initMessageEvent):
(WebCore::MessageEvent::data):
(WebCore::MessageEvent::trySerializeData): Deleted.
* dom/MessageEvent.h:
* dom/PopStateEvent.cpp:
(WebCore::PopStateEvent::create):
(WebCore::PopStateEvent::eventInterface):
(WebCore::PopStateEvent::trySerializeState): Deleted.
* dom/PopStateEvent.h:
* testing/Internals.cpp:
(WebCore::Internals::deserializeBuffer):
(WebCore::Internals::setUsesOverlayScrollbars):
(WebCore::Internals::isFromCurrentWorld): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/events/constructors/custom-event-constructor-expected.txt:
* fast/events/constructors/custom-event-constructor.html:
* fast/events/event-leak-objects-expected.txt:
* fast/events/event-leak-objects.html:
* fast/events/event-properties-gc-expected.txt:
* fast/events/event-properties-gc.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt
trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html
trunk/LayoutTests/fast/events/event-leak-objects-expected.txt
trunk/LayoutTests/fast/events/event-leak-objects.html
trunk/LayoutTests/fast/events/event-properties-gc-expected.txt
trunk/LayoutTests/fast/events/event-properties-gc.html
trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/bindings/js/DOMWrapperWorld.h
trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp
trunk/Source/WebCore/bindings/js/JSCustomEventCustom.cpp
trunk/Source/WebCore/bindings/js/JSMessageEventCustom.cpp
trunk/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp
trunk/Source/WebCore/dom/CustomEvent.cpp
trunk/Source/WebCore/dom/CustomEvent.h
trunk/Source/WebCore/dom/CustomEvent.idl
trunk/Source/WebCore/dom/MessageEvent.cpp
trunk/Source/WebCore/dom/MessageEvent.h
trunk/Source/WebCore/dom/PopStateEvent.cpp
trunk/Source/WebCore/dom/PopStateEvent.h
trunk/Source/WebCore/testing/Internals.cpp
trunk/Source/WebCore/testing/Internals.h
trunk/Source/WebCore/testing/Internals.idl
Diff
Modified: trunk/LayoutTests/ChangeLog (186905 => 186906)
--- trunk/LayoutTests/ChangeLog 2015-07-16 20:07:09 UTC (rev 186905)
+++ trunk/LayoutTests/ChangeLog 2015-07-16 20:19:25 UTC (rev 186906)
@@ -1,3 +1,14 @@
+2015-07-16 Filip Pizlo fpi...@apple.com
+
+Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
+
+* fast/events/constructors/custom-event-constructor-expected.txt:
+* fast/events/constructors/custom-event-constructor.html:
+* fast/events/event-leak-objects-expected.txt:
+* fast/events/event-leak-objects.html:
+* fast/events/event-properties-gc-expected.txt:
+* fast/events/event-properties-gc.html:
+
2015-07-16 Tim Horton timothy_hor...@apple.com
Rebaseline test for Windows.
Modified: trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt (186905 => 186906)
--- trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2015-07-16 20:07:09 UTC (rev 186905)
+++ trunk/LayoutTests/fast/events/constructors/custom-event-constructor-expected.txt 2015-07-16 20:19:25 UTC (rev 186906)
@@ -13,11 +13,8 @@
PASS new CustomEvent('eventType', { detail: 'string' }).detail is 'string'
PASS new CustomEvent('eventType', { detail: detailObject }).detail is detailObject
PASS new CustomEvent('eventType', { detail: document }).detail is document
-PASS new CustomEvent('eventType', { detail: undefined }).detail is undefined
-PASS new CustomEvent('eventType', { detail: null }).detail is null
PASS new CustomEvent('eventType', { get detail() { return true; } }).detail is true
PASS new CustomEvent('eventType', { get detail() { throw 'Custom Error'; } }) threw exception Custom Error.
-PASS event.detail is detailObject
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/events/constructors/custom-event-constructor.html (186905 => 186906)
---
[webkit-changes] [186922] trunk/Tools
Title: [186922] trunk/Tools
Revision 186922
Author gyuyoung@webkit.org
Date 2015-07-16 19:56:23 -0700 (Thu, 16 Jul 2015)
Log Message
Unreviewed, remove my redundant email information.
* Scripts/webkitpy/common/config/contributors.json:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json
Diff
Modified: trunk/Tools/ChangeLog (186921 => 186922)
--- trunk/Tools/ChangeLog 2015-07-17 02:45:17 UTC (rev 186921)
+++ trunk/Tools/ChangeLog 2015-07-17 02:56:23 UTC (rev 186922)
@@ -1,3 +1,9 @@
+2015-07-16 Gyuyoung Kim gyuyoung@webkit.org
+
+Unreviewed, remove my redundant email information.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
2015-07-16 Hyungwook Lee hyungwook@navercorp.com
Unreviewed. Add Hyungwook Lee as a committer.
Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (186921 => 186922)
--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2015-07-17 02:45:17 UTC (rev 186921)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2015-07-17 02:56:23 UTC (rev 186922)
@@ -4165,8 +4165,7 @@
Gyuyoung Kim : {
emails : [
gyuyoung@webkit.org,
-gyuyoung@navercorp.com,
-gyuyoung@samsung.com
+gyuyoung@navercorp.com
],
expertise : The EFLWebKit Port, Navigator Content Utils, CMake build system,
nicks : [
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186923] trunk/Source/JavaScriptCore
Title: [186923] trunk/Source/_javascript_Core Revision 186923 Author fpi...@apple.com Date 2015-07-16 20:33:19 -0700 (Thu, 16 Jul 2015) Log Message Unreviewed, fix build for newer LLVMs. * llvm/LLVMHeaders.h: * llvm/library/LLVMExports.cpp: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/llvm/LLVMHeaders.h trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (186922 => 186923) --- trunk/Source/_javascript_Core/ChangeLog 2015-07-17 02:56:23 UTC (rev 186922) +++ trunk/Source/_javascript_Core/ChangeLog 2015-07-17 03:33:19 UTC (rev 186923) @@ -1,3 +1,10 @@ +2015-07-16 Filip Pizlo fpi...@apple.com + +Unreviewed, fix build for newer LLVMs. + +* llvm/LLVMHeaders.h: +* llvm/library/LLVMExports.cpp: + 2015-07-16 Mark Lam mark@apple.com RegExp::match() should set m_state to ByteCode if compilation fails. Modified: trunk/Source/_javascript_Core/llvm/LLVMHeaders.h (186922 => 186923) --- trunk/Source/_javascript_Core/llvm/LLVMHeaders.h 2015-07-17 02:56:23 UTC (rev 186922) +++ trunk/Source/_javascript_Core/llvm/LLVMHeaders.h 2015-07-17 03:33:19 UTC (rev 186923) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Apple Inc. All rights reserved. + * Copyright (C) 2013, 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 @@ -40,6 +40,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored -Wmissing-noreturn #pragma clang diagnostic ignored -Wunused-parameter +#pragma clang diagnostic ignored -Wnon-virtual-dtor #endif // COMPILER(CLANG) #include llvm-c/Analysis.h Modified: trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp (186922 => 186923) --- trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2015-07-17 02:56:23 UTC (rev 186922) +++ trunk/Source/_javascript_Core/llvm/library/LLVMExports.cpp 2015-07-17 03:33:19 UTC (rev 186923) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013, 2014 Apple Inc. All rights reserved. + * Copyright (C) 2013-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 @@ -42,6 +42,7 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored -Wmissing-noreturn #pragma clang diagnostic ignored -Wunused-parameter +#pragma clang diagnostic ignored -Wnon-virtual-dtor #endif // COMPILER(CLANG) #include llvm/Support/CommandLine.h ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186925] trunk/Source/WebInspectorUI
Title: [186925] trunk/Source/WebInspectorUI
Revision 186925
Author commit-qu...@webkit.org
Date 2015-07-16 20:55:20 -0700 (Thu, 16 Jul 2015)
Log Message
Web Inspector: Total Size of Resources number in dashboard is wrong (does not update during load)
https://bugs.webkit.org/show_bug.cgi?id=147027
Patch by Joseph Pecoraro pecor...@apple.com on 2015-07-16
Reviewed by Timothy Hatcher.
* UserInterface/Models/DefaultDashboard.js:
(WebInspector.DefaultDashboard.prototype._resourceSizeDidChange):
Restore implementation of callback from r183328 to update total resource
size as resources are downloaded.
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (186924 => 186925)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-17 03:55:17 UTC (rev 186924)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-17 03:55:20 UTC (rev 186925)
@@ -1,3 +1,15 @@
+2015-07-16 Joseph Pecoraro pecor...@apple.com
+
+Web Inspector: Total Size of Resources number in dashboard is wrong (does not update during load)
+https://bugs.webkit.org/show_bug.cgi?id=147027
+
+Reviewed by Timothy Hatcher.
+
+* UserInterface/Models/DefaultDashboard.js:
+(WebInspector.DefaultDashboard.prototype._resourceSizeDidChange):
+Restore implementation of callback from r183328 to update total resource
+size as resources are downloaded.
+
2015-07-16 Andres Gomez ago...@igalia.com
[GTK] Web Inspector: Further optimize the weight and time icons taken back to the toolbar dashboard for the GTK+ port
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js (186924 => 186925)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-07-17 03:55:17 UTC (rev 186924)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DefaultDashboard.js 2015-07-17 03:55:20 UTC (rev 186925)
@@ -223,6 +223,11 @@
this._stopUpdatingTime();
}
+_resourceSizeDidChange(event)
+{
+this.resourcesSize += event.target.size - event.data.previousSize;
+}
+
_consoleMessageAdded(event)
{
var message = event.data.message;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186924] trunk/Source/WebKit2
Title: [186924] trunk/Source/WebKit2
Revision 186924
Author mattba...@apple.com
Date 2015-07-16 20:55:17 -0700 (Thu, 16 Jul 2015)
Log Message
[Mac] Web Inspector toolbar can be covered by the Safari tab bar when docked to the right
https://bugs.webkit.org/show_bug.cgi?id=146994
Reviewed by Timothy Hatcher.
WebInspectorProxy contained logic which ignored the next frame change notification from the inspected view,
whenever it updated the frames of both the Inspector view and inspected view. This patch removes that logic,
as it prevented the Inspector's frame from being adjusted after changes to the browser's top content inset.
* UIProcess/mac/WebInspectorProxyMac.mm:
(-[WKWebInspectorProxyObjCAdapter ignoreNextInspectedViewFrameDidChange]): Deleted.
(-[WKWebInspectorProxyObjCAdapter inspectedViewFrameDidChange:]): Deleted.
(WebKit::WebInspectorProxy::inspectedViewFrameDidChange): Deleted.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (186923 => 186924)
--- trunk/Source/WebKit2/ChangeLog 2015-07-17 03:33:19 UTC (rev 186923)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-17 03:55:17 UTC (rev 186924)
@@ -1,3 +1,19 @@
+2015-07-16 Matt Baker mattba...@apple.com
+
+[Mac] Web Inspector toolbar can be covered by the Safari tab bar when docked to the right
+https://bugs.webkit.org/show_bug.cgi?id=146994
+
+Reviewed by Timothy Hatcher.
+
+WebInspectorProxy contained logic which ignored the next frame change notification from the inspected view,
+whenever it updated the frames of both the Inspector view and inspected view. This patch removes that logic,
+as it prevented the Inspector's frame from being adjusted after changes to the browser's top content inset.
+
+* UIProcess/mac/WebInspectorProxyMac.mm:
+(-[WKWebInspectorProxyObjCAdapter ignoreNextInspectedViewFrameDidChange]): Deleted.
+(-[WKWebInspectorProxyObjCAdapter inspectedViewFrameDidChange:]): Deleted.
+(WebKit::WebInspectorProxy::inspectedViewFrameDidChange): Deleted.
+
2015-07-16 Joseph Pecoraro pecor...@apple.com
Web Inspector: [Mac] Save dialog not working when inspector is docked
Modified: trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (186923 => 186924)
--- trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-17 03:33:19 UTC (rev 186923)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2015-07-17 03:55:17 UTC (rev 186924)
@@ -151,18 +151,8 @@
static_castWebInspectorProxy*(_inspectorProxy)-windowFullScreenDidChange();
}
-- (void)ignoreNextInspectedViewFrameDidChange
-{
-_ignoreNextInspectedViewFrameDidChange = YES;
-}
-
- (void)inspectedViewFrameDidChange:(NSNotification *)notification
{
-if (_ignoreNextInspectedViewFrameDidChange) {
-_ignoreNextInspectedViewFrameDidChange = NO;
-return;
-}
-
// Resizing the views while inside this notification can lead to bad results when entering
// or exiting full screen. To avoid that we need to perform the work after a delay. We only
// depend on this for enforcing the height constraints, so a small delay isn't terrible. Most
@@ -730,8 +720,6 @@
if (NSEqualRects([m_inspectorView frame], inspectorFrame) NSEqualRects([inspectedView frame], inspectedViewFrame))
return;
-[m_inspectorProxyObjCAdapter ignoreNextInspectedViewFrameDidChange];
-
// Disable screen updates to make sure the layers for both views resize in sync.
[[m_inspectorView window] disableScreenUpdatesUntilFlush];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186938] branches/safari-601.1-branch
Title: [186938] branches/safari-601.1-branch
Revision 186938
Author matthew_han...@apple.com
Date 2015-07-16 22:33:00 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186868. rdar://problem/21758704
Modified Paths
branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/LayoutTests/platform/mac-mavericks/TestExpectations
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm
Added Paths
branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space-expected.html
branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space.html
branches/safari-601.1-branch/LayoutTests/platform/mac-yosemite/TestExpectations
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186937 => 186938)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:55 UTC (rev 186937)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:33:00 UTC (rev 186938)
@@ -1,5 +1,26 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186868. rdar://problem/21758704
+
+2015-07-15 Dean Jackson d...@apple.com
+
+Tag WebGL layers with sRGB colorspace
+https://bugs.webkit.org/show_bug.cgi?id=146986
+rdar://problem/21758704
+
+Reviewed by Simon Fraser.
+
+Add a test that embeds a WebGL canvas inside a solid div. Since both
+have the same color, the canvas should seemlessly disappear into
+the surrounding div.
+
+* fast/canvas/webgl/match-page-color-space-expected.html: Added.
+* fast/canvas/webgl/match-page-color-space.html: Added.
+* platform/mac-mavericks/TestExpectations: Skip this test.
+* platform/mac-yosemite/TestExpectations: Added. Skip this test.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186865. rdar://problem/21823835
2015-07-15 Wenson Hsieh wenson_hs...@apple.com
Added: branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space-expected.html (0 => 186938)
--- branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space-expected.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space-expected.html 2015-07-17 05:33:00 UTC (rev 186938)
@@ -0,0 +1,22 @@
+!DOCTYPE html
+style
+.box {
+position: relative;
+display: inline-block;
+margin: 5px;
+width: 40px;
+height: 40px;
+}
+/style
+
+pThe boxes below should all be uniform in color. Any difference is likely to be extremely subtle./p
+div class=box style=background-color: red/div
+div class=box style=background-color: yellow/div
+div class=box style=background-color: green/div
+div class=box style=background-color: orange/div
+div class=box style=background-color: purple/div
+div class=box style=background-color: gray/div
+div class=box style=background-color: cornflowerblue/div
+div class=box style=background-color: rgb(98, 178, 23)/div
+div class=box style=background-color: rgb(111, 62, 198)/div
+div class=box style=background-color: rgb(232, 176, 101)/div
Added: branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space.html (0 => 186938)
--- branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/canvas/webgl/match-page-color-space.html 2015-07-17 05:33:00 UTC (rev 186938)
@@ -0,0 +1,57 @@
+!DOCTYPE html
+style
+.box {
+position: relative;
+display: inline-block;
+margin: 5px;
+width: 40px;
+height: 40px;
+}
+
+canvas {
+position: absolute;
+left: 10px;
+top: 10px;
+width: 20px;
+height: 20px;
+background-color: black;
+}
+/style
+script
+
+function drawColorIntoCanvas(color, canvas) {
+var gl = canvas.getContext(webgl);
+gl.clearColor(color[0], color[1], color[2], 1.0);
+gl.clear(gl.COLOR_BUFFER_BIT);
+}
+
+function run() {
+var boxes = document.querySelectorAll(.box);
+for (var i = 0; i boxes.length; i++) {
+var box = boxes[i];
+var canvas = document.createElement(canvas);
+canvas.width = 20;
+canvas.height = 20;
+
+var backgroundColor = window.getComputedStyle(box).backgroundColor;
+var matches = /rgb\((\d+),\s(\d+),\s(\d+)\)/.exec(backgroundColor);
+drawColorIntoCanvas([matches[1] / 255, matches[2] / 255, matches[3] / 255], canvas);
+box.appendChild(canvas);
+}
+}
+
+window.addEventListener(load, run, false);
+/script
+body
+pThe boxes below should all be uniform in color. Any difference is likely to be extremely subtle./p
+div class=box style=background-color: red/div
+div class=box style=background-color: yellow/div
+div class=box style=background-color: green/div
+div class=box
[webkit-changes] [186941] branches/safari-601.1-branch/Source/WebKit2
Title: [186941] branches/safari-601.1-branch/Source/WebKit2 Revision 186941 Author matthew_han...@apple.com Date 2015-07-16 22:33:12 -0700 (Thu, 16 Jul 2015) Log Message Merge r186887. rdar://problem/21692212 Modified Paths branches/safari-601.1-branch/Source/WebKit2/ChangeLog branches/safari-601.1-branch/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h branches/safari-601.1-branch/Source/WebKit2/UIProcess/PageClient.h branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp branches/safari-601.1-branch/Source/WebKit2/UIProcess/efl/WebViewEfl.h branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h branches/safari-601.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h branches/safari-601.1-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm Diff Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186940 => 186941) --- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:08 UTC (rev 186940) +++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:12 UTC (rev 186941) @@ -1,5 +1,88 @@ 2015-07-16 Matthew Hanson matthew_han...@apple.com +Merge r186887. rdar://problem/21692212 + +2015-07-15 Brady Eidson beid...@apple.com + +REGRESSION(r186088): Crash under WebKit::WebPageProxy::didFailLoadForFrame +rdar://problem/21692212 and https://bugs.webkit.org/show_bug.cgi?id=146988 + +Reviewed by Sam Weinig. + +When a loader delegate callback results in the WKView getting deallocated, then the PageClient +is also destroyed. + +WebPageProxy then (often) turns around and uses the PageClient anyways. + +Tried to write a TestWebKitAPI test for this, but only didFailLoadForFrame appears to obviously +be vulnerable, and there seems to be no way to reproduce that failure case under TestWebKitAPI. + +* UIProcess/PageClient.h: Add ref/derefView. + +* UIProcess/API/gtk/PageClientImpl.h: Stub them out. +* UIProcess/efl/WebViewEfl.h: Stub them out. + +* UIProcess/mac/PageClientImpl.h: +* UIProcess/mac/PageClientImpl.mm: +(WebKit::PageClientImpl::refView): [m_wkView retain] +(WebKit::PageClientImpl::derefView): [m_wkView release] + +* UIProcess/ios/PageClientImplIOS.h: +* UIProcess/ios/PageClientImplIOS.mm: +(WebKit::PageClientImpl::refView): Retain all 3 views. +(WebKit::PageClientImpl::derefView): Release all 3 views. + +* UIProcess/WebPageProxy.cpp: +(WebKit::PageClientProtector::PageClientProtector): Calls refView() on the PageClient. +(WebKit::PageClientProtector::~PageClientProtector): Calls derefView() on the PageClient. +(WebKit::WebPageProxy::didChangeBackForwardList): All methods that make m_loaderClient or + m_pageClient callouts get a protector at their head. +(WebKit::WebPageProxy::willGoToBackForwardListItem): +(WebKit::WebPageProxy::shouldKeepCurrentBackForwardListItemInList): +(WebKit::WebPageProxy::findPlugin): +(WebKit::WebPageProxy::didCreateMainFrame): +(WebKit::WebPageProxy::didCreateSubframe): +(WebKit::WebPageProxy::didStartProgress): +(WebKit::WebPageProxy::didChangeProgress): +(WebKit::WebPageProxy::didFinishProgress): +(WebKit::WebPageProxy::didDestroyNavigation): +(WebKit::WebPageProxy::didStartProvisionalLoadForFrame): +(WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame): +(WebKit::WebPageProxy::didChangeProvisionalURLForFrame): +(WebKit::WebPageProxy::didFailProvisionalLoadForFrame): +(WebKit::WebPageProxy::didCommitLoadForFrame): +(WebKit::WebPageProxy::didFinishDocumentLoadForFrame): +(WebKit::WebPageProxy::didFinishLoadForFrame): +(WebKit::WebPageProxy::didFailLoadForFrame): +(WebKit::WebPageProxy::didSameDocumentNavigationForFrame): +(WebKit::WebPageProxy::didReceiveTitleForFrame): +(WebKit::WebPageProxy::didFirstLayoutForFrame): +(WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame): +(WebKit::WebPageProxy::didLayoutForCustomContentProvider): +(WebKit::WebPageProxy::didLayout): +(WebKit::WebPageProxy::didRemoveFrameFromHierarchy): +(WebKit::WebPageProxy::didDisplayInsecureContentForFrame): +(WebKit::WebPageProxy::didRunInsecureContentForFrame): +(WebKit::WebPageProxy::didDetectXSSForFrame): +(WebKit::WebPageProxy::frameDidBecomeFrameSet): +(WebKit::WebPageProxy::decidePolicyForNavigationAction): +
[webkit-changes] [186942] branches/safari-601.1-branch/Source/WebCore
Title: [186942] branches/safari-601.1-branch/Source/WebCore
Revision 186942
Author matthew_han...@apple.com
Date 2015-07-16 22:33:15 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186895. rdar://problem/21692212
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp
branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186941 => 186942)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:12 UTC (rev 186941)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:15 UTC (rev 186942)
@@ -1,5 +1,21 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186895. rdar://problem/21692212
+
+2015-07-16 Brady Eidson beid...@apple.com
+
+WebKit document.cookie mis-parsing.
+rdar://problem/21715050 and https://bugs.webkit.org/show_bug.cgi?id=146976
+
+Reviewed by Sam Weinig.
+
+* platform/network/cf/CookieJarCFNet.cpp:
+(WebCore::createCookies): Use new SPI if available.
+(WebCore::setCookiesFromDOM):
+* platform/spi/cf/CFNetworkSPI.h:
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186879. rdar://problem/21758704
2015-07-15 Dean Jackson d...@apple.com
Modified: branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (186941 => 186942)
--- branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-17 05:33:12 UTC (rev 186941)
+++ branches/safari-601.1-branch/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2015-07-17 05:33:15 UTC (rev 186942)
@@ -28,6 +28,7 @@
#if USE(CFNETWORK)
+#include CFNetworkSPI.h
#include Cookie.h
#include URL.h
#include NetworkStorageSession.h
@@ -112,6 +113,15 @@
#endif
}
+static CFArrayRef createCookies(CFDictionaryRef headerFields, CFURLRef url)
+{
+#if (PLATFORM(IOS) __IPHONE_OS_VERSION_MIN_REQUIRED = 9)
+return _CFHTTPParsedCookiesWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
+#else
+return CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault, headerFields, url);
+#endif
+}
+
void setCookiesFromDOM(const NetworkStorageSession session, const URL firstParty, const URL url, const String value)
{
// rdar://problem/5632883 CFHTTPCookieStorage stores an empty cookie, which would be sent as Cookie: =.
@@ -130,10 +140,8 @@
(const void**)s_setCookieKeyCF, (const void**)cookieStringCF, 1,
kCFTypeDictionaryKeyCallBacks, kCFTypeDictionaryValueCallBacks));
-RetainPtrCFArrayRef cookiesCF = adoptCF(CFHTTPCookieCreateWithResponseHeaderFields(kCFAllocatorDefault,
-headerFieldsCF.get(), urlCF.get()));
-
-CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(cookiesCF.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
+RetainPtrCFArrayRef unfilteredCookies = adoptCF(createCookies(headerFieldsCF.get(), urlCF.get()));
+CFHTTPCookieStorageSetCookies(session.cookieStorage().get(), filterCookies(unfilteredCookies.get()).get(), urlCF.get(), firstPartyForCookiesCF.get());
}
String cookiesForDOM(const NetworkStorageSession session, const URL firstParty, const URL url)
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (186941 => 186942)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-17 05:33:12 UTC (rev 186941)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-07-17 05:33:15 UTC (rev 186942)
@@ -31,6 +31,7 @@
#if PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
#include CFNetwork/CFHTTPCookies.h
+#include CFNetwork/CFHTTPCookiesPriv.h
#include CFNetwork/CFURLCachePriv.h
#include CFNetwork/CFURLProtocolPriv.h
#include CFNetwork/CFURLRequest.h
@@ -123,6 +124,7 @@
#if (TARGET_OS_IPHONE __IPHONE_OS_VERSION_MIN_REQUIRED = 9) || (PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100)
EXTERN_C CFDataRef CFHTTPCookieStorageCreateIdentifyingData(CFAllocatorRef inAllocator, CFHTTPCookieStorageRef inStorage);
EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
+EXTERN_C CFArrayRef _CFHTTPParsedCookiesWithResponseHeaderFields(CFAllocatorRef inAllocator, CFDictionaryRef headerFields, CFURLRef inURL);
#endif
#if defined(__OBJC__)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186943] branches/safari-601.1-branch/Source/WebKit/mac
Title: [186943] branches/safari-601.1-branch/Source/WebKit/mac
Revision 186943
Author matthew_han...@apple.com
Date 2015-07-16 22:33:18 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186909. rdar://problem/21802456
Modified Paths
branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog
branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm
branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h
Diff
Modified: branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/ChangeLog 2015-07-17 05:33:18 UTC (rev 186943)
@@ -1,3 +1,22 @@
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
+Merge r186909. rdar://problem/21802456
+
+2015-07-13 Simon Fraser simon.fra...@apple.com
+
+[iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
+https://bugs.webkit.org/show_bug.cgi?id=146924
+WebKit part of rdar://problem/21802456
+
+Reviewed by Tim Horton.
+
+Expose the FrameView's contentsSizeRespectingOverflow() via WebView, for use
+by UIKit.
+
+* WebView/WebView.mm:
+(-[WebView _contentsSizeRespectingOverflow]):
+* WebView/WebViewPrivate.h:
+
2015-07-10 Matthew Hanson matthew_han...@apple.com
Disable non-shipping features.
Modified: branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebView.mm 2015-07-17 05:33:18 UTC (rev 186943)
@@ -1560,6 +1560,14 @@
return _private-page-renderTreeSize();
}
+- (NSSize)_contentsSizeRespectingOverflow
+{
+if (FrameView* view = [self _mainCoreFrame]-view())
+return view-contentsSizeRespectingOverflow();
+
+return self mainFrame] frameView] documentView] bounds].size;
+}
+
- (void)_dispatchTileDidDraw:(CALayer*)tile
{
id mailDelegate = [self _webMailDelegate];
Modified: branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h (186942 => 186943)
--- branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-17 05:33:15 UTC (rev 186942)
+++ branches/safari-601.1-branch/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-17 05:33:18 UTC (rev 186943)
@@ -442,6 +442,7 @@
- (DOMCSSStyleDeclaration *)styleAtSelectionStart;
- (NSUInteger)_renderTreeSize;
+- (NSSize)_contentsSizeRespectingOverflow;
/*!
* @method _handleMemoryWarning
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186937] branches/safari-601.1-branch
Title: [186937] branches/safari-601.1-branch
Revision 186937
Author matthew_han...@apple.com
Date 2015-07-16 22:32:55 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186865. rdar://problem/21823835
Modified Paths
branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/page/FrameView.h
branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp
branches/safari-601.1-branch/Source/WebCore/testing/Internals.cpp
Added Paths
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186936 => 186937)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:50 UTC (rev 186936)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:55 UTC (rev 186937)
@@ -1,5 +1,21 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186865. rdar://problem/21823835
+
+2015-07-15 Wenson Hsieh wenson_hs...@apple.com
+
+Scroll snapping to elements is broken for main frame scrolling
+https://bugs.webkit.org/show_bug.cgi?id=146957
+
+Reviewed by Brent Fulgham.
+
+Tests that basic scroll snap coordinates in the mainframe works.
+
+* css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt: Added.
+* css3/scroll-snap/scroll-snap-coordinate-mainframe.html: Added.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186840. rdar://problem/21823681
2015-07-15 Wenson Hsieh wenson_hs...@apple.com
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt (0 => 186937)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt 2015-07-17 05:32:55 UTC (rev 186937)
@@ -0,0 +1,8 @@
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets: vertical = { 0, 600, 1200, 1800, 2400, 3000 }
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html (0 => 186937)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html 2015-07-17 05:32:55 UTC (rev 186937)
@@ -0,0 +1,47 @@
+html
+
+head
+style
+body {
+margin: 0;
+-webkit-scroll-snap-type: mandatory;
+}
+
+.vertical {
+width: 100%;
+height: 600px;
+-webkit-scroll-snap-coordinate: 0px 0px;
+}
+/style
+
+script src=""
+script
+function runTest()
+{
+debug(Scroll-snap offsets: + window.internals.scrollSnapOffsets(document.body));
+finishJSTest();
+}
+
+function setup()
+{
+if (window.testRunner) {
+window.jsTestIsAsync = true;
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+setTimeout(runTest, 0);
+}
+}
+/script
+/head
+
+body _onload_=setup()
+div id=child00 class=verticaldiv id=console/div/div
+div id=child01 class=vertical/div
+div id=child02 class=vertical/div
+div id=child03 class=vertical/div
+div id=child04 class=vertical/div
+div id=child05 class=vertical/div
+script src=""
+/body
+
+/html
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186936 => 186937)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:50 UTC (rev 186936)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:55 UTC (rev 186937)
@@ -1,5 +1,30 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186865. rdar://problem/21823835
+
+2015-07-15 Wenson Hsieh wenson_hs...@apple.com
+
+Scroll snapping to elements is broken for main frame scrolling
+https://bugs.webkit.org/show_bug.cgi?id=146957
+
+Reviewed by Brent Fulgham.
+
+Fixes the case of elements with scroll snap coordinates in a scroll snapping mainframe by changing
+RenderBox::findEnclosingScrollableContainer to return the body's RenderBox when all enclosing elements
+are not overflow scrollable but the mainframe can scroll.
+
+Test: css3/scroll-snap/scroll-snap-coordinate-mainframe.html
+
+* page/FrameView.h: Export isScrollable so that the Internals API can use it.
+* rendering/RenderBox.cpp: Include MainFrame.h.
+
[webkit-changes] [186940] branches/safari-601.1-branch/Source/WebCore
Title: [186940] branches/safari-601.1-branch/Source/WebCore
Revision 186940
Author matthew_han...@apple.com
Date 2015-07-16 22:33:08 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186879. rdar://problem/21758704
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm
branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:08 UTC (rev 186940)
@@ -1,5 +1,21 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186879. rdar://problem/21758704
+
+2015-07-15 Dean Jackson d...@apple.com
+
+Tag WebGL layers with sRGB colorspace
+https://bugs.webkit.org/show_bug.cgi?id=146986
+rdar://problem/21758704
+
+Fix the build on older El Capitan releases.
+
+* platform/graphics/mac/WebGLLayer.mm:
+(-[WebGLLayer initWithGraphicsContext3D:]):
+* platform/spi/cocoa/QuartzCoreSPI.h:
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186878. rdar://problem/21758722
2015-07-15 Sam Weinig s...@webkit.org
Modified: branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/platform/graphics/mac/WebGLLayer.mm 2015-07-17 05:33:08 UTC (rev 186940)
@@ -54,7 +54,8 @@
#if PLATFORM(MAC)
self.contentsScale = _devicePixelRatio;
#if __MAC_OS_X_VERSION_MIN_REQUIRED = 101100
-self.colorspace = sRGBColorSpaceRef();
+if ([self respondsToSelector:@selector(setColorspace:)])
+[self setColorspace:sRGBColorSpaceRef()];
#endif
#endif
return self;
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (186939 => 186940)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:05 UTC (rev 186939)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:08 UTC (rev 186940)
@@ -97,6 +97,12 @@
- (void)setNeedsDisplayInRect:(CGRect)rect levelOfDetail:(int)levelOfDetail options:(NSDictionary *)dictionary;
@end
+#if PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100
+@interface CAOpenGLLayer (Details)
+@property CGColorSpaceRef colorspace;
+@end
+#endif
+
struct CAColorMatrix {
float m11, m12, m13, m14, m15;
float m21, m22, m23, m24, m25;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186939] branches/safari-601.1-branch/Source
Title: [186939] branches/safari-601.1-branch/Source
Revision 186939
Author matthew_han...@apple.com
Date 2015-07-16 22:33:05 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186878. rdar://problem/21758722
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h
branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm
branches/safari-601.1-branch/Source/WebKit2/PluginProcess/mac/PluginControllerProxyMac.mm
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
@@ -1,5 +1,20 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186878. rdar://problem/21758722
+
+2015-07-15 Sam Weinig s...@webkit.org
+
+Color match plug-ins
+rdar://problem/21758722
+https://bugs.webkit.org/show_bug.cgi?id=146987
+
+Reviewed by Dean Jackson.
+
+* platform/spi/cocoa/QuartzCoreSPI.h:
+Add colorMatchUntaggedContent property.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186868. rdar://problem/21758704
2015-07-15 Dean Jackson d...@apple.com
Modified: branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebCore/platform/spi/cocoa/QuartzCoreSPI.h 2015-07-17 05:33:05 UTC (rev 186939)
@@ -70,6 +70,9 @@
- (void)setFencePort:(mach_port_t)port;
- (void)setFencePort:(mach_port_t)port commitHandler:(void(^)(void))block;
#endif
+#if PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100
+@property BOOL colorMatchUntaggedContent;
+#endif
@property (readonly) uint32_t contextId;
@property (strong) CALayer *layer;
@property CGColorSpaceRef colorSpace;
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:33:05 UTC (rev 186939)
@@ -1,5 +1,27 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186878. rdar://problem/21758722
+
+2015-07-15 Sam Weinig s...@webkit.org
+
+Color match plug-ins
+rdar://problem/21758722
+https://bugs.webkit.org/show_bug.cgi?id=146987
+
+Reviewed by Dean Jackson.
+
+* Platform/mac/LayerHostingContext.h:
+* Platform/mac/LayerHostingContext.mm:
+(WebKit::LayerHostingContext::setColorMatchUntaggedContent):
+(WebKit::LayerHostingContext::colorMatchUntaggedContent):
+Add setter/getter for color matching untagged content.
+
+* PluginProcess/mac/PluginControllerProxyMac.mm:
+(WebKit::PluginControllerProxy::updateLayerHostingContext):
+Have plug-ins CAContext's color match untagged colors into sRGB.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186814. rdar://problem/21605505
2015-07-14 Anders Carlsson ander...@apple.com
Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.h 2015-07-17 05:33:05 UTC (rev 186939)
@@ -62,6 +62,11 @@
void setColorSpace(CGColorSpaceRef);
CGColorSpaceRef colorSpace() const;
+#if PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100
+void setColorMatchUntaggedContent(bool);
+bool colorMatchUntaggedContent() const;
+#endif
+
// Fences only work on iOS and OS 10.10+.
void setFencePort(mach_port_t);
Modified: branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm (186938 => 186939)
--- branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-07-17 05:33:00 UTC (rev 186938)
+++ branches/safari-601.1-branch/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2015-07-17 05:33:05 UTC (rev 186939)
@@ -102,6 +102,21 @@
return [m_context colorSpace];
}
+#if PLATFORM(MAC) __MAC_OS_X_VERSION_MIN_REQUIRED = 101100
+void LayerHostingContext::setColorMatchUntaggedContent(bool colorMatchUntaggedContent)
+{
+if ([m_context respondsToSelector:@selector(setColorMatchUntaggedContent:)])
+[m_context
[webkit-changes] [186944] branches/safari-601.1-branch
Title: [186944] branches/safari-601.1-branch
Revision 186944
Author matthew_han...@apple.com
Date 2015-07-16 22:33:22 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186911. rdar://problem/21822541
Modified Paths
branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp
Added Paths
branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt
branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186943 => 186944)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:33:18 UTC (rev 186943)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:33:22 UTC (rev 186944)
@@ -1,5 +1,21 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186911. rdar://problem/21822541
+
+2015-07-16 Simon Fraser simon.fra...@apple.com
+
+Fix disappearing position:fixed elements in fixed layout mode
+https://bugs.webkit.org/show_bug.cgi?id=147019
+
+Reviewed by Tim Horton.
+
+Test with four fixed elements in fixed layout mode.
+
+* compositing/fixed-with-fixed-layout-expected.txt: Added.
+* compositing/fixed-with-fixed-layout.html: Added.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186868. rdar://problem/21758704
2015-07-15 Dean Jackson d...@apple.com
Added: branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (0 => 186944)
--- branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt 2015-07-17 05:33:22 UTC (rev 186944)
@@ -0,0 +1,35 @@
+Top Left Right bottom
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 806.00 1616.00)
+ (children 1
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 1008.00 2021.00)
+ (contentsOpaque 1)
+ (transform [0.80 0.00 0.00 0.00] [0.00 0.80 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
+ (children 4
+(GraphicsLayer
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 0.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 900.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 0.00 1900.00)
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+)
+ )
+)
+ )
+)
+
Added: branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html (0 => 186944)
--- branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html 2015-07-17 05:33:22 UTC (rev 186944)
@@ -0,0 +1,87 @@
+!DOCTYPE html
+
+html
+head
+style
+body {
+height: 2000px;
+width: 1000px;
+}
+
+.fixed {
+position: fixed;
+height: 100px;
+width: 100px;
+background-color: rgba(0, 0, 0, 0.5);
+}
+
+.top, .bottom {
+left: 0;
+width: 100%;
+}
+
+.left, .right {
+top: 200px;
+}
+
+.top {
+top: 0;
+}
+
+.bottom {
+bottom: 0;
+}
+.left {
+left: 0;
+}
+.right {
+right: 0;
+}
+/style
+script
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+if (window.internals) {
+internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+internals.setUseFixedLayout(true);
+internals.setFixedLayoutSize(1000, 2000);
+var scale = 800 / 1000;
+eventSender.scalePageBy(scale, scale);
+}
+
+function doTest()
+{
+window.setTimeout(function() {
+document.getElementById(layerTree).innerText = window.internals.layerTreeAsText(document);
+testRunner.notifyDone();
+}, 0);
+}
+
+window.addEventListener('load', doTest, false);
+/script
+/head
+body
+
+div class=top fixed
+Top
+/div
+
+div class=left fixed
+Left
+/div
+
+div class=right fixed
+Right
+/div
+
+div class=bottom fixed
+bottom
+/div
+
+pre id=layerTree/pre
+/body
+/html
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog
[webkit-changes] [186930] branches/safari-601.1-branch/Source/WebKit2
Title: [186930] branches/safari-601.1-branch/Source/WebKit2
Revision 186930
Author matthew_han...@apple.com
Date 2015-07-16 22:32:29 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186812. rdar://problem/21818117
Modified Paths
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186929 => 186930)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:26 UTC (rev 186929)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:29 UTC (rev 186930)
@@ -1,5 +1,22 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186812. rdar://problem/21818117
+
+2015-07-14 Sam Weinig s...@webkit.org
+
+WebKit needs to serialize numeric values in NSError userInfo
+rdar://problem/21818117
+https://bugs.webkit.org/show_bug.cgi?id=146936
+
+Reviewed by Anders Carlsson.
+
+* Shared/mac/WebCoreArgumentCodersMac.mm:
+(IPC::ArgumentCoderResourceError::encodePlatformData):
+Encode userInfo values that are NSNumbers in addition to NSStrings and NSURLs. Decoding
+is already handled.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186786. rdar://problem/9222837
2015-07-13 Simon Fraser simon.fra...@apple.com
Modified: branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (186929 => 186930)
--- branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-17 05:32:26 UTC (rev 186929)
+++ branches/safari-601.1-branch/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2015-07-17 05:32:29 UTC (rev 186930)
@@ -212,7 +212,7 @@
RetainPtrCFMutableDictionaryRef filteredUserInfo = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, userInfo.count, kCFTypeDictionaryKeyCallBacks, kCFTypeDictionaryValueCallBacks));
[userInfo enumerateKeysAndObjectsUsingBlock:^(id key, id value, BOOL*) {
-if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]])
+if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSURL class]] || [value isKindOfClass:[NSNumber class]])
CFDictionarySetValue(filteredUserInfo.get(), key, value);
}];
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186934] branches/safari-601.1-branch/Source/WebCore
Title: [186934] branches/safari-601.1-branch/Source/WebCore
Revision 186934
Author matthew_han...@apple.com
Date 2015-07-16 22:32:42 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186837. rdar://problem/21774358
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css
branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186933 => 186934)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:39 UTC (rev 186933)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:42 UTC (rev 186934)
@@ -1,5 +1,39 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186837. rdar://problem/21774358
+
+2015-07-14 Dean Jackson d...@apple.com
+
+Placeholder colors should be system grays
+https://bugs.webkit.org/show_bug.cgi?id=146955
+rdar://problem/21774358
+
+Reviewed by Sam Weinig.
+
+Update the PiP and Airplay placards to use the correct shades
+of gray.
+
+* Modules/mediacontrols/mediaControlsApple.css: No need to specify the
+font here, nor have rules for Picture in Picture, which isn't available
+on OS X.
+(audio::-webkit-media-controls-time-remaining-display): We should specify
+font style here.
+(video:-webkit-full-screen::-webkit-media-controls-panel): Drive-by cleanup.
+(audio::-webkit-media-controls-wireless-playback-status): Use a gray background
+and system gray for text and artwork.
+(audio::-webkit-media-controls-wireless-playback-status.small): Ditto.
+(audio::-webkit-media-controls-picture-in-picture-button): Deleted (not on OS X).
+(audio::-webkit-media-controls-wireless-playback-text-top): Deleted use of background color.
+(audio::-webkit-media-controls-wireless-playback-text-bottom): Ditto..
+
+* Modules/mediacontrols/mediaControlsiOS.css: Use a gray background
+and system gray for text and artwork.
+(audio::-webkit-media-controls-wireless-playback-status):
+(audio::-webkit-media-controls-wireless-playback-text-top):
+(audio::-webkit-media-controls-wireless-playback-status.picture-in-picture):
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186828. rdar://problem/19925709
2015-07-14 Andreas Kling akl...@apple.com
Modified: branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css (186933 => 186934)
--- branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-07-17 05:32:39 UTC (rev 186933)
+++ branches/safari-601.1-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css 2015-07-17 05:32:42 UTC (rev 186934)
@@ -56,7 +56,6 @@
-webkit-align-items: stretch;
-webkit-justify-content: flex-end;
-webkit-flex-direction: column;
-font: -webkit-small-control;
white-space: nowrap;
-webkit-font-smoothing: subpixel-antialiased;
}
@@ -469,12 +468,6 @@
margin-top: 6px;
}
-video::-webkit-media-controls-picture-in-picture-button,
-audio::-webkit-media-controls-picture-in-picture-button {
-background-image: url('data:image/svg+xml,svg xmlns=http://www.w3.org/2000/svg viewBox=0 0 15 15 transform=rotate(90,0,0)linearGradient id=gradient x2=0 y2=100% gradientUnits=userSpaceOnUsestop offset=0 stop-color=rgb(216, 216, 216)/stop offset=0.4375 stop-color=rgb(216, 216, 216)/stop offset=0.4375 stop-color=rgb(208, 208, 208)/stop offset=0.5 stop-color=rgb(208, 208, 208)/stop offset=0.5 stop-color=rgb(200, 200, 200)/stop offset=1 stop-color=rgb(208, 208, 208)//linearGradientpath d=M 7,8 m 0,6 -2,-2 -2,2 c 0,0 -1,1 -2,0 -1,-1 0,-2 0,-2 l 2,-2 -2,-2 6,0 z style=fill:url(#gradient) /path d=M 8,7 m 0,-6 2,2 2,-2 c 0,0 1,-1 2,0 1,1 0,2 0
,2 l -2,2 2,2 -6,0 z style=fill:url(#gradient) //svg');
-margin: 0 7px;
-}
-
video::-webkit-media-controls-status-display,
audio::-webkit-media-controls-status-display {
cursor: default;
@@ -542,6 +535,9 @@
position: relative;
bottom: 0.5px;
font-family: -apple-system-monospaced-numbers;
+font-size: 11px !important;
+font-style: normal !important;
+font-weight: normal !important;
-webkit-text-size-adjust: none;
}
@@ -651,18 +647,18 @@
/* Full Screen */
-/*
+/*
Page stylesheets are not allowed to override the style of media
controls while in full screen mode, so many if not all the rules
defined in this section will be marked as !important to enforce
-this restriction
+this restriction
*/
video:-webkit-full-screen::-webkit-media-controls-panel {
-webkit-align-items: flex-start !important;
[webkit-changes] [186929] branches/safari-601.1-branch
Title: [186929] branches/safari-601.1-branch Revision 186929 Author matthew_han...@apple.com Date 2015-07-16 22:32:26 -0700 (Thu, 16 Jul 2015) Log Message Merge r186807. rdar://problem/21782350 Modified Paths branches/safari-601.1-branch/LayoutTests/ChangeLog branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt branches/safari-601.1-branch/Source/WebCore/ChangeLog branches/safari-601.1-branch/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp Added Paths branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain.html branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain.html.json branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-expected.txt branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-iframe-expected.txt branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-iframe.html branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-iframe.html.json branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect.php branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain-redirect.php.json branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain.html branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-unless-domain.html.json branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/resources/block-everything-unless-domain-helper.html branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/resources/should-load.html branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/resources/should-not-load.html Diff Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186928 => 186929) --- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:19 UTC (rev 186928) +++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:26 UTC (rev 186929) @@ -1,3 +1,31 @@ +2015-07-16 Matthew Hanson matthew_han...@apple.com + +Merge r186807. rdar://problem/21782350 + +2015-07-14 Alex Christensen achristen...@webkit.org + +[Content Extensions] Fix if-domain and unless-domain when loading main documents. +https://bugs.webkit.org/show_bug.cgi?id=146868 + +Reviewed by Benjamin Poulain. + +* http/tests/contentextensions/block-everything-if-domain-expected.txt: Added. +* http/tests/contentextensions/block-everything-if-domain.html: Added. +* http/tests/contentextensions/block-everything-if-domain.html.json: Added. +* http/tests/contentextensions/block-everything-unless-domain-expected.txt: Added. +* http/tests/contentextensions/block-everything-unless-domain-iframe-expected.txt: Added. +* http/tests/contentextensions/block-everything-unless-domain-iframe.html: Added. +* http/tests/contentextensions/block-everything-unless-domain-iframe.html.json: Added. +* http/tests/contentextensions/block-everything-unless-domain-redirect-expected.txt: Added. +* http/tests/contentextensions/block-everything-unless-domain-redirect.php: Added. +* http/tests/contentextensions/block-everything-unless-domain-redirect.php.json: Added. +* http/tests/contentextensions/block-everything-unless-domain.html: Added. +* http/tests/contentextensions/block-everything-unless-domain.html.json: Added. +* http/tests/contentextensions/main-resource-redirect-blocked-expected.txt: +* http/tests/contentextensions/resources/block-everything-unless-domain-helper.html: Added. +* http/tests/contentextensions/resources/should-load.html: Added. +* http/tests/contentextensions/resources/should-not-load.html: Added. + 2015-07-12 Babak Shafiei bshaf...@apple.com Merge r186741. Added: branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt (0 => 186929) --- branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt (rev 0) +++ branches/safari-601.1-branch/LayoutTests/http/tests/contentextensions/block-everything-if-domain-expected.txt 2015-07-17 05:32:26 UTC (rev 186929) @@ -0,0 +1,6 @@ +CONSOLE MESSAGE: Content blocker prevented frame displaying
[webkit-changes] [186928] branches/safari-601.1-branch/Source
Title: [186928] branches/safari-601.1-branch/Source
Revision 186928
Author matthew_han...@apple.com
Date 2015-07-16 22:32:19 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186786. rdar://problem/9222837
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/page/FrameView.cpp
branches/safari-601.1-branch/Source/WebCore/page/FrameView.h
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186927 => 186928)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 03:59:31 UTC (rev 186927)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:19 UTC (rev 186928)
@@ -1,3 +1,27 @@
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
+Merge r186786. rdar://problem/9222837
+
+2015-07-13 Simon Fraser simon.fra...@apple.com
+
+[iOS WK2] When choosing an initial viewport scale, take overflow on the body into account
+https://bugs.webkit.org/show_bug.cgi?id=146918
+rdar://problem/9222837
+
+Reviewed by Tim Horton.
+
+Use as input to the viewport scaling algorithm a contents size from the FrameView
+that takes overflow on the viewport renderer into account. This prevents unexpected
+viewports scaling on pages that have content that overflows their expressed contents size,
+but apply overflow to the body.
+
+* page/FrameView.cpp:
+(WebCore::FrameView::contentsSizeRespectingOverflow): Look for overflow:hidden on each axis of
+the m_viewportRenderer, which is computed post-layout by calculateScrollbarModesForLayout()
+and is used for scrollbar logic on OS X. Clip unscaledDocumentRect on each axis, and then
+apply page scale.
+* page/FrameView.h:
+
2015-07-16 Lucas Forschler lforsch...@apple.com
Merge r186764. rdar://problem/20923632
Modified: branches/safari-601.1-branch/Source/WebCore/page/FrameView.cpp (186927 => 186928)
--- branches/safari-601.1-branch/Source/WebCore/page/FrameView.cpp 2015-07-17 03:59:31 UTC (rev 186927)
+++ branches/safari-601.1-branch/Source/WebCore/page/FrameView.cpp 2015-07-17 05:32:19 UTC (rev 186928)
@@ -617,6 +617,29 @@
setContentsSize(size);
}
+IntSize FrameView::contentsSizeRespectingOverflow() const
+{
+RenderView* renderView = this-renderView();
+if (!renderView || !m_viewportRenderer || !isRenderBox(m_viewportRenderer) || !frame().isMainFrame())
+return contentsSize();
+
+ASSERT(frame().view() == this);
+
+FloatRect contentRect = renderView-unscaledDocumentRect();
+RenderBox viewportRendererBox = downcastRenderBox(*m_viewportRenderer);
+
+if (m_viewportRenderer-style().overflowX() == OHIDDEN)
+contentRect.setWidth(std::minfloat(contentRect.width(), viewportRendererBox.frameRect().width()));
+
+if (m_viewportRenderer-style().overflowY() == OHIDDEN)
+contentRect.setHeight(std::minfloat(contentRect.height(), viewportRendererBox.frameRect().height()));
+
+if (renderView-hasTransform())
+contentRect = renderView-layer()-currentTransform().mapRect(contentRect);
+
+return IntSize(contentRect.size());
+}
+
void FrameView::applyOverflowToViewport(RenderElement* renderer, ScrollbarMode hMode, ScrollbarMode vMode)
{
// Handle the overflow:hidden/scroll case for the body/html elements. WinIE treats
Modified: branches/safari-601.1-branch/Source/WebCore/page/FrameView.h (186927 => 186928)
--- branches/safari-601.1-branch/Source/WebCore/page/FrameView.h 2015-07-17 03:59:31 UTC (rev 186927)
+++ branches/safari-601.1-branch/Source/WebCore/page/FrameView.h 2015-07-17 05:32:19 UTC (rev 186928)
@@ -105,6 +105,8 @@
virtual void setContentsSize(const IntSize) override;
virtual void updateContentsSize() override;
+WEBCORE_EXPORT IntSize contentsSizeRespectingOverflow() const;
+
void layout(bool allowSubtree = true);
WEBCORE_EXPORT bool didFirstLayout() const;
void layoutTimerFired();
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186927 => 186928)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 03:59:31 UTC (rev 186927)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:19 UTC (rev 186928)
@@ -1,3 +1,24 @@
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
+Merge r186786. rdar://problem/9222837
+
+2015-07-13 Simon Fraser simon.fra...@apple.com
+
+[iOS WK2] When choosing an initial viewport scale, take overflow on the body into account
+https://bugs.webkit.org/show_bug.cgi?id=146918
+rdar://problem/9222837
+
+Reviewed by Tim Horton.
+
+Use as input to the viewport scaling algorithm a contents size from the
[webkit-changes] [186935] branches/safari-601.1-branch
Title: [186935] branches/safari-601.1-branch
Revision 186935
Author matthew_han...@apple.com
Date 2015-07-16 22:32:47 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186840. rdar://problem/21823681
Modified Paths
branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/css/CSSParser.cpp
branches/safari-601.1-branch/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp
Added Paths
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat-expected.txt
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat.html
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat-expected.txt
branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat.html
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186934 => 186935)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:42 UTC (rev 186934)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:47 UTC (rev 186935)
@@ -1,5 +1,25 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186840. rdar://problem/21823681
+
+2015-07-15 Wenson Hsieh wenson_hs...@apple.com
+
+Negative scroll snap repeat values cause web process to hang indefinitely
+https://bugs.webkit.org/show_bug.cgi?id=146953
+
+Reviewed by Simon Fraser.
+
+The first test case checks that setting -scroll-snap-points-x or -y to a negative value
+will not cause the web process to hang. The second test case (in a similar vein) checks
+that tiny subpixel snap repeats generate a reasonable number of snap offsets.
+
+* css3/scroll-snap/scroll-snap-negative-repeat-expected.txt: Added.
+* css3/scroll-snap/scroll-snap-negative-repeat.html: Added.
+* css3/scroll-snap/scroll-snap-subpixel-repeat-expected.txt: Added.
+* css3/scroll-snap/scroll-snap-subpixel-repeat.html: Added.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186827. rdar://problem/21736723
2015-07-14 Antti Koivisto an...@apple.com
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat-expected.txt (0 => 186935)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat-expected.txt 2015-07-17 05:32:47 UTC (rev 186935)
@@ -0,0 +1,9 @@
+Tests that negative repeat() values don't hang on snap point computation.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat.html (0 => 186935)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-negative-repeat.html 2015-07-17 05:32:47 UTC (rev 186935)
@@ -0,0 +1,21 @@
+!DOCTYPE html
+html
+head
+style
+body {
+-webkit-scroll-snap-type: mandatory;
+-webkit-scroll-snap-points-y: repeat(-400px);
+height: 5000px;
+}
+/style
+script src=""
+/head
+body
+div id=console/div
+script
+description(Tests that negative repeat() values don't hang on snap point computation.);
+/script
+script src=""
+/body
+/html
+
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat-expected.txt (0 => 186935)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat-expected.txt 2015-07-17 05:32:47 UTC (rev 186935)
@@ -0,0 +1,13 @@
+Tests that small positive repeat() values generates a reasonable number of snap offsets.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Number of snap offsets: 99
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat.html (0 => 186935)
--- branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/css3/scroll-snap/scroll-snap-subpixel-repeat.html 2015-07-17 05:32:47 UTC (rev 186935)
@@ -0,0 +1,71 @@
+!DOCTYPE html
+html
+head
+style
+#gallery {
+height: 100px;
+
[webkit-changes] [186932] branches/safari-601.1-branch
Title: [186932] branches/safari-601.1-branch
Revision 186932
Author matthew_han...@apple.com
Date 2015-07-16 22:32:36 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186827. rdar://problem/21736723
Modified Paths
branches/safari-601.1-branch/LayoutTests/ChangeLog
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/graphics/FontCascadeFonts.cpp
branches/safari-601.1-branch/Source/WebCore/platform/graphics/FontRanges.cpp
branches/safari-601.1-branch/Source/WebCore/platform/graphics/FontRanges.h
Added Paths
branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html
branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186931 => 186932)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:31 UTC (rev 186931)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:32:36 UTC (rev 186932)
@@ -1,5 +1,19 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186827. rdar://problem/21736723
+
+2015-07-14 Antti Koivisto an...@apple.com
+
+REGRESSION (r177876): store.apple.com profile and cart icons are missing
+https://bugs.webkit.org/show_bug.cgi?id=146894
+
+Reviewed by Myles C. Maxfield.
+
+* fast/css/font-face-multiple-missing-glyphs-expected.html: Added.
+* fast/css/font-face-multiple-missing-glyphs.html: Added.
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186807. rdar://problem/21782350
2015-07-14 Alex Christensen achristen...@webkit.org
Added: branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html (0 => 186932)
--- branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs-expected.html 2015-07-17 05:32:36 UTC (rev 186932)
@@ -0,0 +1,7 @@
+!DOCTYPE html
+html
+body
+This test makes sure we search through all font-face declarations in order to find a working font.
+div style=font: 200px 'Heiti SC'; -webkit-line-box-contain: font;#x6c49;/div
+/body
+/html
Added: branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html (0 => 186932)
--- branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/fast/css/font-face-multiple-missing-glyphs.html 2015-07-17 05:32:36 UTC (rev 186932)
@@ -0,0 +1,27 @@
+!DOCTYPE html
+html
+head
+style
+@font-face {
+font-family: WebFont;
+/* Any font which has a smaller ascent than Heiti SC can be used here */
+src: local(Palatino-Roman);
+}
+
+@font-face {
+font-family: WebFont;
+/* This font must not be the default fallback font for U+6c49 */
+src: local(Heiti SC);
+}
+
+@font-face {
+font-family: WebFont;
+src: local(Palatino-Roman);
+}
+/style
+/head
+body
+This test makes sure we search through all font-face declarations in order to find a working font.
+div style=font: 200px WebFont; -webkit-line-box-contain: font;#x6c49;/div
+/body
+/html
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186931 => 186932)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:31 UTC (rev 186931)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:36 UTC (rev 186932)
@@ -1,5 +1,40 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186827. rdar://problem/21736723
+
+2015-07-14 Antti Koivisto an...@apple.com
+
+REGRESSION (r177876): store.apple.com profile and cart icons are missing
+https://bugs.webkit.org/show_bug.cgi?id=146894
+
+Reviewed by Myles C. Maxfield.
+
+If we had several @font-face rules for the same face covering overlapping ranges we
+would only try to get glyphs from the first one. If it didn't have the glyph we wouldn't
+try the other ones.
+
+Test: fast/css/font-face-multiple-missing-glyphs.html
+
+* platform/graphics/FontCascadeFonts.cpp:
+(WebCore::FontCascadeFonts::glyphDataForVariant):
+(WebCore::FontCascadeFonts::glyphDataForNormalVariant):
+
+Get GlyphData with one call.
+
+* platform/graphics/FontRanges.cpp:
+(WebCore::FontRanges::~FontRanges):
+(WebCore::FontRanges::glyphDataForCharacter):
+
+Check that we actually have a glyph in the font for the character before returning it.
+
+(WebCore::FontRanges::fontForCharacter):
+(WebCore::FontRanges::fontForFirstRange):
+* platform/graphics/FontRanges.h:
+
[webkit-changes] [186931] branches/safari-601.1-branch/Source/WebKit2
Title: [186931] branches/safari-601.1-branch/Source/WebKit2
Revision 186931
Author matthew_han...@apple.com
Date 2015-07-16 22:32:31 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186814. rdar://problem/21605505
Modified Paths
branches/safari-601.1-branch/Source/WebKit2/ChangeLog
branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (186930 => 186931)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:29 UTC (rev 186930)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-17 05:32:31 UTC (rev 186931)
@@ -1,5 +1,20 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186814. rdar://problem/21605505
+
+2015-07-14 Anders Carlsson ander...@apple.com
+
+Release assert under StyleResolver::loadPendingImages() caused by MemoryPressureHandler
+https://bugs.webkit.org/show_bug.cgi?id=146940
+rdar://problem/21605505
+
+Reviewed by Sam Weinig.
+
+* WebProcess/WebProcess.cpp:
+(WebKit::WebProcess::processWillSuspendImminently):
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186812. rdar://problem/21818117
2015-07-14 Sam Weinig s...@webkit.org
Modified: branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp (186930 => 186931)
--- branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-17 05:32:29 UTC (rev 186930)
+++ branches/safari-601.1-branch/Source/WebKit2/WebProcess/WebProcess.cpp 2015-07-17 05:32:31 UTC (rev 186931)
@@ -1242,6 +1242,14 @@
void WebProcess::processWillSuspendImminently(bool handled)
{
+if (parentProcessConnection()-inSendSync()) {
+// Avoid reentrency bugs such as rdar://problem/21605505 by just bailing
+// if we get an incoming ProcessWillSuspendImminently message when waiting for a
+// reply to a sync message.
+// FIXME: ProcessWillSuspendImminently should not be a sync message.
+return;
+}
+
supplementWebDatabaseManager()-closeAllDatabases();
actualPrepareToSuspend(ShouldAcknowledgeWhenReadyToSuspend::No);
handled = true;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186936] branches/safari-601.1-branch/Source/WebCore
Title: [186936] branches/safari-601.1-branch/Source/WebCore
Revision 186936
Author matthew_han...@apple.com
Date 2015-07-16 22:32:50 -0700 (Thu, 16 Jul 2015)
Log Message
Merge r186857. rdar://problem/21840845
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186935 => 186936)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:47 UTC (rev 186935)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:50 UTC (rev 186936)
@@ -1,5 +1,25 @@
2015-07-16 Matthew Hanson matthew_han...@apple.com
+Merge r186857. rdar://problem/21840845
+
+2015-07-15 Enrica Casucci enr...@apple.com
+
+[iOS] Should look for RTF and RTFD pasteboard types before plain text.
+https://bugs.webkit.org/show_bug.cgi?id=146971
+rdar://problem/21840845
+
+Reviewed by Sam Weinig.
+
+The list of pasteboard types returned by supportedPasteboardTypes
+determines the order in which WebKit looks for data in the pasteboard
+to create a fragment. The incorrect order could make plain text to
+be preferred over rich format.
+
+* platform/ios/PasteboardIOS.mm:
+(WebCore::Pasteboard::supportedPasteboardTypes):
+
+2015-07-16 Matthew Hanson matthew_han...@apple.com
+
Merge r186840. rdar://problem/21823681
2015-07-15 Wenson Hsieh wenson_hs...@apple.com
Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm (186935 => 186936)
--- branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm 2015-07-17 05:32:47 UTC (rev 186935)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/PasteboardIOS.mm 2015-07-17 05:32:50 UTC (rev 186936)
@@ -246,7 +246,7 @@
NSArray* Pasteboard::supportedPasteboardTypes()
{
-return @[(id)WebArchivePboardType, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText, (id)kUTTypeRTFD, (id)kUTTypeRTF];
+return @[(id)WebArchivePboardType, (id)kUTTypeRTFD, (id)kUTTypeRTF, (id)kUTTypeHTML, (id)kUTTypePNG, (id)kUTTypeTIFF, (id)kUTTypeJPEG, (id)kUTTypeGIF, (id)kUTTypeURL, (id)kUTTypeText];
}
bool Pasteboard::hasData()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186933] branches/safari-601.1-branch/Source/WebCore
Title: [186933] branches/safari-601.1-branch/Source/WebCore Revision 186933 Author matthew_han...@apple.com Date 2015-07-16 22:32:39 -0700 (Thu, 16 Jul 2015) Log Message Merge r186828. rdar://problem/19925709 Modified Paths branches/safari-601.1-branch/Source/WebCore/ChangeLog branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp Diff Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186932 => 186933) --- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:36 UTC (rev 186932) +++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:32:39 UTC (rev 186933) @@ -1,5 +1,25 @@ 2015-07-16 Matthew Hanson matthew_han...@apple.com +Merge r186828. rdar://problem/19925709 + +2015-07-14 Andreas Kling akl...@apple.com + +Don't persist history item tree for subframes across reloads. +https://webkit.org/b/146937 +rdar://problem/19925709 + +Reviewed by Brady Eidson. + +Throw away the subframe history items when reloading a page. This ensures that we +don't accumulate outdated frame metadata when subframes change name across page loads. +Since the history item tree is encoded in the UA session state and gets serialized to +disk, it's important that we don't let it grow unbounded. + +* loader/HistoryController.cpp: +(WebCore::HistoryController::updateForReload): + +2015-07-16 Matthew Hanson matthew_han...@apple.com + Merge r186827. rdar://problem/21736723 2015-07-14 Antti Koivisto an...@apple.com Modified: branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp (186932 => 186933) --- branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp 2015-07-17 05:32:36 UTC (rev 186932) +++ branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp 2015-07-17 05:32:39 UTC (rev 186933) @@ -342,6 +342,9 @@ if (m_frame.loader().loadType() == FrameLoadType::Reload || m_frame.loader().loadType() == FrameLoadType::ReloadFromOrigin) saveScrollPositionAndViewStateToItem(m_currentItem.get()); + +// Rebuild the history item tree when reloading as trying to re-associate everything is too error-prone. +m_currentItem-clearChildren(); } // When reloading the page, we may end up redirecting to a different URL ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186926] trunk/Source/WebInspectorUI
Title: [186926] trunk/Source/WebInspectorUI
Revision 186926
Author commit-qu...@webkit.org
Date 2015-07-16 20:59:22 -0700 (Thu, 16 Jul 2015)
Log Message
Web Inspector: REGRESSION (r186218) ScriptTimelineRecord attempts to access null property
https://bugs.webkit.org/show_bug.cgi?id=147025
Patch by Joseph Pecoraro pecor...@apple.com on 2015-07-16
Reviewed by Timothy Hatcher.
The issue here was two ScriptTimelineRecord's were created for the same
profile payload. When the first ScriptTimelineRecord processed the
payload to create a Profile we modified the payload, then when the
second ScriptTimelineRecord tries to process the payload the data is
in an unexpected state and it crashes.
The solution here is to stash the result on the payload, so when the
payload is shared we can just immediately jump to the resulting Profile.
The longer term solution will be to share higher level objects and not
attempt to process the payload multiple times. That is tracked by:
https://webkit.org/b/147029 Web Inspector: Better share objects generated from timeline events (Records)
* UserInterface/Models/ScriptTimelineRecord.js:
(WebInspector.ScriptTimelineRecord.prototype._initializeProfileFromPayload):
When processing the profile payload, store the Profile on the payload
so if another ScriptTimelineRecord has that payload they can avoid
re-processing it.
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (186925 => 186926)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-17 03:55:20 UTC (rev 186925)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-17 03:59:22 UTC (rev 186926)
@@ -1,5 +1,30 @@
2015-07-16 Joseph Pecoraro pecor...@apple.com
+Web Inspector: REGRESSION (r186218) ScriptTimelineRecord attempts to access null property
+https://bugs.webkit.org/show_bug.cgi?id=147025
+
+Reviewed by Timothy Hatcher.
+
+The issue here was two ScriptTimelineRecord's were created for the same
+profile payload. When the first ScriptTimelineRecord processed the
+payload to create a Profile we modified the payload, then when the
+second ScriptTimelineRecord tries to process the payload the data is
+in an unexpected state and it crashes.
+
+The solution here is to stash the result on the payload, so when the
+payload is shared we can just immediately jump to the resulting Profile.
+The longer term solution will be to share higher level objects and not
+attempt to process the payload multiple times. That is tracked by:
+https://webkit.org/b/147029 Web Inspector: Better share objects generated from timeline events (Records)
+
+* UserInterface/Models/ScriptTimelineRecord.js:
+(WebInspector.ScriptTimelineRecord.prototype._initializeProfileFromPayload):
+When processing the profile payload, store the Profile on the payload
+so if another ScriptTimelineRecord has that payload they can avoid
+re-processing it.
+
+2015-07-16 Joseph Pecoraro pecor...@apple.com
+
Web Inspector: Total Size of Resources number in dashboard is wrong (does not update during load)
https://bugs.webkit.org/show_bug.cgi?id=147027
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js (186925 => 186926)
--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-07-17 03:55:20 UTC (rev 186925)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptTimelineRecord.js 2015-07-17 03:59:22 UTC (rev 186926)
@@ -73,6 +73,13 @@
if (this._profile || !this._profilePayload)
return;
+// FIXME: https://webkit.org/b/147029 Web Inspector: Better share objects generated from timeline events (Records)
+if (this._profilePayload.__profile) {
+this._profile = this._profilePayload.__profile;
+this._profilePayload = undefined;
+return;
+}
+
var payload = this._profilePayload;
this._profilePayload = undefined;
@@ -144,7 +151,7 @@
}
}
-this._profile = new WebInspector.Profile(rootNodes);
+this._profile = payload.__profile = new WebInspector.Profile(rootNodes);
}
};
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186927] trunk/Tools
Title: [186927] trunk/Tools Revision 186927 Author commit-qu...@webkit.org Date 2015-07-16 20:59:31 -0700 (Thu, 16 Jul 2015) Log Message webkit-patch uses incorrect credentials from keychain to login until account lockout https://bugs.webkit.org/show_bug.cgi?id=146923 Patch by Dean Johnson dean_john...@apple.com on 2015-07-16 Reviewed by Daniel Bates. When `webkit-patch upload` asks for login credentials for bugs.webkit.org, if you provide incorrect credentials then ask for them to be saved to the keychain webkit-patch will then use those incorrect credentials until 5 total attempts have been made to log in. This will lock the user out of Bugzilla for a half hour. * Scripts/webkitpy/common/net/bugzilla/bugzilla.py: (Bugzilla.authenticate): Added argument to read_credentials() that passes in whether or not to use stored credentials. * Scripts/webkitpy/common/net/credentials.py: (Credentials.read_credentials): Added optional argument 'use_stored_credentials' that specifies whether or not to use credentials stored on the system. If it does, we do not auto-fill credentials since either the credentials caused the failure, or they weren't used in the first place so there is no reason to try and use them again if a failure happened. * Scripts/webkitpy/common/net/credentials_unittest.py: Added unit test for newly added use_stored_credentials argument. (test_do_not_use_stored_credentials): Added unit test to make sure functions that retrieve username/password information from the local system (environment, Git, keychain, keyring) are never called. It also tests that we get back our mocked username and password. (test_do_not_use_stored_credentials.MockKeyring): Mock keyring (test_do_not_use_stored_credentials.MockKeyring.get_password): Assert this is never called. (test_do_not_use_stored_credentials.FakeCredentials): Mock credentials (test_do_not_use_stored_credentials.FakeCredentials._credentials_from_keychain): Assert this is never called. (test_do_not_use_stored_credentials.FakeCredentials._credentials_from_environment): Ditto (test_do_not_use_stored_credentials.FakeCredentials._offer_to_store_credentials_in_keyring): Ditto (test_do_not_use_stored_credentials.FakeUser): Mock the User class (test_do_not_use_stored_credentials.FakeUser.prompt): Returns a username to assert against. (test_do_not_use_stored_credentials.FakeUser.prompt_password): Returns a password to assert against. Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py trunk/Tools/Scripts/webkitpy/common/net/credentials.py trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py Diff Modified: trunk/Tools/ChangeLog (186926 => 186927) --- trunk/Tools/ChangeLog 2015-07-17 03:59:22 UTC (rev 186926) +++ trunk/Tools/ChangeLog 2015-07-17 03:59:31 UTC (rev 186927) @@ -1,3 +1,42 @@ +2015-07-16 Dean Johnson dean_john...@apple.com + +webkit-patch uses incorrect credentials from keychain to login until account lockout +https://bugs.webkit.org/show_bug.cgi?id=146923 + +Reviewed by Daniel Bates. + +When `webkit-patch upload` asks for login credentials for bugs.webkit.org, if you +provide incorrect credentials then ask for them to be saved to the keychain +webkit-patch will then use those incorrect credentials until 5 total attempts +have been made to log in. This will lock the user out of Bugzilla for a +half hour. + +* Scripts/webkitpy/common/net/bugzilla/bugzilla.py: +(Bugzilla.authenticate): Added argument to read_credentials() that +passes in whether or not to use stored credentials. +* Scripts/webkitpy/common/net/credentials.py: +(Credentials.read_credentials): Added optional argument 'use_stored_credentials' +that specifies whether or not to use credentials stored on the system. If it +does, we do not auto-fill credentials since either the credentials caused +the failure, or they weren't used in the first place so there is no reason +to try and use them again if a failure happened. +* Scripts/webkitpy/common/net/credentials_unittest.py: Added unit test for newly added +use_stored_credentials argument. +(test_do_not_use_stored_credentials): Added unit test to make sure functions that +retrieve username/password information from the local system (environment, Git, keychain, +keyring) are never called. It also tests that we get back our mocked username and password. +(test_do_not_use_stored_credentials.MockKeyring): Mock keyring +(test_do_not_use_stored_credentials.MockKeyring.get_password): Assert this is never called. +(test_do_not_use_stored_credentials.FakeCredentials): Mock credentials +(test_do_not_use_stored_credentials.FakeCredentials._credentials_from_keychain): Assert this +is never called. +
[webkit-changes] [186920] trunk/Source/JavaScriptCore
Title: [186920] trunk/Source/_javascript_Core
Revision 186920
Author mark@apple.com
Date 2015-07-16 19:27:22 -0700 (Thu, 16 Jul 2015)
Log Message
RegExp::match() should set m_state to ByteCode if compilation fails.
https://bugs.webkit.org/show_bug.cgi?id=147023
Reviewed by Michael Saboff.
A RegExp has a YarrCodeBlock that has 4 MacroAssemblerCodeRefs for compiled code.
If one of these compilations succeeds, RegExp::m_state will be set to JITCode.
Subsequently, if RegExp tries to compile another one of these but fails, m_state
will be left untouched i.e. it still says JITCode. As a result, when
RegExp::match() later tries to execute the non-existant compiled code, it will
crash.
The fix is to downgrade m_state to ByteCode if RegExp ever fails to compile.
This failure should be rare. We'll do the minimal work here to fix the issue and
keep an eye on the perf bots. If perf regresses, we can do some optimization work then.
This issue is difficult to test for since it either requires a low memory condition
to trigger a failed RegExp compilation at the right moment, or for the RegExp to
succeed compilation in the MatchedOnly mode but fail in IncludeSubpatterns mode.
Instead, I manually tested it by instrumenting RegExp::compile() to fail once in every
10 compilation attempts.
* runtime/RegExp.cpp:
(JSC::RegExp::compile):
(JSC::RegExp::compileMatchOnly):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/RegExp.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (186919 => 186920)
--- trunk/Source/_javascript_Core/ChangeLog 2015-07-17 00:29:03 UTC (rev 186919)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-07-17 02:27:22 UTC (rev 186920)
@@ -1,3 +1,31 @@
+2015-07-16 Mark Lam mark@apple.com
+
+RegExp::match() should set m_state to ByteCode if compilation fails.
+https://bugs.webkit.org/show_bug.cgi?id=147023
+
+Reviewed by Michael Saboff.
+
+A RegExp has a YarrCodeBlock that has 4 MacroAssemblerCodeRefs for compiled code.
+If one of these compilations succeeds, RegExp::m_state will be set to JITCode.
+Subsequently, if RegExp tries to compile another one of these but fails, m_state
+will be left untouched i.e. it still says JITCode. As a result, when
+RegExp::match() later tries to execute the non-existant compiled code, it will
+crash.
+
+The fix is to downgrade m_state to ByteCode if RegExp ever fails to compile.
+This failure should be rare. We'll do the minimal work here to fix the issue and
+keep an eye on the perf bots. If perf regresses, we can do some optimization work then.
+
+This issue is difficult to test for since it either requires a low memory condition
+to trigger a failed RegExp compilation at the right moment, or for the RegExp to
+succeed compilation in the MatchedOnly mode but fail in IncludeSubpatterns mode.
+Instead, I manually tested it by instrumenting RegExp::compile() to fail once in every
+10 compilation attempts.
+
+* runtime/RegExp.cpp:
+(JSC::RegExp::compile):
+(JSC::RegExp::compileMatchOnly):
+
2015-07-15 Brent Fulgham bfulg...@apple.com
[Win] Fix armv7 build.
Modified: trunk/Source/_javascript_Core/runtime/RegExp.cpp (186919 => 186920)
--- trunk/Source/_javascript_Core/runtime/RegExp.cpp 2015-07-17 00:29:03 UTC (rev 186919)
+++ trunk/Source/_javascript_Core/runtime/RegExp.cpp 2015-07-17 02:27:22 UTC (rev 186920)
@@ -289,22 +289,16 @@
#if ENABLE(YARR_JIT)
if (!pattern.m_containsBackreferences !pattern.containsUnsignedLengthPattern() vm-canUseRegExpJIT()) {
Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode);
-#if ENABLE(YARR_JIT_DEBUG)
-if (!m_regExpJITCode.isFallBack())
-m_state = JITCode;
-else
-m_state = ByteCode;
-#else
if (!m_regExpJITCode.isFallBack()) {
m_state = JITCode;
return;
}
-#endif
}
#else
UNUSED_PARAM(charSize);
#endif
+m_state = ByteCode;
m_regExpBytecode = Yarr::byteCompile(pattern, vm-m_regExpAllocator);
}
@@ -414,22 +408,16 @@
#if ENABLE(YARR_JIT)
if (!pattern.m_containsBackreferences !pattern.containsUnsignedLengthPattern() vm-canUseRegExpJIT()) {
Yarr::jitCompile(pattern, charSize, vm, m_regExpJITCode, Yarr::MatchOnly);
-#if ENABLE(YARR_JIT_DEBUG)
-if (!m_regExpJITCode.isFallBack())
-m_state = JITCode;
-else
-m_state = ByteCode;
-#else
if (!m_regExpJITCode.isFallBack()) {
m_state = JITCode;
return;
}
-#endif
}
#else
UNUSED_PARAM(charSize);
#endif
+m_state = ByteCode;
m_regExpBytecode = Yarr::byteCompile(pattern, vm-m_regExpAllocator);
}
___
webkit-changes mailing list
[webkit-changes] [186910] trunk
Title: [186910] trunk Revision 186910 Author benja...@webkit.org Date 2015-07-16 14:51:08 -0700 (Thu, 16 Jul 2015) Log Message [Content extensions] Combine suffixes when generating NFAs https://bugs.webkit.org/show_bug.cgi?id=146961 Patch by Benjamin Poulain bpoul...@apple.com on 2015-07-16 Reviewed by Alex Christensen. Source/WebCore: In this patch, I add a mechanism very similar to the prefix tree but for the suffix (called a reverse suffix tree here). The idea is here is to reuse the existing NFA nodes when generating a chain of suffix Term that were already generated previously. When generating a disjunction ending with the same suffix, we now have the same trailing NFA nodes for both sides of the disjunction. Mixing the prefix and suffix generation can be tricky, we do not want transitions from a pattern to creep into the suffix of an other. To avoid any conflict, the rules here are very simple: -Only use the reverse suffix tree for terms without actions up to a leaf term with actions. This rule ensure that no action will accidentally make its way to an other rule by resuing a vertex of the reverse suffix tree. -Only use the reverse suffix tree for chains of terms in which each term only has zero or one following term. With this condition, when taking any vertex of the reverse suffix tree, there is only one edge that move out of that vertex when reading from left to right. For any vertex, there is only one possible string generated left-to-right, a single suffix. This is overly restrictive but it is fast, easier to verify, and it works well in practice. For all the more complicated cases, we can count on the Minimizer to find a better solution. With all the simple suffixes merged, our NFAs are smaller, which let us combine more patterns. The DFAs are also smaller and faster to produce since their size is relative to the NFA sizes. Overall, I get the following gains: -Chris's test case: compile time -40%. bytecode size -14%. -Armand's test case: compile time -53%. bytecode size -13%. * WebCore.xcodeproj/project.pbxproj: * contentextensions/CombinedURLFilters.cpp: (WebCore::ContentExtensions::ActiveSubtree::ActiveSubtree): (WebCore::ContentExtensions::generateInfixUnsuitableForReverseSuffixTree): (WebCore::ContentExtensions::generateSuffixWithReverseSuffixTree): (WebCore::ContentExtensions::clearReverseSuffixTree): (WebCore::ContentExtensions::generateNFAForSubtree): * contentextensions/DFA.cpp: (WebCore::ContentExtensions::DFA::debugPrintDot): Forgot to close a tag, dot was not happy. * contentextensions/HashableActionList.h: Added. (WebCore::ContentExtensions::HashableActionList::HashableActionList): (WebCore::ContentExtensions::HashableActionList::isEmptyValue): (WebCore::ContentExtensions::HashableActionList::isDeletedValue): (WebCore::ContentExtensions::HashableActionList::operator==): (WebCore::ContentExtensions::HashableActionList::operator!=): (WebCore::ContentExtensions::HashableActionListHash::hash): (WebCore::ContentExtensions::HashableActionListHash::equal): We need a way to group reverse suffix tree by their terminal actions. This new hash structure lets us find unique vertex for a list of actions in any order. * contentextensions/ImmutableNFANodeBuilder.h: (WebCore::ContentExtensions::ImmutableNFANodeBuilder::isValid): (WebCore::ContentExtensions::ImmutableNFANodeBuilder::nodeId): (WebCore::ContentExtensions::ImmutableNFANodeBuilder::addTransition): (WebCore::ContentExtensions::ImmutableNFANodeBuilder::addEpsilonTransition): (WebCore::ContentExtensions::ImmutableNFANodeBuilder::ImmutableNFANodeBuilder): Deleted. (WebCore::ContentExtensions::ImmutableNFANodeBuilder::~ImmutableNFANodeBuilder): Deleted. (WebCore::ContentExtensions::ImmutableNFANodeBuilder::operator=): Deleted. * contentextensions/Term.h: (WebCore::ContentExtensions::Term::generateGraph): (WebCore::ContentExtensions::Term::generateSubgraphForAtom): Node building changes a bit. Previously, it was assumed nodes are always built from left to right. Getting the node on the right was done by providing the left node and the term doing the transition. Now we have both left to right and right to left generation. The right-to-left has a specific property: no edge can be added after it's initial term (rule 2 of our reverse suffix tree). This simplifies things a bit since we can finalize all the nodes in the suffix tree. All we need is to keep their ID to be able to link new nodes to the reverse suffix tree. Source/WTF: * wtf/Vector.h: (WTF::minCapacity::Vector): (WTF::=): Copying a vector with a different inline capacity was broken due to the addition of MinimumCapacity. This feature was needed by this patch so I fixed WTF. Tools: * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp: (TestWebKitAPI::compareContents): * TestWebKitAPI/Tests/WebCore/DFAMinimizer.cpp: Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Vector.h trunk/Source/WebCore/ChangeLog
[webkit-changes] [186909] trunk/Source/WebKit/mac
Title: [186909] trunk/Source/WebKit/mac
Revision 186909
Author simon.fra...@apple.com
Date 2015-07-16 14:50:50 -0700 (Thu, 16 Jul 2015)
Log Message
[iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
https://bugs.webkit.org/show_bug.cgi?id=146924
WebKit part of rdar://problem/21802456
Reviewed by Tim Horton.
Expose the FrameView's contentsSizeRespectingOverflow() via WebView, for use
by UIKit.
* WebView/WebView.mm:
(-[WebView _contentsSizeRespectingOverflow]):
* WebView/WebViewPrivate.h:
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit/mac/WebView/WebViewPrivate.h
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (186908 => 186909)
--- trunk/Source/WebKit/mac/ChangeLog 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-16 21:50:50 UTC (rev 186909)
@@ -1,3 +1,18 @@
+2015-07-13 Simon Fraser simon.fra...@apple.com
+
+[iOS] Expose contentsSizeRespectingOverflow() via WebView so UIWebView can use it
+https://bugs.webkit.org/show_bug.cgi?id=146924
+WebKit part of rdar://problem/21802456
+
+Reviewed by Tim Horton.
+
+Expose the FrameView's contentsSizeRespectingOverflow() via WebView, for use
+by UIKit.
+
+* WebView/WebView.mm:
+(-[WebView _contentsSizeRespectingOverflow]):
+* WebView/WebViewPrivate.h:
+
2015-07-14 Anders Carlsson ander...@apple.com
Remove wkPopupMenu from WebCoreSystemInterface; it's not called from WebCore
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (186908 => 186909)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-07-16 21:50:50 UTC (rev 186909)
@@ -1560,6 +1560,14 @@
return _private-page-renderTreeSize();
}
+- (NSSize)_contentsSizeRespectingOverflow
+{
+if (FrameView* view = [self _mainCoreFrame]-view())
+return view-contentsSizeRespectingOverflow();
+
+return self mainFrame] frameView] documentView] bounds].size;
+}
+
- (void)_dispatchTileDidDraw:(CALayer*)tile
{
id mailDelegate = [self _webMailDelegate];
Modified: trunk/Source/WebKit/mac/WebView/WebViewPrivate.h (186908 => 186909)
--- trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-16 21:40:12 UTC (rev 186908)
+++ trunk/Source/WebKit/mac/WebView/WebViewPrivate.h 2015-07-16 21:50:50 UTC (rev 186909)
@@ -442,6 +442,7 @@
- (DOMCSSStyleDeclaration *)styleAtSelectionStart;
- (NSUInteger)_renderTreeSize;
+- (NSSize)_contentsSizeRespectingOverflow;
/*!
* @method _handleMemoryWarning
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186915] trunk/Tools
Title: [186915] trunk/Tools
Revision 186915
Author wenson_hs...@apple.com
Date 2015-07-16 15:57:47 -0700 (Thu, 16 Jul 2015)
Log Message
Added myself to the list of contributors.
Reviewed by Brent Fulgham.
* Scripts/webkitpy/common/config/contributors.json:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json
Diff
Modified: trunk/Tools/ChangeLog (186914 => 186915)
--- trunk/Tools/ChangeLog 2015-07-16 22:50:50 UTC (rev 186914)
+++ trunk/Tools/ChangeLog 2015-07-16 22:57:47 UTC (rev 186915)
@@ -1,3 +1,11 @@
+2015-07-16 Wenson Hsieh wenson_hs...@apple.com
+
+Added myself to the list of contributors.
+
+Reviewed by Brent Fulgham.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
2015-07-16 Alex Christensen achristen...@webkit.org
[Content Extensions] Cache domain actions
Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (186914 => 186915)
--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2015-07-16 22:50:50 UTC (rev 186914)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2015-07-16 22:57:47 UTC (rev 186915)
@@ -2826,6 +2826,15 @@
seumas
]
},
+ Wenson Hsieh : {
+ emails : [
+wenson_hs...@apple.com,
+whs...@berkeley.edu
+ ],
+ nicks : [
+whsieh
+ ]
+ },
William Siegrist : {
emails : [
wsiegr...@apple.com
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186908] trunk/Source/WebInspectorUI
Title: [186908] trunk/Source/WebInspectorUI Revision 186908 Author ago...@igalia.com Date 2015-07-16 14:40:12 -0700 (Thu, 16 Jul 2015) Log Message [GTK] Web Inspector: Further optimize the weight and time icons taken back to the toolbar dashboard for the GTK+ port https://bugs.webkit.org/show_bug.cgi?id=147010 SVG images optimized with a combination of sed replacements, the usage of the scour tool (http://www.codedread.com/scour/) and a forked version of the svgo tool (https://github.com/tanty/svgo). Also, added the class attribute to the shape elements following the convention used in Apple's images. Reviewed by Martin Robinson. * UserInterface/Images/gtk/Time.svg: Optimized. * UserInterface/Images/gtk/Weight.svg: Optimized. Modified Paths trunk/Source/WebInspectorUI/ChangeLog trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Time.svg trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Weight.svg Diff Modified: trunk/Source/WebInspectorUI/ChangeLog (186907 => 186908) --- trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 20:24:29 UTC (rev 186907) +++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-16 21:40:12 UTC (rev 186908) @@ -1,5 +1,22 @@ 2015-07-16 Andres Gomez ago...@igalia.com +[GTK] Web Inspector: Further optimize the weight and time icons taken back to the toolbar dashboard for the GTK+ port +https://bugs.webkit.org/show_bug.cgi?id=147010 + +SVG images optimized with a combination of sed replacements, the +usage of the scour tool (http://www.codedread.com/scour/) and a +forked version of the svgo tool (https://github.com/tanty/svgo). + +Also, added the class attribute to the shape elements following +the convention used in Apple's images. + +Reviewed by Martin Robinson. + +* UserInterface/Images/gtk/Time.svg: Optimized. +* UserInterface/Images/gtk/Weight.svg: Optimized. + +2015-07-16 Andres Gomez ago...@igalia.com + [GTK] Web Inspector: Add new Network icon for the GTK+ port https://bugs.webkit.org/show_bug.cgi?id=147002 Modified: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Time.svg (186907 => 186908) --- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Time.svg 2015-07-16 20:24:29 UTC (rev 186907) +++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Time.svg 2015-07-16 21:40:12 UTC (rev 186908) @@ -1,8 +1,6 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? +?xml version=1.0 encoding=UTF-8? !-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -- svg xmlns=http://www.w3.org/2000/svg version=1.1 viewBox=0 0 16 16 - g transform=matrix(.80143 0 0 .80143 1.1986 1.984) - path style=block-progression:tb;color:#00 d=m8.4866 0.01994c-4.1303 0-7.4866 3.3563-7.4866 7.4866s3.3563 7.4866 7.4866 7.4866 7.4866-3.3563 7.4866-7.4866-3.3563-7.4866-7.4866-7.4866zm0 1.9732c3.0494 0 5.5134 2.464 5.5134 5.5134s-2.464 5.5134-5.5134 5.5134-5.5134-2.464-5.5134-5.5134 2.464-5.5134 5.5134-5.5134z/ - path style=block-progression:tb;color:#00 d=m11.393 4.0065a0.50005 0.50005 0 0 0 -0.25 0.15625l-2.6564 2.6562-1.6562-1.6562a0.50005 0.50005 0 1 0 -0.6875 0.6875l2 2a0.50005 0.50005 0 0 0 0.6875 0l3-3a0.50005 0.50005 0 0 0 -0.4375 -0.84375z/ - /g + path d=m8 2c-3.3101 0-6 2.6899-6 6 0 3.31 2.6899 6 6 6 3.31 0 6-2.69 6-6 0-3.3101-2.69-6-6-6zm0 1.5814c2.4439 0 4.4186 1.9747 4.4186 4.4186s-1.9747 4.4186-4.4186 4.4186-4.4186-1.9747-4.4186-4.4186 1.9747-4.4186 4.4186-4.4186z class=filled/ + path d=m10.329 5.195a0.40076 0.40076 0 0 0 -0.2 0.1252l-2.129 2.1288-1.3274-1.3274a0.40076 0.40076 0 1 0 -0.551 0.551l1.6029 1.6029a0.40076 0.40076 0 0 0 0.55098 0l2.4045-2.4043a0.40076 0.40076 0 0 0 -0.351 -0.6762z class=filled/ /svg Modified: trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Weight.svg (186907 => 186908) --- trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Weight.svg 2015-07-16 20:24:29 UTC (rev 186907) +++ trunk/Source/WebInspectorUI/UserInterface/Images/gtk/Weight.svg 2015-07-16 21:40:12 UTC (rev 186908) @@ -1,5 +1,5 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? +?xml version=1.0 encoding=UTF-8? !-- Licensed under the Creative Commons Attribution-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-sa/3.0/) -- svg xmlns=http://www.w3.org/2000/svg version=1.1 viewBox=0 0 16 16 - path style=color:#00;enable-background:new d=m4.4375 2c-0.5204 0-0.9375 0.4171-0.9375 0.9375v0.125c0 0.5204 0.4171 0.9375 0.9375 0.9375h0.5625v1h-0.6562c-0.4742 0-0.8438 0.3696-0.8438 0.8438v8.1562h9v-8.1562c0-0.4742-0.37-0.8438-0.844-0.8438h-0.656v-1h0.562c0.521 0 0.938-0.4171 0.938-0.9375v-0.125c0-0.5204-0.417-0.9375-0.938-0.9375h-7.125zm0.90625 5.5625c0.02072-0.00261 0.04178-0.00261 0.0625 0h0.5937c0.0329 0.0041 0.065 0.0147 0.0938 0.0313 0.0221 0.0074 0.0432 0.0179 0.0624 0.0312 0.0564 0.045 0.0916 0.1154 0.0938 0.1875v0.96875l0.90625-1.125c0.038-0.0492
[webkit-changes] [186911] trunk
Title: [186911] trunk
Revision 186911
Author simon.fra...@apple.com
Date 2015-07-16 14:54:06 -0700 (Thu, 16 Jul 2015)
Log Message
Fix disappearing position:fixed elements in fixed layout mode
https://bugs.webkit.org/show_bug.cgi?id=147019
Reviewed by Tim Horton.
Source/WebCore:
Test: compositing/fixed-with-fixed-layout.html
When in fixed layout mode, and being scaled down, viewportConstrainedVisibleContentRect() is
the wrong thing to use to determine if position:fixed elements are clipped out. In this case,
use the simpler document bounds (before scaling).
In the long term, there needs to be an equivalent of viewportConstrainedVisibleContentRect()
that gives an appropriate rect that can be used here.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForPosition):
LayoutTests:
Test with four fixed elements in fixed layout mode.
* compositing/fixed-with-fixed-layout-expected.txt: Added.
* compositing/fixed-with-fixed-layout.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
Added Paths
trunk/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt
trunk/LayoutTests/compositing/fixed-with-fixed-layout.html
Diff
Modified: trunk/LayoutTests/ChangeLog (186910 => 186911)
--- trunk/LayoutTests/ChangeLog 2015-07-16 21:51:08 UTC (rev 186910)
+++ trunk/LayoutTests/ChangeLog 2015-07-16 21:54:06 UTC (rev 186911)
@@ -1,3 +1,15 @@
+2015-07-16 Simon Fraser simon.fra...@apple.com
+
+Fix disappearing position:fixed elements in fixed layout mode
+https://bugs.webkit.org/show_bug.cgi?id=147019
+
+Reviewed by Tim Horton.
+
+Test with four fixed elements in fixed layout mode.
+
+* compositing/fixed-with-fixed-layout-expected.txt: Added.
+* compositing/fixed-with-fixed-layout.html: Added.
+
2015-07-16 Filip Pizlo fpi...@apple.com
Unreviewed, roll out http://trac.webkit.org/changeset/186903. It broke the build.
Added: trunk/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (0 => 186911)
--- trunk/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt 2015-07-16 21:54:06 UTC (rev 186911)
@@ -0,0 +1,35 @@
+Top Left Right bottom
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 806.00 1616.00)
+ (children 1
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 1008.00 2021.00)
+ (contentsOpaque 1)
+ (transform [0.80 0.00 0.00 0.00] [0.00 0.80 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
+ (children 4
+(GraphicsLayer
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 0.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 900.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+)
+(GraphicsLayer
+ (position 0.00 1900.00)
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+)
+ )
+)
+ )
+)
+
Added: trunk/LayoutTests/compositing/fixed-with-fixed-layout.html (0 => 186911)
--- trunk/LayoutTests/compositing/fixed-with-fixed-layout.html (rev 0)
+++ trunk/LayoutTests/compositing/fixed-with-fixed-layout.html 2015-07-16 21:54:06 UTC (rev 186911)
@@ -0,0 +1,87 @@
+!DOCTYPE html
+
+html
+head
+style
+body {
+height: 2000px;
+width: 1000px;
+}
+
+.fixed {
+position: fixed;
+height: 100px;
+width: 100px;
+background-color: rgba(0, 0, 0, 0.5);
+}
+
+.top, .bottom {
+left: 0;
+width: 100%;
+}
+
+.left, .right {
+top: 200px;
+}
+
+.top {
+top: 0;
+}
+
+.bottom {
+bottom: 0;
+}
+.left {
+left: 0;
+}
+.right {
+right: 0;
+}
+/style
+script
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+if (window.internals) {
+internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+internals.setUseFixedLayout(true);
+internals.setFixedLayoutSize(1000, 2000);
+var scale = 800 / 1000;
+eventSender.scalePageBy(scale, scale);
+}
+
+function doTest()
+{
+window.setTimeout(function() {
+document.getElementById(layerTree).innerText = window.internals.layerTreeAsText(document);
+testRunner.notifyDone();
+}, 0);
+}
+
+
[webkit-changes] [186912] trunk
Title: [186912] trunk Revision 186912 Author achristen...@apple.com Date 2015-07-16 15:08:19 -0700 (Thu, 16 Jul 2015) Log Message [Content Extensions] Cache domain actions https://bugs.webkit.org/show_bug.cgi?id=146817 Reviewed by Benjamin Poulain. Source/WebCore: Right now we run regular expressions on the domain every time we have any rules that match with if-domain or unless-domain. This caches the results of running regular expressions on the domain of the main document's url so we only need to run those regular expressions when the main document changes domain. We also spend less time adding unused actions into HashSets. All behavior is covered by existing api tests, but I added some to explicitly test if-domain and unless-domain with multiple load types. * contentextensions/ContentExtension.cpp: (WebCore::ContentExtensions::ContentExtension::globalDisplayNoneStyleSheet): (WebCore::ContentExtensions::ContentExtension::cachedDomainActions): * contentextensions/ContentExtension.h: (WebCore::ContentExtensions::ContentExtension::identifier): (WebCore::ContentExtensions::ContentExtension::compiledExtension): * contentextensions/ContentExtensionsBackend.cpp: (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad): * contentextensions/DFABytecodeInterpreter.cpp: (WebCore::ContentExtensions::getJumpDistance): (WebCore::ContentExtensions::matchesDomain): (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretAppendAction): (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretTestFlagsAndAppendAction): (WebCore::ContentExtensions::DFABytecodeInterpreter::actionsForDefaultStylesheetFromDFARoot): (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretWithDomains): (WebCore::ContentExtensions::DFABytecodeInterpreter::interpret): * contentextensions/DFABytecodeInterpreter.h: Tools: * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp: (TestWebKitAPI::TEST_F): Test if-domain and unless-domain with multiple load types. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/contentextensions/ContentExtension.cpp trunk/Source/WebCore/contentextensions/ContentExtension.h trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (186911 => 186912) --- trunk/Source/WebCore/ChangeLog 2015-07-16 21:54:06 UTC (rev 186911) +++ trunk/Source/WebCore/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912) @@ -1,3 +1,34 @@ +2015-07-16 Alex Christensen achristen...@webkit.org + +[Content Extensions] Cache domain actions +https://bugs.webkit.org/show_bug.cgi?id=146817 + +Reviewed by Benjamin Poulain. + +Right now we run regular expressions on the domain every time we have any rules that match with if-domain or unless-domain. +This caches the results of running regular expressions on the domain of the main document's url so we only need to +run those regular expressions when the main document changes domain. We also spend less time adding unused actions into HashSets. + +All behavior is covered by existing api tests, but I added some to explicitly test if-domain and unless-domain with multiple load types. + +* contentextensions/ContentExtension.cpp: +(WebCore::ContentExtensions::ContentExtension::globalDisplayNoneStyleSheet): +(WebCore::ContentExtensions::ContentExtension::cachedDomainActions): +* contentextensions/ContentExtension.h: +(WebCore::ContentExtensions::ContentExtension::identifier): +(WebCore::ContentExtensions::ContentExtension::compiledExtension): +* contentextensions/ContentExtensionsBackend.cpp: +(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad): +* contentextensions/DFABytecodeInterpreter.cpp: +(WebCore::ContentExtensions::getJumpDistance): +(WebCore::ContentExtensions::matchesDomain): +(WebCore::ContentExtensions::DFABytecodeInterpreter::interpretAppendAction): +(WebCore::ContentExtensions::DFABytecodeInterpreter::interpretTestFlagsAndAppendAction): +(WebCore::ContentExtensions::DFABytecodeInterpreter::actionsForDefaultStylesheetFromDFARoot): +(WebCore::ContentExtensions::DFABytecodeInterpreter::interpretWithDomains): +(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret): +* contentextensions/DFABytecodeInterpreter.h: + 2015-07-16 Simon Fraser simon.fra...@apple.com Fix disappearing position:fixed elements in fixed layout mode Modified: trunk/Source/WebCore/contentextensions/ContentExtension.cpp (186911 => 186912) --- trunk/Source/WebCore/contentextensions/ContentExtension.cpp 2015-07-16 21:54:06 UTC (rev 186911) +++
[webkit-changes] [186913] trunk/Source
Title: [186913] trunk/Source
Revision 186913
Author mra...@apple.com
Date 2015-07-16 15:27:30 -0700 (Thu, 16 Jul 2015)
Log Message
Media Session: remove plumbing for delivering start/end-of-interruption events
https://bugs.webkit.org/show_bug.cgi?id=147005
Reviewed by Eric Carlson.
Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
so the same behavior is available to all clients.
WebCore:
* Modules/mediasession/MediaSessionEvents.h:
* page/Page.cpp:
* page/Page.h:
WebKit:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h
trunk/Source/WebCore/page/Page.cpp
trunk/Source/WebCore/page/Page.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Diff
Modified: trunk/Source/WebCore/ChangeLog (186912 => 186913)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
@@ -1,3 +1,17 @@
+2015-07-16 Matt Rajca mra...@apple.com
+
+Media Session: remove plumbing for delivering start/end-of-interruption events
+https://bugs.webkit.org/show_bug.cgi?id=147005
+
+Reviewed by Eric Carlson.
+
+Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+so the same behavior is available to all clients.
+
+* Modules/mediasession/MediaSessionEvents.h:
+* page/Page.cpp:
+* page/Page.h:
+
2015-07-16 Alex Christensen achristen...@webkit.org
[Content Extensions] Cache domain actions
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h (186912 => 186913)
--- trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -36,17 +36,6 @@
TrackPrevious
};
-enum MediaSessionInterruptionEvent {
-StartOfInterruption,
-EndOfInterruption
-};
-
-enum MediaSessionInterruptingCategory {
-Content,
-Transient,
-TransientSolo
-};
-
}
#endif
Modified: trunk/Source/WebCore/page/Page.cpp (186912 => 186913)
--- trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:27:30 UTC (rev 186913)
@@ -57,7 +57,6 @@
#include MediaCanStartListener.h
#include Navigator.h
#include NetworkStateNotifier.h
-#include NotImplemented.h
#include PageCache.h
#include PageConfiguration.h
#include PageConsoleClient.h
@@ -1225,11 +1224,6 @@
break;
}
}
-
-void Page::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
-{
-notImplemented();
-}
#endif
#if !ASSERT_DISABLED
Modified: trunk/Source/WebCore/page/Page.h (186912 => 186913)
--- trunk/Source/WebCore/page/Page.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.h 2015-07-16 22:27:30 UTC (rev 186913)
@@ -442,7 +442,6 @@
#if ENABLE(MEDIA_SESSION)
WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
-WEBCORE_EXPORT void handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent, MediaSessionInterruptingCategory);
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
Modified: trunk/Source/WebKit2/ChangeLog (186912 => 186913)
--- trunk/Source/WebKit2/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
@@ -1,3 +1,21 @@
+2015-07-16 Matt Rajca mra...@apple.com
+
+Media Session: remove plumbing for delivering start/end-of-interruption events
+https://bugs.webkit.org/show_bug.cgi?id=147005
+
+Reviewed by Eric Carlson.
+
+Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+so the same behavior is available to all clients.
+
+* UIProcess/API/C/WKPage.cpp:
+* UIProcess/API/C/WKPagePrivate.h:
+* UIProcess/WebPageProxy.cpp:
+* UIProcess/WebPageProxy.h:
+* WebProcess/WebPage/WebPage.cpp:
+* WebProcess/WebPage/WebPage.h:
+* WebProcess/WebPage/WebPage.messages.in:
+
2015-07-16 Michael Catanzaro mcatanz...@igalia.com
REGRESSION(r186464): [SOUP] ASSERTION FAILED: !m_messageReceiverMapCount when
[webkit-changes] [186914] branches/safari-601.1-branch/Source/WebCore
Title: [186914] branches/safari-601.1-branch/Source/WebCore
Revision 186914
Author lforsch...@apple.com
Date 2015-07-16 15:50:50 -0700 (Thu, 16 Jul 2015)
Log Message
Merged r186764. rdar://problem/9222837
Modified Paths
branches/safari-601.1-branch/Source/WebCore/ChangeLog
branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h
branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm
Diff
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186913 => 186914)
--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-16 22:50:50 UTC (rev 186914)
@@ -1,3 +1,20 @@
+2015-07-16 Lucas Forschler lforsch...@apple.com
+
+Merge r186764. rdar://problem/20923632
+
+2015-07-13 Eric Carlson eric.carl...@apple.com
+
+[iOS] Cancel AirPlay explicitly when exiting from full screen
+https://bugs.webkit.org/show_bug.cgi?id=146902
+rdar://problem/20923632
+
+Reviewed by Brent Fulgham.
+
+* platform/ios/WebVideoFullscreenInterfaceAVKit.h:
+* platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+(WebVideoFullscreenInterfaceAVKit::~WebVideoFullscreenInterfaceAVKit): Call setExternalPlayback(false)
+ if playing to an external screen.
+
2015-07-12 Babak Shafiei bshaf...@apple.com
Merge r186741.
Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h (186913 => 186914)
--- branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-07-16 22:27:30 UTC (rev 186913)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h 2015-07-16 22:50:50 UTC (rev 186914)
@@ -75,7 +75,7 @@
{
return adoptRef(*new WebVideoFullscreenInterfaceAVKit());
}
-virtual ~WebVideoFullscreenInterfaceAVKit() { }
+virtual ~WebVideoFullscreenInterfaceAVKit();
WEBCORE_EXPORT void setWebVideoFullscreenModel(WebVideoFullscreenModel*);
WEBCORE_EXPORT void setWebVideoFullscreenChangeObserver(WebVideoFullscreenChangeObserver*);
Modified: branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (186913 => 186914)
--- branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-16 22:27:30 UTC (rev 186913)
+++ branches/safari-601.1-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-07-16 22:50:50 UTC (rev 186914)
@@ -751,6 +751,13 @@
[m_playerController setFullscreenInterface:this];
}
+WebVideoFullscreenInterfaceAVKit::~WebVideoFullscreenInterfaceAVKit()
+{
+WebAVPlayerController* playerController = m_playerController.get();
+if (playerController playerController.externalPlaybackActive)
+setExternalPlayback(false, TargetTypeNone, );
+}
+
void WebVideoFullscreenInterfaceAVKit::resetMediaState()
{
if (!m_playerController) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [186917] trunk/Source/WebCore
Title: [186917] trunk/Source/WebCore
Revision 186917
Author mra...@apple.com
Date 2015-07-16 16:22:36 -0700 (Thu, 16 Jul 2015)
Log Message
Media Session: add support for platform-specific interruption providers
https://bugs.webkit.org/show_bug.cgi?id=147008
Reviewed by Eric Carlson.
* WebCore.xcodeproj/project.pbxproj: Include new source files.
* platform/mediasession/MediaSessionInterruptionProvider.cpp: Added base class to be used by MediaSessionManager
to listen for interruption notifications.
(WebCore::MediaSessionInterruptionProvider::MediaSessionInterruptionProvider): Begin listening for interruptions
upon construction.
(WebCore::MediaSessionInterruptionProvider::~MediaSessionInterruptionProvider): Stop listening for interruptions
before destruction.
(WebCore::MediaSessionInterruptionProvider::beginListeningForInterruptions): To be overridden by subclasses.
(WebCore::MediaSessionInterruptionProvider::stopListeningForInterruptions): To be overridden by subclasses.
* platform/mediasession/MediaSessionInterruptionProvider.h: Added.
(WebCore::MediaSessionInterruptionProviderClient::~MediaSessionInterruptionProviderClient):
(WebCore::MediaSessionInterruptionProvider::client):
* platform/mediasession/mac/MediaSessionInterruptionProviderMac.h: Added for providing Mac-specific interruptions.
(WebCore::MediaSessionInterruptionProviderMac::~MediaSessionInterruptionProviderMac):
* platform/mediasession/mac/MediaSessionInterruptionProviderMac.mm: Added stubs.
(WebCore::MediaSessionInterruptionProviderMac::beginListeningForInterruptions):
(WebCore::MediaSessionInterruptionProviderMac::stopListeningForInterruptions):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
Added Paths
trunk/Source/WebCore/platform/mediasession/
trunk/Source/WebCore/platform/mediasession/MediaSessionInterruptionProvider.cpp
trunk/Source/WebCore/platform/mediasession/MediaSessionInterruptionProvider.h
trunk/Source/WebCore/platform/mediasession/mac/
trunk/Source/WebCore/platform/mediasession/mac/MediaSessionInterruptionProviderMac.h
trunk/Source/WebCore/platform/mediasession/mac/MediaSessionInterruptionProviderMac.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (186916 => 186917)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 23:14:34 UTC (rev 186916)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 23:22:36 UTC (rev 186917)
@@ -1,3 +1,28 @@
+2015-07-16 Matt Rajca mra...@apple.com
+
+Media Session: add support for platform-specific interruption providers
+https://bugs.webkit.org/show_bug.cgi?id=147008
+
+Reviewed by Eric Carlson.
+
+* WebCore.xcodeproj/project.pbxproj: Include new source files.
+* platform/mediasession/MediaSessionInterruptionProvider.cpp: Added base class to be used by MediaSessionManager
+ to listen for interruption notifications.
+(WebCore::MediaSessionInterruptionProvider::MediaSessionInterruptionProvider): Begin listening for interruptions
+ upon construction.
+(WebCore::MediaSessionInterruptionProvider::~MediaSessionInterruptionProvider): Stop listening for interruptions
+ before destruction.
+(WebCore::MediaSessionInterruptionProvider::beginListeningForInterruptions): To be overridden by subclasses.
+(WebCore::MediaSessionInterruptionProvider::stopListeningForInterruptions): To be overridden by subclasses.
+* platform/mediasession/MediaSessionInterruptionProvider.h: Added.
+(WebCore::MediaSessionInterruptionProviderClient::~MediaSessionInterruptionProviderClient):
+(WebCore::MediaSessionInterruptionProvider::client):
+* platform/mediasession/mac/MediaSessionInterruptionProviderMac.h: Added for providing Mac-specific interruptions.
+(WebCore::MediaSessionInterruptionProviderMac::~MediaSessionInterruptionProviderMac):
+* platform/mediasession/mac/MediaSessionInterruptionProviderMac.mm: Added stubs.
+(WebCore::MediaSessionInterruptionProviderMac::beginListeningForInterruptions):
+(WebCore::MediaSessionInterruptionProviderMac::stopListeningForInterruptions):
+
2015-07-16 Tim Horton timothy_hor...@apple.com
Add shrink-wrapped link highlights
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186916 => 186917)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-16 23:14:34 UTC (rev 186916)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-16 23:22:36 UTC (rev 186917)
@@ -5729,6 +5729,10 @@
C90F65561B2253BE002163A1 /* MediaSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C90F65541B225396002163A1 /* MediaSessionManager.h */; };
C937FE8D1B1F6821008ECC5D /* HTMLMediaElementMediaSession.h in Headers */ = {isa = PBXBuildFile; fileRef = C968B2E61B1E72F700EF1F81 /* HTMLMediaElementMediaSession.h */; };
C968B2E81B1E778100EF1F81 /* HTMLMediaElementMediaSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef
[webkit-changes] [186916] trunk/Source
Title: [186916] trunk/Source
Revision 186916
Author timothy_hor...@apple.com
Date 2015-07-16 16:14:34 -0700 (Thu, 16 Jul 2015)
Log Message
Add shrink-wrapped link highlights
https://bugs.webkit.org/show_bug.cgi?id=147021
rdar://problem/21643094
Reviewed by Enrica Casucci.
* Shared/InteractionInformationAtPosition.cpp:
(WebKit::InteractionInformationAtPosition::encode):
(WebKit::InteractionInformationAtPosition::decode):
* Shared/InteractionInformationAtPosition.h:
Add a TextIndicator to InteractionInformationAtPosition.
Make use of some new C++ features.
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView willPresentPreviewViewController:forPosition:inSourceView:]):
(-[WKContentView didDismissPreviewViewController:committing:]):
Make use of the TextIndicator (if we have one) to show a shrink-wrapped
snapshot of the link.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):
Build a TextIndicator for the link if possible.
* WebCore.xcodeproj/project.pbxproj:
* page/TextIndicator.cpp:
(WebCore::TextIndicator::createWithRange):
(WebCore::TextIndicator::createWithSelectionInFrame):
* page/TextIndicator.h:
Add a margin parameter to TextIndicator; this inflates each text rect
by the given amount.
Use snapshotFrameRect instead of snapshotSelection because we really
want an image that exactly fits textBoundingRectInDocumentCoordinates,
and snapshotSelection comes up with selection rects in different ways,
especially on iOS (where it comes up with nothing!).
For now, avoid forcing black text or painting only the selection on iOS.
Eventually, we should have TextIndicator options for these things that
are then respected at the presentation layer.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/page/TextIndicator.cpp
trunk/Source/WebCore/page/TextIndicator.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp
trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.h
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (186915 => 186916)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 22:57:47 UTC (rev 186915)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 23:14:34 UTC (rev 186916)
@@ -1,3 +1,28 @@
+2015-07-16 Tim Horton timothy_hor...@apple.com
+
+Add shrink-wrapped link highlights
+https://bugs.webkit.org/show_bug.cgi?id=147021
+rdar://problem/21643094
+
+Reviewed by Enrica Casucci.
+
+* WebCore.xcodeproj/project.pbxproj:
+* page/TextIndicator.cpp:
+(WebCore::TextIndicator::createWithRange):
+(WebCore::TextIndicator::createWithSelectionInFrame):
+* page/TextIndicator.h:
+Add a margin parameter to TextIndicator; this inflates each text rect
+by the given amount.
+
+Use snapshotFrameRect instead of snapshotSelection because we really
+want an image that exactly fits textBoundingRectInDocumentCoordinates,
+and snapshotSelection comes up with selection rects in different ways,
+especially on iOS (where it comes up with nothing!).
+
+For now, avoid forcing black text or painting only the selection on iOS.
+Eventually, we should have TextIndicator options for these things that
+are then respected at the presentation layer.
+
2015-07-16 Matt Rajca mra...@apple.com
Media Session: remove plumbing for delivering start/end-of-interruption events
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186915 => 186916)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-16 22:57:47 UTC (rev 186915)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-16 23:14:34 UTC (rev 186916)
@@ -1127,7 +1127,7 @@
2D4F96F81A1ECC240098BF88 /* TextIndicatorWindow.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2D4F96F41A1ECC240098BF88 /* TextIndicatorWindow.mm */; };
2D5002F81B56D7810020AAF7 /* DOMPath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5002F71B56D7810020AAF7 /* DOMPath.cpp */; };
2D5002FB1B56D7990020AAF7 /* PathUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2D5002F91B56D7990020AAF7 /* PathUtilities.cpp */; };
- 2D5002FC1B56D7990020AAF7 /* PathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5002FA1B56D7990020AAF7 /* PathUtilities.h */; };
+ 2D5002FC1B56D7990020AAF7 /* PathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D5002FA1B56D7990020AAF7 /* PathUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
2D58D8551A15F65F00A5F726 /* DataDetection.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D58D8531A15F65F00A5F726 /* DataDetection.h */; settings = {ATTRIBUTES =
[webkit-changes] [186918] trunk/Source/WebCore
Title: [186918] trunk/Source/WebCore
Revision 186918
Author mra...@apple.com
Date 2015-07-16 16:36:13 -0700 (Thu, 16 Jul 2015)
Log Message
Media Session: handle 'Transient' and 'Transient Solo' interruption events https://bugs.webkit.org/show_bug.cgi?id=146840
Reviewed by Eric Carlson.
* Modules/mediasession/MediaSession.cpp:
(WebCore::MediaSession::handleDuckInterruption): Added stub.
(WebCore::MediaSession::handleUnduckInterruption): Added stub.
(WebCore::MediaSession::handlePauseInterruption): Pause active media elements. We use our helper method to do this
safely since pausing a media element can change the collection we're iterating.
(WebCore::MediaSession::handleUnpauseInterruption): Unpause active media elements. We use our helper method to do this
safely since unpausing a media element can change the collection we're iterating.
(WebCore::MediaSession::togglePlayback): Factored out safe iteration into a helper method elsewhere.
(WebCore::MediaSession::safelyIterateActiveMediaElements): Safely iterate through the collection of active media
elements.
* Modules/mediasession/MediaSession.h:
* Modules/mediasession/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::MediaSessionManager): On Mac, register for platform-specific interruptions.
(WebCore::MediaSessionManager::didReceiveStartOfInterruptionNotification): Implemented section 4.5.2 of Media Session spec.
(WebCore::MediaSessionManager::didReceiveEndOfInterruptionNotification): Ditto.
* 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 (186917 => 186918)
--- trunk/Source/WebCore/ChangeLog 2015-07-16 23:22:36 UTC (rev 186917)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 23:36:13 UTC (rev 186918)
@@ -1,5 +1,29 @@
2015-07-16 Matt Rajca mra...@apple.com
+Media Session: handle 'Transient' and 'Transient Solo' interruption events
+https://bugs.webkit.org/show_bug.cgi?id=146840
+
+Reviewed by Eric Carlson.
+
+* Modules/mediasession/MediaSession.cpp:
+(WebCore::MediaSession::handleDuckInterruption): Added stub.
+(WebCore::MediaSession::handleUnduckInterruption): Added stub.
+(WebCore::MediaSession::handlePauseInterruption): Pause active media elements. We use our helper method to do this
+ safely since pausing a media element can change the collection we're iterating.
+(WebCore::MediaSession::handleUnpauseInterruption): Unpause active media elements. We use our helper method to do this
+ safely since unpausing a media element can change the collection we're iterating.
+(WebCore::MediaSession::togglePlayback): Factored out safe iteration into a helper method elsewhere.
+(WebCore::MediaSession::safelyIterateActiveMediaElements): Safely iterate through the collection of active media
+ elements.
+* Modules/mediasession/MediaSession.h:
+* Modules/mediasession/MediaSessionManager.cpp:
+(WebCore::MediaSessionManager::MediaSessionManager): On Mac, register for platform-specific interruptions.
+(WebCore::MediaSessionManager::didReceiveStartOfInterruptionNotification): Implemented section 4.5.2 of Media Session spec.
+(WebCore::MediaSessionManager::didReceiveEndOfInterruptionNotification): Ditto.
+* Modules/mediasession/MediaSessionManager.h:
+
+2015-07-16 Matt Rajca mra...@apple.com
+
Media Session: add support for platform-specific interruption providers
https://bugs.webkit.org/show_bug.cgi?id=147008
Modified: trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp (186917 => 186918)
--- trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-07-16 23:22:36 UTC (rev 186917)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSession.cpp 2015-07-16 23:36:13 UTC (rev 186918)
@@ -238,22 +238,58 @@
return true;
}
-void MediaSession::togglePlayback()
+void MediaSession::handleDuckInterruption()
{
-ASSERT(!m_iteratedActiveParticipatingElements);
+// FIXME: Duck media elements.
-HashSetHTMLMediaElement* activeParticipatingElementsCopy = m_activeParticipatingElements;
-m_iteratedActiveParticipatingElements = activeParticipatingElementsCopy;
+m_currentState = State::Interrupted;
+}
-while (!activeParticipatingElementsCopy.isEmpty()) {
-HTMLMediaElement* element = activeParticipatingElementsCopy.takeAny();
+void MediaSession::handleUnduckInterruption()
+{
+// FIXME: Unduck media elements.
+m_currentState = State::Active;
+}
+
+void MediaSession::handlePauseInterruption()
+{
+m_currentState = State::Interrupted;
+
+
