[webkit-changes] [166224] trunk/Source/WebKit2
Title: [166224] trunk/Source/WebKit2
Revision 166224
Author cfleiz...@apple.com
Date 2014-03-24 23:34:30 -0700 (Mon, 24 Mar 2014)
Log Message
AX: hit-testing doesn't always work correctly with WK2
https://bugs.webkit.org/show_bug.cgi?id=130706
Reviewed by Simon Fraser.
Accessibility code was trying to do screenToRootView itself, and in
some cases with embedded WK2 views that did not work.
* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
(-[WKAccessibilityWebPageObject accessibilityHitTest:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166223 => 166224)
--- trunk/Source/WebKit2/ChangeLog 2014-03-25 06:24:13 UTC (rev 166223)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-25 06:34:30 UTC (rev 166224)
@@ -1,3 +1,16 @@
+2014-03-24 Chris Fleizach
+
+AX: hit-testing doesn't always work correctly with WK2
+https://bugs.webkit.org/show_bug.cgi?id=130706
+
+Reviewed by Simon Fraser.
+
+Accessibility code was trying to do screenToRootView itself, and in
+some cases with embedded WK2 views that did not work.
+
+* WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm:
+(-[WKAccessibilityWebPageObject accessibilityHitTest:]):
+
2014-03-24 Benjamin Poulain
[WK2] SpinLock are not initialized by default, ViewUpdateDispatcher is missing an initializer
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm (166223 => 166224)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2014-03-25 06:24:13 UTC (rev 166223)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectMac.mm 2014-03-25 06:34:30 UTC (rev 166224)
@@ -193,27 +193,14 @@
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (id)accessibilityHitTest:(NSPoint)point
{
-// Hit-test point comes in as bottom-screen coordinates. Needs to be normalized to the frame of the web page.
-NSPoint remotePosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue];
-NSSize remoteSize = [[self accessibilityAttributeValue:NSAccessibilitySizeAttribute] sizeValue];
+if (!m_page)
+return nil;
-// Get the y position of the WKView (we have to screen-flip and go from bottom left to top left).
-CGFloat screenHeight = [(NSScreen *)[[NSScreen screens] objectAtIndex:0] frame].size.height;
-remotePosition.y = (screenHeight - remotePosition.y) - remoteSize.height;
-
-point.y = screenHeight - point.y;
-
-// Re-center point into the web page's frame.
-point.y -= remotePosition.y;
-point.x -= remotePosition.x;
-
-WebCore::FrameView* frameView = m_page ? m_page->mainFrameView() : 0;
-if (frameView) {
-point.y += frameView->scrollPosition().y();
-point.x += frameView->scrollPosition().x();
-}
-
-return [[self accessibilityRootObjectWrapper] accessibilityHitTest:point];
+IntPoint convertedPoint = m_page->screenToRootView(IntPoint(point));
+if (WebCore::FrameView* frameView = m_page->mainFrameView())
+convertedPoint.moveBy(frameView->scrollPosition());
+
+return [[self accessibilityRootObjectWrapper] accessibilityHitTest:convertedPoint];
}
#pragma clang diagnostic pop
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166223] tags/Safari-538.24.2/Source/WebKit2
Title: [166223] tags/Safari-538.24.2/Source/WebKit2 Revision 166223 Author bshaf...@apple.com Date 2014-03-24 23:24:13 -0700 (Mon, 24 Mar 2014) Log Message Merged r166103. Modified Paths tags/Safari-538.24.2/Source/WebKit2/ChangeLog tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig tags/Safari-538.24.2/Source/WebKit2/Configurations/WebContent-iOS.entitlements tags/Safari-538.24.2/Source/WebKit2/NetworkProcess/mac/RemoteNetworkingContext.mm tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/Connection.h tags/Safari-538.24.2/Source/WebKit2/Platform/IPC/mac/ConnectionMac.cpp tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj tags/Safari-538.24.2/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm Added Paths tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements Diff Modified: tags/Safari-538.24.2/Source/WebKit2/ChangeLog (166222 => 166223) --- tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:18:51 UTC (rev 166222) +++ tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:24:13 UTC (rev 166223) @@ -1,5 +1,34 @@ 2014-03-24 Babak Shafiei +Merge r166103 + +2014-03-21 Sam Weinig + +[WebKit2] Implement NetworkingContext::sourceApplicationAuditData() for WebKit2 +https://bugs.webkit.org/show_bug.cgi?id=130528 + +Reviewed by Tim Horton. + +* Platform/IPC/Connection.h: +* Platform/IPC/mac/ConnectionMac.cpp: +(IPC::Connection::getAuditToken): +Expose the audit data if available. + +* NetworkProcess/mac/RemoteNetworkingContext.mm: +(WebKit::RemoteNetworkingContext::sourceApplicationAuditData): +* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm: +(WebKit::WebFrameNetworkingContext::sourceApplicationAuditData): +Pass the audit data corresponding to the UIProcess. + +* Configurations/Network-iOS.entitlements: Copied from Configurations/WebContent-iOS.entitlements. +* Configurations/NetworkProcess.xcconfig: +* Configurations/NetworkService.Development.xcconfig: +* Configurations/NetworkService.xcconfig: +* Configurations/WebContent-iOS.entitlements: +Add entitlement allowing the audit data to be used. + +2014-03-24 Babak Shafiei + Merge r165983 2014-03-20 Sam Weinig Copied: tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements (from rev 166103, trunk/Source/WebKit2/Configurations/Network-iOS.entitlements) (0 => 166223) --- tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements (rev 0) +++ tags/Safari-538.24.2/Source/WebKit2/Configurations/Network-iOS.entitlements 2014-03-25 06:24:13 UTC (rev 166223) @@ -0,0 +1,8 @@ + + + + + com.apple.private.network.socket-delegate + + + Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig (166222 => 166223) --- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-03-25 06:18:51 UTC (rev 166222) +++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-03-25 06:24:13 UTC (rev 166223) @@ -29,3 +29,6 @@ EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME)); EXCLUDED_SHIM_FILE_NAME_iphoneos = SecItemShim.dylib; EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos); + +CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements +CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (166222 => 166223) --- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-03-25 06:18:51 UTC (rev 166222) +++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-03-25 06:24:13 UTC (rev 166223) @@ -29,3 +29,6 @@ INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME)); INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist; INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist; + +CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements +CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig (166222 => 166223) --- tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-03-25 06:18:51 UTC (rev 166222) +++ tags/Safari-538.24.2/Source/WebKit2/Configurations/NetworkService.xcconf
[webkit-changes] [166222] tags/Safari-538.24.2/Source/WebKit2
Title: [166222] tags/Safari-538.24.2/Source/WebKit2
Revision 166222
Author bshaf...@apple.com
Date 2014-03-24 23:18:51 -0700 (Mon, 24 Mar 2014)
Log Message
Merged r165983.
Modified Paths
tags/Safari-538.24.2/Source/WebKit2/ChangeLog
tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm
tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h
tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Added Paths
tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h
Diff
Modified: tags/Safari-538.24.2/Source/WebKit2/ChangeLog (166221 => 166222)
--- tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/ChangeLog 2014-03-25 06:18:51 UTC (rev 166222)
@@ -1,3 +1,21 @@
+2014-03-24 Babak Shafiei
+
+Merge r165983
+
+2014-03-20 Sam Weinig
+
+[Cocoa] Expose preference to enable telephone number detection
+https://bugs.webkit.org/show_bug.cgi?id=130524
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/API/Cocoa/WKPreferences.mm:
+(-[WKPreferences _telephoneNumberDetectionIsEnabled]):
+(-[WKPreferences _setTelephoneNumberDetectionIsEnabled:]):
+* UIProcess/API/Cocoa/WKPreferencesInternal.h:
+* UIProcess/API/Cocoa/WKPreferencesPrivate.h: Added.
+* WebKit2.xcodeproj/project.pbxproj:
+
2014-03-24 Lucas Forschler
Merge r166203
Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (166221 => 166222)
--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-03-25 06:18:51 UTC (rev 166222)
@@ -54,4 +54,18 @@
@end
+@implementation WKPreferences (WKPrivate)
+
+- (BOOL)_telephoneNumberDetectionIsEnabled
+{
+return _preferences->telephoneNumberParsingEnabled();
+}
+
+- (void)_setTelephoneNumberDetectionIsEnabled:(BOOL)telephoneNumberDetectionIsEnabled
+{
+_preferences->setTelephoneNumberParsingEnabled(telephoneNumberDetectionIsEnabled);
+}
+
+@end
+
#endif // WK_API_ENABLED
Modified: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h (166221 => 166222)
--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2014-03-25 05:30:00 UTC (rev 166221)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h 2014-03-25 06:18:51 UTC (rev 166222)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WKPreferences.h"
+#import "WKPreferencesPrivate.h"
#if WK_API_ENABLED
Copied: tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (from rev 165983, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h) (0 => 166222)
--- tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (rev 0)
+++ tags/Safari-538.24.2/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2014-03-25 06:18:51 UTC (rev 166222)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import
+
+#if WK_API_ENABLED
+
+@interface WKPreferences (WKPrivate)
+
+@property (nonatomic, setter=_setTelephoneNumberDetectionIsEnabled:) BOOL _telephoneNumberDetectionIsEnabled;
+
+@end
+
+#endif
Modified: tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (166221 => 166222)
--- tags/Safari-538.24.2/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-03-25 05:30:00 UTC (rev
[webkit-changes] [166220] tags/Safari-538.24.2/Source
Title: [166220] tags/Safari-538.24.2/Source Revision 166220 Author bshaf...@apple.com Date 2014-03-24 21:59:29 -0700 (Mon, 24 Mar 2014) Log Message Versioning. Modified Paths tags/Safari-538.24.2/Source/_javascript_Core/Configurations/Version.xcconfig tags/Safari-538.24.2/Source/WebCore/Configurations/Version.xcconfig tags/Safari-538.24.2/Source/WebInspectorUI/Configurations/Version.xcconfig tags/Safari-538.24.2/Source/WebKit/mac/Configurations/Version.xcconfig tags/Safari-538.24.2/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: tags/Safari-538.24.2/Source/_javascript_Core/Configurations/Version.xcconfig (166219 => 166220) --- tags/Safari-538.24.2/Source/_javascript_Core/Configurations/Version.xcconfig 2014-03-25 04:55:49 UTC (rev 166219) +++ tags/Safari-538.24.2/Source/_javascript_Core/Configurations/Version.xcconfig 2014-03-25 04:59:29 UTC (rev 166220) @@ -23,7 +23,7 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 1; +TINY_VERSION = 2; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-538.24.2/Source/WebCore/Configurations/Version.xcconfig (166219 => 166220) --- tags/Safari-538.24.2/Source/WebCore/Configurations/Version.xcconfig 2014-03-25 04:55:49 UTC (rev 166219) +++ tags/Safari-538.24.2/Source/WebCore/Configurations/Version.xcconfig 2014-03-25 04:59:29 UTC (rev 166220) @@ -23,7 +23,7 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 1; +TINY_VERSION = 2; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-538.24.2/Source/WebInspectorUI/Configurations/Version.xcconfig (166219 => 166220) --- tags/Safari-538.24.2/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-03-25 04:55:49 UTC (rev 166219) +++ tags/Safari-538.24.2/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-03-25 04:59:29 UTC (rev 166220) @@ -1,6 +1,6 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 1; +TINY_VERSION = 2; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The system version prefix is based on the current system version. Modified: tags/Safari-538.24.2/Source/WebKit/mac/Configurations/Version.xcconfig (166219 => 166220) --- tags/Safari-538.24.2/Source/WebKit/mac/Configurations/Version.xcconfig 2014-03-25 04:55:49 UTC (rev 166219) +++ tags/Safari-538.24.2/Source/WebKit/mac/Configurations/Version.xcconfig 2014-03-25 04:59:29 UTC (rev 166220) @@ -23,7 +23,7 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 1; +TINY_VERSION = 2; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. Modified: tags/Safari-538.24.2/Source/WebKit2/Configurations/Version.xcconfig (166219 => 166220) --- tags/Safari-538.24.2/Source/WebKit2/Configurations/Version.xcconfig 2014-03-25 04:55:49 UTC (rev 166219) +++ tags/Safari-538.24.2/Source/WebKit2/Configurations/Version.xcconfig 2014-03-25 04:59:29 UTC (rev 166220) @@ -23,7 +23,7 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 1; +TINY_VERSION = 2; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_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] [166219] tags/Safari-538.24.2/
Title: [166219] tags/Safari-538.24.2/ Revision 166219 Author bshaf...@apple.com Date 2014-03-24 21:55:49 -0700 (Mon, 24 Mar 2014) Log Message New tag. Added Paths tags/Safari-538.24.2/ Diff Property changes: tags/Safari-538.24.2 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166218] trunk/Source/JavaScriptCore
Title: [166218] trunk/Source/_javascript_Core Revision 166218 Author fpi...@apple.com Date 2014-03-24 20:44:52 -0700 (Mon, 24 Mar 2014) Log Message More scaffolding for a stub routine to have a stub recursively embedded inside it https://bugs.webkit.org/show_bug.cgi?id=130770 Reviewed by Oliver Hunt. * bytecode/CallLinkInfo.cpp: (JSC::CallLinkInfo::unlink): VM& argument is superfluous. (JSC::CallLinkInfo::visitWeak): Factor this out, it used to be in CodeBlock::finalizeUnconditionally(). * bytecode/CallLinkInfo.h: * bytecode/CodeBlock.cpp: (JSC::CodeBlock::finalizeUnconditionally): Factor out some functionality into CallLinkInfo::visitWeak(), and make sure we pass RepatchBuffer& in more places. (JSC::CodeBlock::unlinkCalls): (JSC::CodeBlock::unlinkIncomingCalls): * bytecode/PolymorphicGetByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak(). (JSC::GetByIdAccess::visitWeak): (JSC::PolymorphicGetByIdList::visitWeak): * bytecode/PolymorphicGetByIdList.h: * bytecode/PolymorphicPutByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak(). (JSC::PutByIdAccess::visitWeak): (JSC::PolymorphicPutByIdList::visitWeak): * bytecode/PolymorphicPutByIdList.h: * bytecode/StructureStubInfo.cpp: Pass RepatchBuffer& through. (JSC::StructureStubInfo::visitWeakReferences): * bytecode/StructureStubInfo.h: * jit/ClosureCallStubRoutine.cpp: isClosureCall is unused. (JSC::ClosureCallStubRoutine::ClosureCallStubRoutine): * jit/GCAwareJITStubRoutine.cpp: (JSC::GCAwareJITStubRoutine::GCAwareJITStubRoutine): (JSC::createJITStubRoutine): * jit/GCAwareJITStubRoutine.h: Make it easier to construct one of these. (JSC::GCAwareJITStubRoutine::isClosureCall): Deleted. * jit/JITStubRoutine.cpp: (JSC::JITStubRoutine::visitWeak): This will allow future JITStubRoutine subclasses to have stubs recursively embedded inside them. * jit/JITStubRoutine.h: * jit/Repatch.cpp: (JSC::generateGetByIdStub): Fix a possible GC bug where we weren't making the stub routine GC aware. (JSC::emitCustomSetterStub): Clean up some code. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/bytecode/CallLinkInfo.cpp trunk/Source/_javascript_Core/bytecode/CallLinkInfo.h trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp trunk/Source/_javascript_Core/bytecode/PolymorphicGetByIdList.cpp trunk/Source/_javascript_Core/bytecode/PolymorphicGetByIdList.h trunk/Source/_javascript_Core/bytecode/PolymorphicPutByIdList.cpp trunk/Source/_javascript_Core/bytecode/PolymorphicPutByIdList.h trunk/Source/_javascript_Core/bytecode/StructureStubInfo.cpp trunk/Source/_javascript_Core/bytecode/StructureStubInfo.h trunk/Source/_javascript_Core/jit/ClosureCallStubRoutine.cpp trunk/Source/_javascript_Core/jit/GCAwareJITStubRoutine.cpp trunk/Source/_javascript_Core/jit/GCAwareJITStubRoutine.h trunk/Source/_javascript_Core/jit/JITStubRoutine.cpp trunk/Source/_javascript_Core/jit/JITStubRoutine.h trunk/Source/_javascript_Core/jit/Repatch.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166217 => 166218) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-25 03:27:46 UTC (rev 166217) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-25 03:44:52 UTC (rev 166218) @@ -1,3 +1,43 @@ +2014-03-24 Filip Pizlo + +More scaffolding for a stub routine to have a stub recursively embedded inside it +https://bugs.webkit.org/show_bug.cgi?id=130770 + +Reviewed by Oliver Hunt. + +* bytecode/CallLinkInfo.cpp: +(JSC::CallLinkInfo::unlink): VM& argument is superfluous. +(JSC::CallLinkInfo::visitWeak): Factor this out, it used to be in CodeBlock::finalizeUnconditionally(). +* bytecode/CallLinkInfo.h: +* bytecode/CodeBlock.cpp: +(JSC::CodeBlock::finalizeUnconditionally): Factor out some functionality into CallLinkInfo::visitWeak(), and make sure we pass RepatchBuffer& in more places. +(JSC::CodeBlock::unlinkCalls): +(JSC::CodeBlock::unlinkIncomingCalls): +* bytecode/PolymorphicGetByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak(). +(JSC::GetByIdAccess::visitWeak): +(JSC::PolymorphicGetByIdList::visitWeak): +* bytecode/PolymorphicGetByIdList.h: +* bytecode/PolymorphicPutByIdList.cpp: Pass RepatchBuffer& through and call JITStubRoutine::visitWeak(). +(JSC::PutByIdAccess::visitWeak): +(JSC::PolymorphicPutByIdList::visitWeak): +* bytecode/PolymorphicPutByIdList.h: +* bytecode/StructureStubInfo.cpp: Pass RepatchBuffer& through. +(JSC::StructureStubInfo::visitWeakReferences): +* bytecode/StructureStubInfo.h: +* jit/ClosureCallStubRoutine.cpp: isClosureCall is unused. +(JSC::ClosureCallStubRoutine::ClosureCallStubRoutine): +* jit/GCAwareJITStubRoutine.cpp: +(JSC::GCAwareJITStubRoutine::GCAwareJITStubRoutine): +(JSC::createJITStubRoutine): +* jit/GCAwareJITStubRoutine
[webkit-changes] [166217] trunk/Source/JavaScriptCore
Title: [166217] trunk/Source/_javascript_Core Revision 166217 Author gga...@apple.com Date 2014-03-24 20:27:46 -0700 (Mon, 24 Mar 2014) Log Message Safari crashes in _javascript_Core: JSC::JSObject::growOutOfLineStorage when WebKit is compiled with fcatch-undefined-behavior https://bugs.webkit.org/show_bug.cgi?id=130652 Reviewed by Mark Hahnenberg. Use a static member function because the butterfly we pass in might be NULL, and passing NULL to a member function is undefined behavior. Stylistically, I think this new way reads a little more clearly, since it matches createOrGrowArrayRight, and it helps to convey that m_butterfly might not exist yet. * runtime/Butterfly.h: * runtime/ButterflyInlines.h: (JSC::Butterfly::createOrGrowPropertyStorage): Renamed from growPropertyStorage because we might create. Split out the create path to avoid using NULL in a member function _expression_. Removed some unused versions of this function. * runtime/JSObject.cpp: (JSC::JSObject::growOutOfLineStorage): Updated for interface change. Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/runtime/Butterfly.h trunk/Source/_javascript_Core/runtime/ButterflyInlines.h trunk/Source/_javascript_Core/runtime/JSObject.cpp Diff Modified: trunk/Source/_javascript_Core/ChangeLog (166216 => 166217) --- trunk/Source/_javascript_Core/ChangeLog 2014-03-25 01:54:01 UTC (rev 166216) +++ trunk/Source/_javascript_Core/ChangeLog 2014-03-25 03:27:46 UTC (rev 166217) @@ -1,3 +1,29 @@ +2014-03-24 Geoffrey Garen + +Safari crashes in _javascript_Core: JSC::JSObject::growOutOfLineStorage +when WebKit is compiled with fcatch-undefined-behavior +https://bugs.webkit.org/show_bug.cgi?id=130652 + +Reviewed by Mark Hahnenberg. + +Use a static member function because the butterfly we pass in might be +NULL, and passing NULL to a member function is undefined behavior. + +Stylistically, I think this new way reads a little more clearly, since it +matches createOrGrowArrayRight, and it helps to convey that m_butterfly +might not exist yet. + +* runtime/Butterfly.h: +* runtime/ButterflyInlines.h: +(JSC::Butterfly::createOrGrowPropertyStorage): Renamed from growPropertyStorage +because we might create. Split out the create path to avoid using NULL +in a member function _expression_. + +Removed some unused versions of this function. + +* runtime/JSObject.cpp: +(JSC::JSObject::growOutOfLineStorage): Updated for interface change. + 2014-03-24 Oliver Hunt Strict mode destructuring assignment crashes the parser. Modified: trunk/Source/_javascript_Core/runtime/Butterfly.h (166216 => 166217) --- trunk/Source/_javascript_Core/runtime/Butterfly.h 2014-03-25 01:54:01 UTC (rev 166216) +++ trunk/Source/_javascript_Core/runtime/Butterfly.h 2014-03-25 03:27:46 UTC (rev 166217) @@ -157,9 +157,7 @@ // methods is not exhaustive and is not intended to encapsulate all possible allocation // modes of butterflies - there are code paths that allocate butterflies by calling // directly into Heap::tryAllocateStorage. -Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, size_t preCapacity, size_t oldPropertyCapacity, bool hasIndexingHeader, size_t indexingPayloadSizeInBytes, size_t newPropertyCapacity); -Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t oldPropertyCapacity, size_t newPropertyCapacity); -Butterfly* growPropertyStorage(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t newPropertyCapacity); +static Butterfly* createOrGrowPropertyStorage(Butterfly*, VM&, JSCell* intendedOwner, Structure*, size_t oldPropertyCapacity, size_t newPropertyCapacity); Butterfly* growArrayRight(VM&, JSCell* intendedOwner, Structure* oldStructure, size_t propertyCapacity, bool hadIndexingHeader, size_t oldIndexingPayloadSizeInBytes, size_t newIndexingPayloadSizeInBytes); // Assumes that preCapacity is zero, and asserts as much. Butterfly* growArrayRight(VM&, JSCell* intendedOwner, Structure*, size_t newIndexingPayloadSizeInBytes); Butterfly* resizeArray(VM&, JSCell* intendedOwner, size_t propertyCapacity, bool oldHasIndexingHeader, size_t oldIndexingPayloadSizeInBytes, size_t newPreCapacity, bool newHasIndexingHeader, size_t newIndexingPayloadSizeInBytes); Modified: trunk/Source/_javascript_Core/runtime/ButterflyInlines.h (166216 => 166217) --- trunk/Source/_javascript_Core/runtime/ButterflyInlines.h 2014-03-25 01:54:01 UTC (rev 166216) +++ trunk/Source/_javascript_Core/runtime/ButterflyInlines.h 2014-03-25 03:27:46 UTC (rev 166217) @@ -75,39 +75,25 @@ return base(indexingHeader()->preCapacity(structure), structure->outOfLineCapacity()); } -inline Butterfly* Butterfly::growPropertyStorage( -VM& vm, JSCell* intendedOwner, size_t preCapacity, size_t oldPropertyCapacity, -
[webkit-changes] [166216] trunk
Title: [166216] trunk Revision 166216 Author oli...@apple.com Date 2014-03-24 18:54:01 -0700 (Mon, 24 Mar 2014) Log Message Strict mode destructuring assignment crashes the parser. https://bugs.webkit.org/show_bug.cgi?id=130538 Reviewed by Michael Saboff. Source/_javascript_Core: The SyntaxChecker mode always return 1 for success, except for a small subset of functions where we needed exact information. This ends up just being a poor design decision as it means the parser can get confused between a function return 1, and the Resolve constant which was also 1. So we now use a unique type for every creation method. * parser/SyntaxChecker.h: (JSC::SyntaxChecker::createSourceElements): (JSC::SyntaxChecker::createFunctionBody): (JSC::SyntaxChecker::createArguments): (JSC::SyntaxChecker::createSpreadExpression): (JSC::SyntaxChecker::createArgumentsList): (JSC::SyntaxChecker::createPropertyList): (JSC::SyntaxChecker::createElementList): (JSC::SyntaxChecker::createFormalParameterList): (JSC::SyntaxChecker::createClause): (JSC::SyntaxChecker::createClauseList): (JSC::SyntaxChecker::createFuncDeclStatement): (JSC::SyntaxChecker::createBlockStatement): (JSC::SyntaxChecker::createExprStatement): (JSC::SyntaxChecker::createIfStatement): (JSC::SyntaxChecker::createForLoop): (JSC::SyntaxChecker::createForInLoop): (JSC::SyntaxChecker::createForOfLoop): (JSC::SyntaxChecker::createEmptyStatement): (JSC::SyntaxChecker::createVarStatement): (JSC::SyntaxChecker::createReturnStatement): (JSC::SyntaxChecker::createBreakStatement): (JSC::SyntaxChecker::createContinueStatement): (JSC::SyntaxChecker::createTryStatement): (JSC::SyntaxChecker::createSwitchStatement): (JSC::SyntaxChecker::createWhileStatement): (JSC::SyntaxChecker::createWithStatement): (JSC::SyntaxChecker::createDoWhileStatement): (JSC::SyntaxChecker::createLabelStatement): (JSC::SyntaxChecker::createThrowStatement): (JSC::SyntaxChecker::createDebugger): (JSC::SyntaxChecker::createConstStatement): (JSC::SyntaxChecker::appendConstDecl): (JSC::SyntaxChecker::combineCommaNodes): (JSC::SyntaxChecker::operatorStackPop): LayoutTests: Add tests * js/parser-syntax-check-expected.txt: * js/script-tests/parser-syntax-check.js: Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/js/parser-syntax-check-expected.txt trunk/LayoutTests/js/script-tests/parser-syntax-check.js trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/parser/SyntaxChecker.h Diff Modified: trunk/LayoutTests/ChangeLog (166215 => 166216) --- trunk/LayoutTests/ChangeLog 2014-03-25 01:21:04 UTC (rev 166215) +++ trunk/LayoutTests/ChangeLog 2014-03-25 01:54:01 UTC (rev 166216) @@ -1,3 +1,15 @@ +2014-03-24 Oliver Hunt + +Strict mode destructuring assignment crashes the parser. +https://bugs.webkit.org/show_bug.cgi?id=130538 + +Reviewed by Michael Saboff. + +Add tests + +* js/parser-syntax-check-expected.txt: +* js/script-tests/parser-syntax-check.js: + 2014-03-24 Daniel Bates XSS Auditor doesn't block
[webkit-changes] [166215] trunk/Source/WebCore
Title: [166215] trunk/Source/WebCore
Revision 166215
Author simon.fra...@apple.com
Date 2014-03-24 18:21:04 -0700 (Mon, 24 Mar 2014)
Log Message
Remove some unnecessary includes from PlatformCALayerClient.h
https://bugs.webkit.org/show_bug.cgi?id=130703
Reviewed by Andreas Kling.
No need for all these #includes.
* platform/graphics/ca/PlatformCALayerClient.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (166214 => 166215)
--- trunk/Source/WebCore/ChangeLog 2014-03-25 01:14:24 UTC (rev 166214)
+++ trunk/Source/WebCore/ChangeLog 2014-03-25 01:21:04 UTC (rev 166215)
@@ -1,3 +1,14 @@
+2014-03-24 Simon Fraser
+
+Remove some unnecessary includes from PlatformCALayerClient.h
+https://bugs.webkit.org/show_bug.cgi?id=130703
+
+Reviewed by Andreas Kling.
+
+No need for all these #includes.
+
+* platform/graphics/ca/PlatformCALayerClient.h:
+
2014-03-24 Adenilson Cavalcanti
[core] FEGaussianBlur: use IntSize to simplify member function interface
Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h (166214 => 166215)
--- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h 2014-03-25 01:14:24 UTC (rev 166214)
+++ trunk/Source/WebCore/platform/graphics/ca/PlatformCALayerClient.h 2014-03-25 01:21:04 UTC (rev 166215)
@@ -26,19 +26,12 @@
#ifndef PlatformCALayerClient_h
#define PlatformCALayerClient_h
-#include "GraphicsContext.h"
#include "GraphicsLayer.h"
-#include "PlatformCAAnimation.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
namespace WebCore {
+class FloatRect;
+class GraphicsContext;
class PlatformCALayer;
class PlatformCALayerClient {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166213] trunk/Source/WebKit2
Title: [166213] trunk/Source/WebKit2
Revision 166213
Author benja...@webkit.org
Date 2014-03-24 17:54:27 -0700 (Mon, 24 Mar 2014)
Log Message
[WK2] SpinLock are not initialized by default, ViewUpdateDispatcher is missing an initializer
https://bugs.webkit.org/show_bug.cgi?id=130705
Patch by Benjamin Poulain on 2014-03-24
Reviewed by Simon Fraser.
* WebProcess/WebPage/ViewUpdateDispatcher.cpp:
(WebKit::ViewUpdateDispatcher::ViewUpdateDispatcher):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166212 => 166213)
--- trunk/Source/WebKit2/ChangeLog 2014-03-25 00:52:46 UTC (rev 166212)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-25 00:54:27 UTC (rev 166213)
@@ -1,3 +1,13 @@
+2014-03-24 Benjamin Poulain
+
+[WK2] SpinLock are not initialized by default, ViewUpdateDispatcher is missing an initializer
+https://bugs.webkit.org/show_bug.cgi?id=130705
+
+Reviewed by Simon Fraser.
+
+* WebProcess/WebPage/ViewUpdateDispatcher.cpp:
+(WebKit::ViewUpdateDispatcher::ViewUpdateDispatcher):
+
2014-03-24 Enrica Casucci
[iOS WebKit2] Dictation support.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp (166212 => 166213)
--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2014-03-25 00:52:46 UTC (rev 166212)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2014-03-25 00:54:27 UTC (rev 166213)
@@ -42,6 +42,7 @@
ViewUpdateDispatcher::ViewUpdateDispatcher()
: m_queue(WorkQueue::create("com.apple.WebKit.ViewUpdateDispatcher"))
+, m_dataMutex(SPINLOCK_INITIALIZER)
{
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166212] trunk
Title: [166212] trunk
Revision 166212
Author bb...@apple.com
Date 2014-03-24 17:52:46 -0700 (Mon, 24 Mar 2014)
Log Message
Web Replay: capture and replay keyboard events
https://bugs.webkit.org/show_bug.cgi?id=130314
Reviewed by Joseph Pecoraro.
.:
* ManualTests/inspector/replay-keyboard-events.html: Added.
Source/WebCore:
Upstream support for capturing and replaying non-IME keyboard input.
This works similarly to mouse events. It introduces optional fields and
macros to encode/decode them.
Test: ManualTests/inspector/replay-keyboard-events.html
* replay/ReplayInputDispatchMethods.cpp:
(WebCore::HandleKeyPress::dispatch):
* replay/SerializationMethods.cpp:
(JSC::EncodingTraits::encodeValue):
(JSC::EncodingTraits::decodeValue): Switch existing
encode/decode calls to use the shortening macros.
(JSC::EncodingTraits::encodeValue): Added.
(JSC::EncodingTraits::decodeValue): Added.
(JSC::PlatformKeyboardEventAppKit::PlatformKeyboardEventAppKit): Subclass
PlatformKeyboardEvent so that we can set AppKit-specific members not
initialized through the main constructors.
(JSC::EncodingTraits::encodeValue): Added.
(JSC::EncodingTraits::decodeValue): Added.
* replay/SerializationMethods.h:
* replay/UserInputBridge.cpp:
(WebCore::UserInputBridge::UserInputBridge): initialize m_state inside a guard.
(WebCore::UserInputBridge::handleKeyEvent): fill in the implementation.
* replay/WebInputs.json:
Modified Paths
trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/replay/ReplayInputDispatchMethods.cpp
trunk/Source/WebCore/replay/SerializationMethods.cpp
trunk/Source/WebCore/replay/SerializationMethods.h
trunk/Source/WebCore/replay/UserInputBridge.cpp
trunk/Source/WebCore/replay/WebInputs.json
Added Paths
trunk/ManualTests/inspector/replay-keyboard-events.html
Diff
Modified: trunk/ChangeLog (166211 => 166212)
--- trunk/ChangeLog 2014-03-25 00:17:45 UTC (rev 166211)
+++ trunk/ChangeLog 2014-03-25 00:52:46 UTC (rev 166212)
@@ -1,3 +1,12 @@
+2014-03-24 Brian Burg
+
+Web Replay: capture and replay keyboard events
+https://bugs.webkit.org/show_bug.cgi?id=130314
+
+Reviewed by Joseph Pecoraro.
+
+* ManualTests/inspector/replay-keyboard-events.html: Added.
+
2014-03-24 Sangyong Park
[EFL] Inspector page is not loaded.
Added: trunk/ManualTests/inspector/replay-keyboard-events.html (0 => 166212)
--- trunk/ManualTests/inspector/replay-keyboard-events.html (rev 0)
+++ trunk/ManualTests/inspector/replay-keyboard-events.html 2014-03-25 00:52:46 UTC (rev 166212)
@@ -0,0 +1,104 @@
+
+
+
+
+document._onkeypress_ = handleEvent;
+document._onkeydown_ = handleEvent;
+document._onkeyup_ = handleEvent;
+window.dumpedEvents = [];
+
+function handleEvent(event) {
+var properties = ["type", "eventPhase", "bubbles", "cancelable", "keyIdentifier", "location", "shiftKey", "altKey", "metaKey", "altGraphKey", "keyCode", "charCode"];
+obj = {};
+for (var key of properties)
+obj[key] = event[key];
+
+dumpedEvents.push(obj);
+
+var block = createBlock(hex_md5(JSON.stringify(obj)), event);
+var blocksContainer = document.getElementById("blocks");
+blocksContainer.appendChild(block);
+
+var hashLabel = document.getElementById("hash");
+hash.textContent = hex_md5(JSON.stringify(dumpedEvents));
+}
+
+function createBlock(hash, event) {
+
+function glyphForType(type) {
+switch (type) {
+case "keydown": return "D";
+case "keyup": return "U";
+case "keypress": return "K";
+}
+}
+
+var color = "#" + hash.substr(0,6);
+var block = document.createElement("span");
+var eventTypeLabel = document.createElement("span");
+eventTypeLabel.className = "event-label";
+eventTypeLabel.textContent = glyphForType(event.type);
+block.appendChild(eventTypeLabel);
+
+var keyLabel = document.createElement("span");
+keyLabel.className = "key-label";
+var codepointRegEx = /^U\+\d{4}$/;
+keyLabel.textContent = event.keyIdentifier.match(codepointRegEx) ? String.fromCharCode(event.keyCode) : event.keyIdentifier;
+block.appendChild(keyLabel);
+block.style.backgroundColor = color;
+return block;
+}
+
+function stateHash() {
+return hex_md5(JSON.stringify(dumpedEvents));
+}
+
+
+
+body {
+max-width: 800px;
+}
+#blocks {
+display: -webkit-flex;
+width: 600px;
+-webkit-flex-flow: row wrap;
+}
+
+#blocks > span {
+padding: 2px 2px;
+border-radius: 4px;
+margin: 2px;
+font-size: 12px;
+font-weight: bold;
+font-family: sans-serif;
+color: #fff;
+text-align: center;
+}
+
+.event-label::before {
+content: '(';
+}
+
+.event-label::after {
+content: ') ';
+}
+
+.key-label {
+}
+
+
+
+This page is a manual test for capture
[webkit-changes] [166211] tags/Safari-538.24.1/Source
Title: [166211] tags/Safari-538.24.1/Source Revision 166211 Author lforsch...@apple.com Date 2014-03-24 17:17:45 -0700 (Mon, 24 Mar 2014) Log Message Versioning. Modified Paths tags/Safari-538.24.1/Source/_javascript_Core/Configurations/Version.xcconfig tags/Safari-538.24.1/Source/WebCore/Configurations/Version.xcconfig tags/Safari-538.24.1/Source/WebInspectorUI/Configurations/Version.xcconfig tags/Safari-538.24.1/Source/WebKit/mac/Configurations/Version.xcconfig tags/Safari-538.24.1/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: tags/Safari-538.24.1/Source/_javascript_Core/Configurations/Version.xcconfig (166210 => 166211) --- tags/Safari-538.24.1/Source/_javascript_Core/Configurations/Version.xcconfig 2014-03-25 00:15:23 UTC (rev 166210) +++ tags/Safari-538.24.1/Source/_javascript_Core/Configurations/Version.xcconfig 2014-03-25 00:17:45 UTC (rev 166211) @@ -23,8 +23,8 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); +TINY_VERSION = 1; +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-538.24.1/Source/WebCore/Configurations/Version.xcconfig (166210 => 166211) --- tags/Safari-538.24.1/Source/WebCore/Configurations/Version.xcconfig 2014-03-25 00:15:23 UTC (rev 166210) +++ tags/Safari-538.24.1/Source/WebCore/Configurations/Version.xcconfig 2014-03-25 00:17:45 UTC (rev 166211) @@ -23,8 +23,8 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); +TINY_VERSION = 1; +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-538.24.1/Source/WebInspectorUI/Configurations/Version.xcconfig (166210 => 166211) --- tags/Safari-538.24.1/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-03-25 00:15:23 UTC (rev 166210) +++ tags/Safari-538.24.1/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-03-25 00:17:45 UTC (rev 166211) @@ -1,7 +1,7 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); +TINY_VERSION = 1; +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The system version prefix is based on the current system version. SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)); Modified: tags/Safari-538.24.1/Source/WebKit/mac/Configurations/Version.xcconfig (166210 => 166211) --- tags/Safari-538.24.1/Source/WebKit/mac/Configurations/Version.xcconfig 2014-03-25 00:15:23 UTC (rev 166210) +++ tags/Safari-538.24.1/Source/WebKit/mac/Configurations/Version.xcconfig 2014-03-25 00:17:45 UTC (rev 166211) @@ -23,8 +23,8 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); +TINY_VERSION = 1; +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); Modified: tags/Safari-538.24.1/Source/WebKit2/Configurations/Version.xcconfig (166210 => 166211) --- tags/Safari-538.24.1/Source/WebKit2/Configurations/Version.xcconfig 2014-03-25 00:15:23 UTC (rev 166210) +++ tags/Safari-538.24.1/Source/WebKit2/Configurations/Version.xcconfig 2014-03-25 00:17:45 UTC (rev 166211) @@ -23,8 +23,8 @@ MAJOR_VERSION = 538; MINOR_VERSION = 24; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); +TINY_VERSION = 1; +FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION); // The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166210] tags/Safari-538.24.1/Source/WebKit2
Title: [166210] tags/Safari-538.24.1/Source/WebKit2
Revision 166210
Author lforsch...@apple.com
Date 2014-03-24 17:15:23 -0700 (Mon, 24 Mar 2014)
Log Message
Merged r166203.
Modified Paths
tags/Safari-538.24.1/Source/WebKit2/ChangeLog
tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.h
Diff
Modified: tags/Safari-538.24.1/Source/WebKit2/ChangeLog (166209 => 166210)
--- tags/Safari-538.24.1/Source/WebKit2/ChangeLog 2014-03-25 00:12:12 UTC (rev 166209)
+++ tags/Safari-538.24.1/Source/WebKit2/ChangeLog 2014-03-25 00:15:23 UTC (rev 166210)
@@ -1,3 +1,26 @@
+2014-03-24 Lucas Forschler
+
+Merge r166203
+
+2014-03-24 Tim Horton
+
+REGRESSION (r165872): Double-applying device scale to snapshots
+https://bugs.webkit.org/show_bug.cgi?id=130697
+
+
+Reviewed by Simon Fraser.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::scaledSnapshotWithOptions):
+Drive-by, make scaledSnapshotWithOptions respect SnapshotOptionsExcludeDeviceScaleFactor.
+
+(WebKit::WebPage::snapshotAtSize):
+Divide the device scale out of the scale factor
+
+* WebProcess/WebPage/WebPage.h:
+Rename the scale argument to scaledSnapshotWithOptions to clarify
+that it is an additional scale on top of the device scale.
+
2014-03-19 Tim Horton
Address late review comment and style nit after r165934.
Modified: tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166209 => 166210)
--- tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-25 00:12:12 UTC (rev 166209)
+++ tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-25 00:15:23 UTC (rev 166210)
@@ -1528,14 +1528,17 @@
send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
}
-PassRefPtr WebPage::scaledSnapshotWithOptions(const IntRect& rect, double scaleFactor, SnapshotOptions options)
+PassRefPtr WebPage::scaledSnapshotWithOptions(const IntRect& rect, double additionalScaleFactor, SnapshotOptions options)
{
IntRect snapshotRect = rect;
if (options & SnapshotOptionsRespectDrawingAreaTransform)
snapshotRect = m_drawingArea->rootLayerTransform().inverse().mapRect(snapshotRect);
IntSize bitmapSize = snapshotRect.size();
-bitmapSize.scale(scaleFactor * corePage()->deviceScaleFactor());
+double scaleFactor = additionalScaleFactor;
+if (!(options & SnapshotOptionsExcludeDeviceScaleFactor))
+scaleFactor *= corePage()->deviceScaleFactor();
+bitmapSize.scale(scaleFactor);
return snapshotAtSize(rect, bitmapSize, options);
}
@@ -1566,8 +1569,11 @@
graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), frameView->baseBackgroundColor(), ColorSpaceDeviceRGB);
-if (!(options & SnapshotOptionsExcludeDeviceScaleFactor))
-graphicsContext->applyDeviceScaleFactor(corePage()->deviceScaleFactor());
+if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
+double deviceScaleFactor = corePage()->deviceScaleFactor();
+graphicsContext->applyDeviceScaleFactor(deviceScaleFactor);
+scaleFactor /= deviceScaleFactor;
+}
graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
graphicsContext->translate(-snapshotRect.x(), -snapshotRect.y());
Modified: tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.h (166209 => 166210)
--- tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-25 00:12:12 UTC (rev 166209)
+++ tags/Safari-538.24.1/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-25 00:15:23 UTC (rev 166210)
@@ -421,7 +421,7 @@
WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
-PassRefPtr scaledSnapshotWithOptions(const WebCore::IntRect&, double scaleFactor, SnapshotOptions);
+PassRefPtr scaledSnapshotWithOptions(const WebCore::IntRect&, double additionalScaleFactor, SnapshotOptions);
PassRefPtr snapshotAtSize(const WebCore::IntRect&, const WebCore::IntSize& bitmapSize, SnapshotOptions);
static const WebEvent* currentEvent();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166209] tags/Safari-538.24.1/
Title: [166209] tags/Safari-538.24.1/ Revision 166209 Author lforsch...@apple.com Date 2014-03-24 17:12:12 -0700 (Mon, 24 Mar 2014) Log Message New Tag. Added Paths tags/Safari-538.24.1/ Diff Property changes: tags/Safari-538.24.1 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166208] trunk/Source/WebKit2
Title: [166208] trunk/Source/WebKit2
Revision 166208
Author enr...@apple.com
Date 2014-03-24 16:51:58 -0700 (Mon, 24 Mar 2014)
Log Message
[iOS WebKit2] Dictation support.
https://bugs.webkit.org/show_bug.cgi?id=130622
Reviewed by Benjamin Poulain.
Adding support for dictation on iOS. There are two main types of interactions
with the dictation system:
- initial request for context, which consists in retrieving the selected text
and 5 words before the selection and 5 words after, if available.
- insertion of recognized chunks of text, providing the text
to replace.
* UIProcess/AutoCorrectionCallback.h:
(WebKit::DictationContextCallback::create):
(WebKit::DictationContextCallback::~DictationContextCallback):
(WebKit::DictationContextCallback::performCallbackWithReturnValue):
(WebKit::DictationContextCallback::invalidate):
(WebKit::DictationContextCallback::DictationContextCallback):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView replaceDictatedText:withText:]):
(-[WKContentView requestDictationContext:]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::dictationContextCallback):
(WebKit::WebPageProxy::replaceDictatedText):
(WebKit::WebPageProxy::requestDictationContext):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::requestDictationContext):
(WebKit::WebPage::replaceDictatedText):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166207 => 166208)
--- trunk/Source/WebKit2/ChangeLog 2014-03-24 23:44:24 UTC (rev 166207)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-24 23:51:58 UTC (rev 166208)
@@ -1,3 +1,40 @@
+2014-03-24 Enrica Casucci
+
+[iOS WebKit2] Dictation support.
+https://bugs.webkit.org/show_bug.cgi?id=130622
+
+
+Reviewed by Benjamin Poulain.
+
+Adding support for dictation on iOS. There are two main types of interactions
+with the dictation system:
+- initial request for context, which consists in retrieving the selected text
+and 5 words before the selection and 5 words after, if available.
+- insertion of recognized chunks of text, providing the text
+to replace.
+
+* UIProcess/AutoCorrectionCallback.h:
+(WebKit::DictationContextCallback::create):
+(WebKit::DictationContextCallback::~DictationContextCallback):
+(WebKit::DictationContextCallback::performCallbackWithReturnValue):
+(WebKit::DictationContextCallback::invalidate):
+(WebKit::DictationContextCallback::DictationContextCallback):
+* UIProcess/WebPageProxy.h:
+* UIProcess/WebPageProxy.messages.in:
+* UIProcess/ios/WKContentViewInteraction.h:
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView replaceDictatedText:withText:]):
+(-[WKContentView requestDictationContext:]):
+* UIProcess/ios/WebPageProxyIOS.mm:
+(WebKit::WebPageProxy::dictationContextCallback):
+(WebKit::WebPageProxy::replaceDictatedText):
+(WebKit::WebPageProxy::requestDictationContext):
+* WebProcess/WebPage/WebPage.h:
+* WebProcess/WebPage/WebPage.messages.in:
+* WebProcess/WebPage/ios/WebPageIOS.mm:
+(WebKit::WebPage::requestDictationContext):
+(WebKit::WebPage::replaceDictatedText):
+
2014-03-24 Andy Estes
Yet another iOS build fix, for the 32-bit build this time.
Modified: trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h (166207 => 166208)
--- trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h 2014-03-24 23:44:24 UTC (rev 166207)
+++ trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h 2014-03-24 23:51:58 UTC (rev 166208)
@@ -119,6 +119,46 @@
CallbackFunction m_callback;
};
+class DictationContextCallback : public CallbackBase {
+public:
+typedef std::function CallbackFunction;
+
+static PassRefPtr create(CallbackFunction callback)
+{
+return adoptRef(new DictationContextCallback(callback));
+}
+
+virtual ~DictationContextCallback()
+{
+ASSERT(!m_callback);
+}
+
+void performCallbackWithReturnValue(const String& returnValue1, const String& returnValue2, const String& returnValue3)
+{
+ASSERT(m_callback);
+
+m_callback(false,
[webkit-changes] [166207] trunk/Source/WebCore
Title: [166207] trunk/Source/WebCore
Revision 166207
Author thiago.lace...@openbossa.org
Date 2014-03-24 16:44:24 -0700 (Mon, 24 Mar 2014)
Log Message
Optimizing string construction for type error in JSNavigatorCustom.cpp
https://bugs.webkit.org/show_bug.cgi?id=130683
Reviewed by Eric Carlson.
* bindings/js/JSNavigatorCustom.cpp:
(WebCore::JSNavigator::webkitGetUserMedia):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (166206 => 166207)
--- trunk/Source/WebCore/ChangeLog 2014-03-24 23:30:01 UTC (rev 166206)
+++ trunk/Source/WebCore/ChangeLog 2014-03-24 23:44:24 UTC (rev 166207)
@@ -1,3 +1,13 @@
+2014-03-24 Thiago de Barros Lacerda
+
+Optimizing string construction for type error in JSNavigatorCustom.cpp
+https://bugs.webkit.org/show_bug.cgi?id=130683
+
+Reviewed by Eric Carlson.
+
+* bindings/js/JSNavigatorCustom.cpp:
+(WebCore::JSNavigator::webkitGetUserMedia):
+
2014-03-24 Beth Dakin
Legacy-style scrollbars constantly redraw after scrolling
Modified: trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp (166206 => 166207)
--- trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2014-03-24 23:30:01 UTC (rev 166206)
+++ trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2014-03-24 23:44:24 UTC (rev 166207)
@@ -55,7 +55,7 @@
}
if (!exec->argument(1).isFunction()) {
-throwVMError(exec, createTypeError(exec, "Argument 2 ('successCallback') to Navigator.webkitGetUserMedia must be a function"));
+throwVMTypeError(exec, makeDOMBindingsTypeErrorString("Argument 2 ('successCallback')", " to Navigator.webkitGetUserMedia must be a function"));
return jsUndefined();
}
@@ -63,7 +63,7 @@
RefPtr errorCallback;
if (!exec->argument(2).isUndefinedOrNull()) {
if (!exec->uncheckedArgument(2).isFunction()) {
-throwVMError(exec, createTypeError(exec, "Argument 3 ('errorCallback') to Navigator.webkitGetUserMedia must be a function"));
+throwVMTypeError(exec, makeDOMBindingsTypeErrorString("Argument 3 ('errorCallback')", " to Navigator.webkitGetUserMedia must be a function"));
return jsUndefined();
}
errorCallback = JSNavigatorUserMediaErrorCallback::create(asObject(exec->uncheckedArgument(2)), castedThis->globalObject());
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166206] trunk/Source/WebKit2
Title: [166206] trunk/Source/WebKit2
Revision 166206
Author aes...@apple.com
Date 2014-03-24 16:30:01 -0700 (Mon, 24 Mar 2014)
Log Message
Yet another iOS build fix, for the 32-bit build this time.
* Shared/Downloads/ios/DownloadIOS.mm:
(WebKit::setUpDownloadClient):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166205 => 166206)
--- trunk/Source/WebKit2/ChangeLog 2014-03-24 23:23:22 UTC (rev 166205)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-24 23:30:01 UTC (rev 166206)
@@ -1,3 +1,10 @@
+2014-03-24 Andy Estes
+
+Yet another iOS build fix, for the 32-bit build this time.
+
+* Shared/Downloads/ios/DownloadIOS.mm:
+(WebKit::setUpDownloadClient):
+
2014-03-24 Tim Horton
REGRESSION (r165872): Double-applying device scale to snapshots
Modified: trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm (166205 => 166206)
--- trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-03-24 23:23:22 UTC (rev 166205)
+++ trunk/Source/WebKit2/Shared/Downloads/ios/DownloadIOS.mm 2014-03-24 23:30:01 UTC (rev 166206)
@@ -95,7 +95,7 @@
client.decideDestinationWithSuggestedObjectName = [](CFURLDownloadRef downloadRef, CFStringRef objectName, const void* clientInfo) {
dispatchOnMainThread(^{
-BOOL allowOverwrite;
+bool allowOverwrite;
String destination = toDownload(clientInfo)->decideDestinationWithSuggestedFilename(objectName, allowOverwrite);
if (!destination.isNull())
CFURLDownloadSetDestination(downloadRef, reinterpret_cast([NSURL fileURLWithPath:destination]), allowOverwrite);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166205] trunk/Source/WebCore
Title: [166205] trunk/Source/WebCore Revision 166205 Author bda...@apple.com Date 2014-03-24 16:23:22 -0700 (Mon, 24 Mar 2014) Log Message Legacy-style scrollbars constantly redraw after scrolling https://bugs.webkit.org/show_bug.cgi?id=130699 Reviewed by Simon Fraser. The constant re-draw was happening because we were never calling [ScrollbarPainter setUsePresentationValue:NO]. This is a silly bug where were should have been looking at PlatformWheelEvent::momentumPhase() instead of PlatformWheelEvent::phase() * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm: (WebCore::ScrollingTreeScrollingNodeMac::handleWheelEvent): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm Diff Modified: trunk/Source/WebCore/ChangeLog (166204 => 166205) --- trunk/Source/WebCore/ChangeLog 2014-03-24 23:21:50 UTC (rev 166204) +++ trunk/Source/WebCore/ChangeLog 2014-03-24 23:23:22 UTC (rev 166205) @@ -1,3 +1,18 @@ +2014-03-24 Beth Dakin + +Legacy-style scrollbars constantly redraw after scrolling +https://bugs.webkit.org/show_bug.cgi?id=130699 + +Reviewed by Simon Fraser. + +The constant re-draw was happening because we were never calling [ScrollbarPainter +setUsePresentationValue:NO]. This is a silly bug where were should have been +looking at PlatformWheelEvent::momentumPhase() instead of +PlatformWheelEvent::phase() + +* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm: +(WebCore::ScrollingTreeScrollingNodeMac::handleWheelEvent): + 2014-03-24 Daniel Bates XSS Auditor doesn't block
[webkit-changes] [166204] trunk/Tools
Title: [166204] trunk/Tools Revision 166204 Author aes...@apple.com Date 2014-03-24 16:21:50 -0700 (Mon, 24 Mar 2014) Log Message Fix the iOS build of TestWebKitAPI. * TestWebKitAPI/Configurations/Base.xcconfig: * TestWebKitAPI/PlatformUtilities.h: Modified Paths trunk/Tools/ChangeLog trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig trunk/Tools/TestWebKitAPI/PlatformUtilities.h Diff Modified: trunk/Tools/ChangeLog (166203 => 166204) --- trunk/Tools/ChangeLog 2014-03-24 23:14:22 UTC (rev 166203) +++ trunk/Tools/ChangeLog 2014-03-24 23:21:50 UTC (rev 166204) @@ -1,3 +1,10 @@ +2014-03-24 Andy Estes + +Fix the iOS build of TestWebKitAPI. + +* TestWebKitAPI/Configurations/Base.xcconfig: +* TestWebKitAPI/PlatformUtilities.h: + 2014-03-24 László Langó Fix prepare-ChangeLog after r166156. Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (166203 => 166204) --- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2014-03-24 23:14:22 UTC (rev 166203) +++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2014-03-24 23:21:50 UTC (rev 166204) @@ -64,7 +64,7 @@ EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME)); EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm; -EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* _javascript_Test.* */mac/* CustomProtocolsSyncXHRTest.mm Tests/WebKit2Cocoa/Navigation.mm; +EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm *InjectedBundle* *PlatformUtilities* Tests/WebKit2/* Tests/WebKit2ObjC/* *_Bundle* _javascript_Test.* */mac/* CustomProtocolsSyncXHRTest.mm Tests/WebKit2Cocoa/Navigation.mm Tests/WebKit2Cocoa/Download.mm; EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos); TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)); Modified: trunk/Tools/TestWebKitAPI/PlatformUtilities.h (166203 => 166204) --- trunk/Tools/TestWebKitAPI/PlatformUtilities.h 2014-03-24 23:14:22 UTC (rev 166203) +++ trunk/Tools/TestWebKitAPI/PlatformUtilities.h 2014-03-24 23:21:50 UTC (rev 166204) @@ -26,6 +26,7 @@ #ifndef PlatformUtilities_h #define PlatformUtilities_h +#include #include #include ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166201] trunk
Title: [166201] trunk Revision 166201 Author bfulg...@apple.com Date 2014-03-24 16:01:56 -0700 (Mon, 24 Mar 2014) Log Message Activate WebVTT Tests Once Merging is Complete https://bugs.webkit.org/show_bug.cgi?id=130420 Reviewed by Eric Carlson. Source/_javascript_Core: * Configurations/FeatureDefines.xcconfig: Turn on ENABLE(WEBVTT_REGIONS) Source/WebCore: * Configurations/FeatureDefines.xcconfig: Turn on ENABLE(WEBVTT_REGIONS) Source/WebKit/mac: * Configurations/FeatureDefines.xcconfig: Turn on ENABLE(WEBVTT_REGIONS) Source/WebKit2: * Configurations/FeatureDefines.xcconfig: Turn on ENABLE(WEBVTT_REGIONS) LayoutTests: * TestExpectations: Remove [Skip] for media/track/regions-webvtt * platform/efl/TestExpectations: Skip media/track/regions-webvtt * platform/gtk/TestExpectations: Skip media/track/regions-webvtt * platform/mac/js/dom/global-constructors-attributes.html: Add new VTTRegions cases. * platform/mac-mountainlion/js/dom/global-constructors-attributes.html: Ditto. * platform/win/TestExpectations: Skip media/track/regions-webvtt Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/TestExpectations trunk/LayoutTests/platform/efl/TestExpectations trunk/LayoutTests/platform/gtk/TestExpectations trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/mac-mountainlion/js/dom/global-constructors-attributes-expected.txt trunk/LayoutTests/platform/win/TestExpectations trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig trunk/Source/WebKit/mac/ChangeLog trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig Diff Modified: trunk/LayoutTests/ChangeLog (166200 => 166201) --- trunk/LayoutTests/ChangeLog 2014-03-24 22:59:47 UTC (rev 166200) +++ trunk/LayoutTests/ChangeLog 2014-03-24 23:01:56 UTC (rev 166201) @@ -1,3 +1,17 @@ +2014-03-24 Brent Fulgham + +Activate WebVTT Tests Once Merging is Complete +https://bugs.webkit.org/show_bug.cgi?id=130420 + +Reviewed by Eric Carlson. + +* TestExpectations: Remove [Skip] for media/track/regions-webvtt +* platform/efl/TestExpectations: Skip media/track/regions-webvtt +* platform/gtk/TestExpectations: Skip media/track/regions-webvtt +* platform/mac/js/dom/global-constructors-attributes.html: Add new VTTRegions cases. +* platform/mac-mountainlion/js/dom/global-constructors-attributes.html: Ditto. +* platform/win/TestExpectations: Skip media/track/regions-webvtt + 2014-03-24 Thiago de Barros Lacerda Update some mediastream LayoutTests results Modified: trunk/LayoutTests/TestExpectations (166200 => 166201) --- trunk/LayoutTests/TestExpectations 2014-03-24 22:59:47 UTC (rev 166200) +++ trunk/LayoutTests/TestExpectations 2014-03-24 23:01:56 UTC (rev 166201) @@ -8,9 +8,6 @@ # pending functional patch and per-port verification webkit.org/b/109954 css3/line-break [ Skip ] -# pending implementation completion and feature enabling -webkit.org/b/109570 media/track/regions-webvtt [ Skip ] - # media/video-seek-after-end.html is flaky webkit.org/b/116293 media/video-seek-after-end.html [ Pass Failure ] Modified: trunk/LayoutTests/platform/efl/TestExpectations (166200 => 166201) --- trunk/LayoutTests/platform/efl/TestExpectations 2014-03-24 22:59:47 UTC (rev 166200) +++ trunk/LayoutTests/platform/efl/TestExpectations 2014-03-24 23:01:56 UTC (rev 166201) @@ -1847,3 +1847,6 @@ webkit.org/b/130187 accessibility/aria-hidden-false-works-in-subtrees.html [ Missing ] webkit.org/b/130189 fast/regions/assert-hit-test-image.html [ Failure ] + +# ENABLE(WEBVTT_REGIONS) is disabled +webkit.org/b/109570 media/track/regions-webvtt [ Skip ] Modified: trunk/LayoutTests/platform/gtk/TestExpectations (166200 => 166201) --- trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-24 22:59:47 UTC (rev 166200) +++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-24 23:01:56 UTC (rev 166201) @@ -380,6 +380,10 @@ Bug(GTK) accessibility/corresponding-control-deleted-crash.html [ Skip ] Bug(GTK) editing/text-iterator/basic-iteration-shadowdom.html [ Skip ] # + +# ENABLE(WEBVTT_REGIONS) is disabled +webkit.org/b/109570 media/track/regions-webvtt [ Skip ] + # # End of Expected failures # Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (166200 => 166201) --- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2014-03-24 22:59:47 UTC (rev 166200) +++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attribu
[webkit-changes] [166203] trunk/Source/WebKit2
Title: [166203] trunk/Source/WebKit2
Revision 166203
Author timothy_hor...@apple.com
Date 2014-03-24 16:14:22 -0700 (Mon, 24 Mar 2014)
Log Message
REGRESSION (r165872): Double-applying device scale to snapshots
https://bugs.webkit.org/show_bug.cgi?id=130697
Reviewed by Simon Fraser.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scaledSnapshotWithOptions):
Drive-by, make scaledSnapshotWithOptions respect SnapshotOptionsExcludeDeviceScaleFactor.
(WebKit::WebPage::snapshotAtSize):
Divide the device scale out of the scale factor
* WebProcess/WebPage/WebPage.h:
Rename the scale argument to scaledSnapshotWithOptions to clarify
that it is an additional scale on top of the device scale.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166202 => 166203)
--- trunk/Source/WebKit2/ChangeLog 2014-03-24 23:11:43 UTC (rev 166202)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-24 23:14:22 UTC (rev 166203)
@@ -1,3 +1,22 @@
+2014-03-24 Tim Horton
+
+REGRESSION (r165872): Double-applying device scale to snapshots
+https://bugs.webkit.org/show_bug.cgi?id=130697
+
+
+Reviewed by Simon Fraser.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::scaledSnapshotWithOptions):
+Drive-by, make scaledSnapshotWithOptions respect SnapshotOptionsExcludeDeviceScaleFactor.
+
+(WebKit::WebPage::snapshotAtSize):
+Divide the device scale out of the scale factor
+
+* WebProcess/WebPage/WebPage.h:
+Rename the scale argument to scaledSnapshotWithOptions to clarify
+that it is an additional scale on top of the device scale.
+
2014-03-24 Brent Fulgham
Activate WebVTT Tests Once Merging is Complete
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166202 => 166203)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-24 23:11:43 UTC (rev 166202)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-24 23:14:22 UTC (rev 166203)
@@ -1531,14 +1531,17 @@
send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
}
-PassRefPtr WebPage::scaledSnapshotWithOptions(const IntRect& rect, double scaleFactor, SnapshotOptions options)
+PassRefPtr WebPage::scaledSnapshotWithOptions(const IntRect& rect, double additionalScaleFactor, SnapshotOptions options)
{
IntRect snapshotRect = rect;
if (options & SnapshotOptionsRespectDrawingAreaTransform)
snapshotRect = m_drawingArea->rootLayerTransform().inverse().mapRect(snapshotRect);
IntSize bitmapSize = snapshotRect.size();
-bitmapSize.scale(scaleFactor * corePage()->deviceScaleFactor());
+double scaleFactor = additionalScaleFactor;
+if (!(options & SnapshotOptionsExcludeDeviceScaleFactor))
+scaleFactor *= corePage()->deviceScaleFactor();
+bitmapSize.scale(scaleFactor);
return snapshotAtSize(rect, bitmapSize, options);
}
@@ -1569,8 +1572,11 @@
graphicsContext->fillRect(IntRect(IntPoint(), bitmapSize), frameView->baseBackgroundColor(), ColorSpaceDeviceRGB);
-if (!(options & SnapshotOptionsExcludeDeviceScaleFactor))
-graphicsContext->applyDeviceScaleFactor(corePage()->deviceScaleFactor());
+if (!(options & SnapshotOptionsExcludeDeviceScaleFactor)) {
+double deviceScaleFactor = corePage()->deviceScaleFactor();
+graphicsContext->applyDeviceScaleFactor(deviceScaleFactor);
+scaleFactor /= deviceScaleFactor;
+}
graphicsContext->scale(FloatSize(scaleFactor, scaleFactor));
graphicsContext->translate(-snapshotRect.x(), -snapshotRect.y());
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (166202 => 166203)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-24 23:11:43 UTC (rev 166202)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-24 23:14:22 UTC (rev 166203)
@@ -421,7 +421,7 @@
WebCore::IntPoint screenToRootView(const WebCore::IntPoint&);
WebCore::IntRect rootViewToScreen(const WebCore::IntRect&);
-PassRefPtr scaledSnapshotWithOptions(const WebCore::IntRect&, double scaleFactor, SnapshotOptions);
+PassRefPtr scaledSnapshotWithOptions(const WebCore::IntRect&, double additionalScaleFactor, SnapshotOptions);
PassRefPtr snapshotAtSize(const WebCore::IntRect&, const WebCore::IntSize& bitmapSize, SnapshotOptions);
static const WebEvent* currentEvent();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [166202] trunk
Title: [166202] trunk Revision 166202 Author dba...@webkit.org Date 2014-03-24 16:11:43 -0700 (Mon, 24 Mar 2014) Log Message XSS Auditor doesn't block injected before an existing