[webkit-changes] [159994] trunk/Source/WebKit2
Title: [159994] trunk/Source/WebKit2 Revision 159994 Author zandober...@gmail.com Date 2013-12-03 00:01:17 -0800 (Tue, 03 Dec 2013) Log Message Build fixes for GCC-using ports after r159965 and later https://bugs.webkit.org/show_bug.cgi?id=125136 GCC doesn't process API::ClientTraits template instantiations unless they're done inside the API namespace. * Shared/WebConnectionClient.h: * UIProcess/Notifications/WebNotificationProvider.h: * UIProcess/WebContextClient.h: * UIProcess/WebContextConnectionClient.h: * UIProcess/WebContextInjectedBundleClient.h: * UIProcess/WebCookieManagerProxyClient.h: * UIProcess/WebDatabaseManagerProxyClient.h: * UIProcess/WebDownloadClient.h: * UIProcess/WebFindClient.h: * UIProcess/WebFormClient.h: * UIProcess/WebGeolocationProvider.h: * UIProcess/WebHistoryClient.h: * UIProcess/WebIconDatabaseClient.h: * UIProcess/WebLoaderClient.h: * UIProcess/WebOriginDataManagerProxyChangeClient.h: * UIProcess/WebPageContextMenuClient.h: * UIProcess/WebPolicyClient.h: * UIProcess/WebUIClient.h: * WebProcess/InjectedBundle/InjectedBundleClient.h: * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h: * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h: * WebProcess/InjectedBundle/InjectedBundlePageFormClient.h: * WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h: * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h: * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h: * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h: * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/WebConnectionClient.h trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.h trunk/Source/WebKit2/UIProcess/WebContextClient.h trunk/Source/WebKit2/UIProcess/WebContextConnectionClient.h trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h trunk/Source/WebKit2/UIProcess/WebDownloadClient.h trunk/Source/WebKit2/UIProcess/WebFindClient.h trunk/Source/WebKit2/UIProcess/WebFormClient.h trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h trunk/Source/WebKit2/UIProcess/WebHistoryClient.h trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h trunk/Source/WebKit2/UIProcess/WebLoaderClient.h trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxyChangeClient.h trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h trunk/Source/WebKit2/UIProcess/WebPolicyClient.h trunk/Source/WebKit2/UIProcess/WebUIClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h Diff Modified: trunk/Source/WebKit2/ChangeLog (159993 => 159994) --- trunk/Source/WebKit2/ChangeLog 2013-12-03 06:20:39 UTC (rev 159993) +++ trunk/Source/WebKit2/ChangeLog 2013-12-03 08:01:17 UTC (rev 159994) @@ -1,3 +1,40 @@ +2013-12-02 Zan Dobersek + +Build fixes for GCC-using ports after r159965 and later +https://bugs.webkit.org/show_bug.cgi?id=125136 + +GCC doesn't process API::ClientTraits template instantiations unless they're done +inside the API namespace. + +* Shared/WebConnectionClient.h: +* UIProcess/Notifications/WebNotificationProvider.h: +* UIProcess/WebContextClient.h: +* UIProcess/WebContextConnectionClient.h: +* UIProcess/WebContextInjectedBundleClient.h: +* UIProcess/WebCookieManagerProxyClient.h: +* UIProcess/WebDatabaseManagerProxyClient.h: +* UIProcess/WebDownloadClient.h: +* UIProcess/WebFindClient.h: +* UIProcess/WebFormClient.h: +* UIProcess/WebGeolocationProvider.h: +* UIProcess/WebHistoryClient.h: +* UIProcess/WebIconDatabaseClient.h: +* UIProcess/WebLoaderClient.h: +* UIProcess/WebOriginDataManagerProxyChangeClient.h: +* UIProcess/WebPageContextMenuClient.h: +* UIProcess/WebPolicyClient.h: +* UIProcess/WebUIClient.h: +* WebProcess/InjectedBundle/InjectedBundleClient.h: +* WebProcess/InjectedBundle/InjectedBundlePageContextMen
[webkit-changes] [159993] trunk/Source/WebKit2
Title: [159993] trunk/Source/WebKit2 Revision 159993 Author m...@apple.com Date 2013-12-02 22:20:39 -0800 (Mon, 02 Dec 2013) Log Message Build fix. * UIProcess/API/ios/WKGeolocationProviderIOS.mm: (-[WKGeolocationProviderIOS initWithContext:]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (159992 => 159993) --- trunk/Source/WebKit2/ChangeLog 2013-12-03 05:53:32 UTC (rev 159992) +++ trunk/Source/WebKit2/ChangeLog 2013-12-03 06:20:39 UTC (rev 159993) @@ -1,3 +1,10 @@ +2013-12-02 Dan Bernstein + +Build fix. + +* UIProcess/API/ios/WKGeolocationProviderIOS.mm: +(-[WKGeolocationProviderIOS initWithContext:]): + 2013-12-02 Martin Hock Add ability to iterate over API::Array Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm (159992 => 159993) --- trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-03 05:53:32 UTC (rev 159992) +++ trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-03 06:20:39 UTC (rev 159993) @@ -155,7 +155,7 @@ stopUpdatingCallback, setEnableHighAccuracy }; -_geolocationManager->initializeProvider(&providerCallback); +_geolocationManager->initializeProvider(reinterpret_cast(&providerCallback)); _coreLocationProvider = adoptNS([[WebGeolocationCoreLocationProvider alloc] initWithListener:self]); return self; } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159991] trunk/Source/WebKit2
Title: [159991] trunk/Source/WebKit2 Revision 159991 Author m...@apple.com Date 2013-12-02 20:25:07 -0800 (Mon, 02 Dec 2013) Log Message [Cocoa] WebProtectionSpace has a generic wrapper https://bugs.webkit.org/show_bug.cgi?id=125125 Reviewed by Anders Carlsson. Added WKNSURLProtectionSpace. * Shared/Cocoa/APIObject.mm: (API::Object::newObject): Allocate a WKNSURLProtectionSpace if the object is a WebProtectionSpace. * Shared/Cocoa/WKNSURLProtectionSpace.h: Added. (WebKit::wrapper): Added. Returns a WebProtecitonSpace’s wrapper as an NSURLProtectionSpace. * Shared/Cocoa/WKNSURLProtectionSpace.mm: Added. (-[WKNSURLProtectionSpace copyWithZone:]): Retains self. * UIProcess/Authentication/WebProtectionSpace.h: (WebKit::WebProtectionSpace::protectionSpace): Added an accessor for the WebCore::ProtectionSpace. * WebKit2.xcodeproj/project.pbxproj: Added references to new files. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm trunk/Source/WebKit2/UIProcess/Authentication/WebProtectionSpace.h trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj Added Paths trunk/Source/WebKit2/Shared/Cocoa/WKNSURLProtectionSpace.h trunk/Source/WebKit2/Shared/Cocoa/WKNSURLProtectionSpace.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (159990 => 159991) --- trunk/Source/WebKit2/ChangeLog 2013-12-03 04:19:07 UTC (rev 159990) +++ trunk/Source/WebKit2/ChangeLog 2013-12-03 04:25:07 UTC (rev 159991) @@ -1,3 +1,24 @@ +2013-12-02 Dan Bernstein + +[Cocoa] WebProtectionSpace has a generic wrapper +https://bugs.webkit.org/show_bug.cgi?id=125125 + +Reviewed by Anders Carlsson. + +Added WKNSURLProtectionSpace. + +* Shared/Cocoa/APIObject.mm: +(API::Object::newObject): Allocate a WKNSURLProtectionSpace if the object is a +WebProtectionSpace. +* Shared/Cocoa/WKNSURLProtectionSpace.h: Added. +(WebKit::wrapper): Added. Returns a WebProtecitonSpace’s wrapper as an NSURLProtectionSpace. +* Shared/Cocoa/WKNSURLProtectionSpace.mm: Added. +(-[WKNSURLProtectionSpace copyWithZone:]): Retains self. +* UIProcess/Authentication/WebProtectionSpace.h: +(WebKit::WebProtectionSpace::protectionSpace): Added an accessor for the +WebCore::ProtectionSpace. +* WebKit2.xcodeproj/project.pbxproj: Added references to new files. + 2013-12-02 Anders Carlsson Replace uses of WebKit::APIClient with API::Client Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (159990 => 159991) --- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-03 04:19:07 UTC (rev 159990) +++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-03 04:25:07 UTC (rev 159991) @@ -37,6 +37,7 @@ #import "WKNSError.h" #import "WKNSString.h" #import "WKNSURL.h" +#import "WKNSURLProtectionSpace.h" #import "WKNavigationDataInternal.h" #import "WKProcessGroupInternal.h" @@ -97,6 +98,10 @@ wrapper = [WKBrowsingContextGroup alloc]; break; +case Type::ProtectionSpace: +wrapper = NSAllocateObject([WKNSURLProtectionSpace class], size, nullptr); +break; + case Type::String: wrapper = NSAllocateObject([WKNSString class], size, nullptr); break; Added: trunk/Source/WebKit2/Shared/Cocoa/WKNSURLProtectionSpace.h (0 => 159991) --- trunk/Source/WebKit2/Shared/Cocoa/WKNSURLProtectionSpace.h (rev 0) +++ trunk/Source/WebKit2/Shared/Cocoa/WKNSURLProtectionSpace.h 2013-12-03 04:25:07 UTC (rev 159991) @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2013 Apple Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#import "WKFoundation.h" + +#if WK_API_ENA
[webkit-changes] [159990] trunk/Tools
Title: [159990] trunk/Tools
Revision 159990
Author fpi...@apple.com
Date 2013-12-02 20:19:07 -0800 (Mon, 02 Dec 2013)
Log Message
run-jsc-stress-tests should allow for tests that have a directory containing .js files nested within a directory containing the data
https://bugs.webkit.org/show_bug.cgi?id=125130
Reviewed by Geoffrey Garen.
* Scripts/run-jsc-stress-tests:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-jsc-stress-tests
Diff
Modified: trunk/Tools/ChangeLog (159989 => 159990)
--- trunk/Tools/ChangeLog 2013-12-03 03:19:08 UTC (rev 159989)
+++ trunk/Tools/ChangeLog 2013-12-03 04:19:07 UTC (rev 159990)
@@ -1,3 +1,12 @@
+2013-12-02 Filip Pizlo
+
+run-jsc-stress-tests should allow for tests that have a directory containing .js files nested within a directory containing the data
+https://bugs.webkit.org/show_bug.cgi?id=125130
+
+Reviewed by Geoffrey Garen.
+
+* Scripts/run-jsc-stress-tests:
+
2013-12-02 Samuel White
AX: Add AXUIElementCountForSearchPredicate parameterized attribute.
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (159989 => 159990)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2013-12-03 03:19:08 UTC (rev 159989)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2013-12-03 04:19:07 UTC (rev 159990)
@@ -810,7 +810,11 @@
prepareCollection($collectionName)
Dir.chdir($outputDir) {
-allJSFiles($collection).each {
+directoryToSearch = $collection
+if entry["tests"]
+directoryToSearch += entry["tests"]
+end
+allJSFiles(directoryToSearch).each {
| path |
$benchmark = path.basename
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159989] trunk/Source/WebCore
Title: [159989] trunk/Source/WebCore
Revision 159989
Author akl...@apple.com
Date 2013-12-02 19:19:08 -0800 (Mon, 02 Dec 2013)
Log Message
Avoid setting style twice for generated image content.
Take care of a FIXME I added in r158097 and avoid redundant work in
ImageContentData::createRenderer().
I changed the inheritance helper RenderImage::setPseudoStyle() into
a new createStyleInheritingFromPseudoStyle() function instead so it
can be used from both PseudoElement and ImageContentData.
Reviewed by Antti Koivisto.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/PseudoElement.cpp
trunk/Source/WebCore/rendering/RenderImage.cpp
trunk/Source/WebCore/rendering/RenderImage.h
trunk/Source/WebCore/rendering/style/ContentData.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (159988 => 159989)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 02:36:08 UTC (rev 159988)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 03:19:08 UTC (rev 159989)
@@ -1,3 +1,17 @@
+2013-12-02 Andreas Kling
+
+Avoid setting style twice for generated image content.
+
+
+Take care of a FIXME I added in r158097 and avoid redundant work in
+ImageContentData::createRenderer().
+
+I changed the inheritance helper RenderImage::setPseudoStyle() into
+a new createStyleInheritingFromPseudoStyle() function instead so it
+can be used from both PseudoElement and ImageContentData.
+
+Reviewed by Antti Koivisto.
+
2013-12-02 Samuel White
AX: Add AXUIElementCountForSearchPredicate parameterized attribute.
Modified: trunk/Source/WebCore/dom/PseudoElement.cpp (159988 => 159989)
--- trunk/Source/WebCore/dom/PseudoElement.cpp 2013-12-03 02:36:08 UTC (rev 159988)
+++ trunk/Source/WebCore/dom/PseudoElement.cpp 2013-12-03 03:19:08 UTC (rev 159989)
@@ -114,7 +114,7 @@
// We only manage the style for the generated content which must be images or text.
if (!child->isImage())
continue;
-toRenderImage(child)->setPseudoStyle(&renderer->style());
+toRenderImage(*child).setStyle(RenderImage::createStyleInheritingFromPseudoStyle(renderer->style()));
}
}
Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (159988 => 159989)
--- trunk/Source/WebCore/rendering/RenderImage.cpp 2013-12-03 02:36:08 UTC (rev 159988)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2013-12-03 03:19:08 UTC (rev 159989)
@@ -74,17 +74,16 @@
m_imageResource->shutdown();
}
-
-void RenderImage::setPseudoStyle(PassRefPtr pseudoStyle)
+PassRef RenderImage::createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle)
{
-ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER);
+ASSERT(pseudoStyle.styleType() == BEFORE || pseudoStyle.styleType() == AFTER);
// Images are special and must inherit the pseudoStyle so the width and height of
// the pseudo element doesn't change the size of the image. In all other cases we
// can just share the style.
auto style = RenderStyle::create();
-style.get().inheritFrom(pseudoStyle.get());
-setStyle(std::move(style));
+style.get().inheritFrom(&pseudoStyle);
+return style;
}
void RenderImage::setImageResource(PassOwnPtr imageResource)
Modified: trunk/Source/WebCore/rendering/RenderImage.h (159988 => 159989)
--- trunk/Source/WebCore/rendering/RenderImage.h 2013-12-03 02:36:08 UTC (rev 159988)
+++ trunk/Source/WebCore/rendering/RenderImage.h 2013-12-03 03:19:08 UTC (rev 159989)
@@ -39,8 +39,8 @@
explicit RenderImage(Document&, PassRef);
virtual ~RenderImage();
-// Set the style of the object if it's generated content.
-void setPseudoStyle(PassRefPtr);
+// Create a RenderStyle for generated content by inheriting from a pseudo style.
+static PassRef createStyleInheritingFromPseudoStyle(const RenderStyle&);
void setImageResource(PassOwnPtr);
Modified: trunk/Source/WebCore/rendering/style/ContentData.cpp (159988 => 159989)
--- trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-12-03 02:36:08 UTC (rev 159988)
+++ trunk/Source/WebCore/rendering/style/ContentData.cpp 2013-12-03 03:19:08 UTC (rev 159989)
@@ -49,9 +49,8 @@
RenderObject* ImageContentData::createRenderer(Document& document, RenderStyle& pseudoStyle) const
{
-// FIXME: We should find a way to avoid setting the style twice here.
-RenderImage* image = new RenderImage(document, pseudoStyle);
-image->setPseudoStyle(&pseudoStyle);
+RenderImage* image = new RenderImage(document, RenderImage::createStyleInheritingFromPseudoStyle(pseudoStyle));
+image->initializeStyle();
image->setAltText(altText());
if (m_image)
image->setImageResource(RenderImageResourceStyleImage::create(*m_image));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159987] trunk/Source
Title: [159987] trunk/Source
Revision 159987
Author mark@apple.com
Date 2013-12-02 17:32:43 -0800 (Mon, 02 Dec 2013)
Log Message
Build failure when disabling JIT, YARR_JIT, and ASSEMBLER.
https://bugs.webkit.org/show_bug.cgi?id=123809.
Reviewed by Geoffrey Garen.
Source/_javascript_Core:
Also fixed build when disabling the DISASSEMBLER.
Added some needed #if's and some comments.
* assembler/LinkBuffer.cpp:
(JSC::LinkBuffer::finalizeCodeWithDisassembly):
* dfg/DFGDisassembler.cpp:
* dfg/DFGDisassembler.h:
(JSC::DFG::Disassembler::Disassembler):
(JSC::DFG::Disassembler::setStartOfCode):
(JSC::DFG::Disassembler::setForBlockIndex):
(JSC::DFG::Disassembler::setForNode):
(JSC::DFG::Disassembler::setEndOfMainPath):
(JSC::DFG::Disassembler::setEndOfCode):
(JSC::DFG::Disassembler::dump):
(JSC::DFG::Disassembler::reportToProfiler):
* disassembler/Disassembler.cpp:
* disassembler/X86Disassembler.cpp:
* jit/FPRInfo.h:
* jit/GPRInfo.h:
* jit/JITDisassembler.cpp:
* jit/JITDisassembler.h:
(JSC::JITDisassembler::JITDisassembler):
(JSC::JITDisassembler::setStartOfCode):
(JSC::JITDisassembler::setForBytecodeMainPath):
(JSC::JITDisassembler::setForBytecodeSlowPath):
(JSC::JITDisassembler::setEndOfSlowPath):
(JSC::JITDisassembler::setEndOfCode):
(JSC::JITDisassembler::dump):
(JSC::JITDisassembler::reportToProfiler):
Source/WTF:
* wtf/Platform.h:
- Ensure that the ASSEMBLER is enabled when the DISASSEMBLER is enabled.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp
trunk/Source/_javascript_Core/dfg/DFGDisassembler.cpp
trunk/Source/_javascript_Core/dfg/DFGDisassembler.h
trunk/Source/_javascript_Core/disassembler/Disassembler.cpp
trunk/Source/_javascript_Core/disassembler/X86Disassembler.cpp
trunk/Source/_javascript_Core/jit/FPRInfo.h
trunk/Source/_javascript_Core/jit/GPRInfo.h
trunk/Source/_javascript_Core/jit/JITDisassembler.cpp
trunk/Source/_javascript_Core/jit/JITDisassembler.h
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Platform.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (159986 => 159987)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-03 01:27:06 UTC (rev 159986)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-03 01:32:43 UTC (rev 159987)
@@ -1,3 +1,40 @@
+2013-12-02 Mark Lam
+
+Build failure when disabling JIT, YARR_JIT, and ASSEMBLER.
+https://bugs.webkit.org/show_bug.cgi?id=123809.
+
+Reviewed by Geoffrey Garen.
+
+Also fixed build when disabling the DISASSEMBLER.
+Added some needed #if's and some comments.
+
+* assembler/LinkBuffer.cpp:
+(JSC::LinkBuffer::finalizeCodeWithDisassembly):
+* dfg/DFGDisassembler.cpp:
+* dfg/DFGDisassembler.h:
+(JSC::DFG::Disassembler::Disassembler):
+(JSC::DFG::Disassembler::setStartOfCode):
+(JSC::DFG::Disassembler::setForBlockIndex):
+(JSC::DFG::Disassembler::setForNode):
+(JSC::DFG::Disassembler::setEndOfMainPath):
+(JSC::DFG::Disassembler::setEndOfCode):
+(JSC::DFG::Disassembler::dump):
+(JSC::DFG::Disassembler::reportToProfiler):
+* disassembler/Disassembler.cpp:
+* disassembler/X86Disassembler.cpp:
+* jit/FPRInfo.h:
+* jit/GPRInfo.h:
+* jit/JITDisassembler.cpp:
+* jit/JITDisassembler.h:
+(JSC::JITDisassembler::JITDisassembler):
+(JSC::JITDisassembler::setStartOfCode):
+(JSC::JITDisassembler::setForBytecodeMainPath):
+(JSC::JITDisassembler::setForBytecodeSlowPath):
+(JSC::JITDisassembler::setEndOfSlowPath):
+(JSC::JITDisassembler::setEndOfCode):
+(JSC::JITDisassembler::dump):
+(JSC::JITDisassembler::reportToProfiler):
+
2013-12-02 Filip Pizlo
Baseline JIT calls to CommonSlowPaths shouldn't restore the last result
Modified: trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp (159986 => 159987)
--- trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp 2013-12-03 01:27:06 UTC (rev 159986)
+++ trunk/Source/_javascript_Core/assembler/LinkBuffer.cpp 2013-12-03 01:32:43 UTC (rev 159987)
@@ -49,7 +49,8 @@
ASSERT(Options::showDisassembly() || Options::showDFGDisassembly());
CodeRef result = finalizeCodeWithoutDisassembly();
-
+
+#if ENABLE(DISASSEMBLER)
dataLogF("Generated JIT code for ");
va_list argList;
va_start(argList, format);
@@ -59,6 +60,9 @@
dataLogF("Code at [%p, %p):\n", result.code().executableAddress(), static_cast(result.code().executableAddress()) + result.size());
disassemble(result.code(), m_size, "", WTF::dataFile());
+#else
+UNUSED_PARAM(format);
+#endif // ENABLE(DISASSEMBLER)
return result;
}
Modified: trunk/Source/_javascript_Core/dfg/DFGDisassembler.cpp (159986 => 159987)
--- trunk/Source/_javascript_Core/dfg/DFGDisassembler.cpp 2013-12-03 01:27:06 UTC (rev 159986)
+++ trunk/Source/_javascript_Core/dfg/DFGDisas
[webkit-changes] [159986] trunk/Source/WebCore
Title: [159986] trunk/Source/WebCore
Revision 159986
Author beid...@apple.com
Date 2013-12-02 17:27:06 -0800 (Mon, 02 Dec 2013)
Log Message
Possible crash in ProgressTracker::progressHeartbeatTimerFired(Timer*)
https://bugs.webkit.org/show_bug.cgi?id=125110
Reviewed by Darin Adler.
FrameLoader::loadProgressingStatusChanged() might be called while the Frame has a null FrameView.
It’s unclear how to reproduce, but there’s no harm in a null check.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::loadProgressingStatusChanged):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/FrameLoader.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (159985 => 159986)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 01:12:51 UTC (rev 159985)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 01:27:06 UTC (rev 159986)
@@ -81,6 +81,20 @@
Reviewed by Darin Adler.
+FrameLoader::loadProgressingStatusChanged() might be called while the Frame has a null FrameView.
+
+It’s unclear how to reproduce, but there’s no harm in a null check.
+
+* loader/FrameLoader.cpp:
+(WebCore::FrameLoader::loadProgressingStatusChanged):
+
+2013-12-02 Brady Eidson
+
+Possible crash in ProgressTracker::progressHeartbeatTimerFired(Timer*)
+https://bugs.webkit.org/show_bug.cgi?id=125110
+
+Reviewed by Darin Adler.
+
It’s possible to have a null m_originatingProgressFrame when the heartbeat timer fires.
On the surface this seems impossible because the only time m_originatingProgressFrame is cleared
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (159985 => 159986)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2013-12-03 01:12:51 UTC (rev 159985)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2013-12-03 01:27:06 UTC (rev 159986)
@@ -3380,6 +3380,9 @@
void FrameLoader::loadProgressingStatusChanged()
{
FrameView* view = m_frame.mainFrame().view();
+if (!view)
+return;
+
view->updateLayerFlushThrottlingInAllFrames();
view->adjustTiledBackingCoverage();
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [159984] trunk/Source/WebKit2
Title: [159984] trunk/Source/WebKit2
Revision 159984
Author ander...@apple.com
Date 2013-12-02 17:11:47 -0800 (Mon, 02 Dec 2013)
Log Message
Add versioned structs for the remaining clients
https://bugs.webkit.org/show_bug.cgi?id=125123
Reviewed by Andreas Kling.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKContextConnectionClient.h:
* UIProcess/API/C/WKContextDownloadClient.h:
* UIProcess/API/C/WKContextHistoryClient.h:
* UIProcess/API/C/WKContextInjectedBundleClient.h:
* UIProcess/API/C/WKOriginDataManager.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKContext.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159983 => 159984)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 00:54:12 UTC (rev 159983)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 01:11:47 UTC (rev 159984)
@@ -1,5 +1,19 @@
2013-12-02 Anders Carlsson
+Add versioned structs for the remaining clients
+https://bugs.webkit.org/show_bug.cgi?id=125123
+
+Reviewed by Andreas Kling.
+
+* UIProcess/API/C/WKContext.h:
+* UIProcess/API/C/WKContextConnectionClient.h:
+* UIProcess/API/C/WKContextDownloadClient.h:
+* UIProcess/API/C/WKContextHistoryClient.h:
+* UIProcess/API/C/WKContextInjectedBundleClient.h:
+* UIProcess/API/C/WKOriginDataManager.h:
+
+2013-12-02 Anders Carlsson
+
Move WKContext clients to separate files
https://bugs.webkit.org/show_bug.cgi?id=125121
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (159983 => 159984)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-03 00:54:12 UTC (rev 159983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-03 01:11:47 UTC (rev 159984)
@@ -48,19 +48,32 @@
typedef void (*WKContextNetworkProcessDidCrashCallback)(WKContextRef context, const void *clientInfo);
typedef void (*WKContextPlugInInformationBecameAvailableCallback)(WKContextRef context, WKArrayRef plugIn, const void *clientInfo);
-struct WKContextClient {
+typedef struct WKContextClientBase {
int version;
const void *clientInfo;
+} WKContextClientBase;
+typedef struct WKContextClientV0 {
+WKContextClientBase base;
+
// Version 0.
WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
-};
-typedef struct WKContextClient WKContextClient;
+} WKContextClientV0;
+// FIXME: Deprecate.
enum { kWKContextClientCurrentVersion = 0 };
+typedef struct WKContextClient {
+int version;
+const void *clientInfo;
+// Version 0.
+WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
+WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
+WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
+} WKContextClient;
+
enum {
kWKProcessModelSharedSecondaryProcess = 0,
kWKProcessModelMultipleSecondaryProcesses = 1
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h (159983 => 159984)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2013-12-03 00:54:12 UTC (rev 159983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2013-12-03 01:11:47 UTC (rev 159984)
@@ -30,14 +30,26 @@
typedef void (*WKContextDidCreateConnection)(WKContextRef context, WKConnectionRef connection, const void* clientInfo);
-struct WKContextConnectionClient {
+typedef struct WKContextConnectionClientBase {
int version;
const void *clientInfo;
+} WKContextConnectionClientBase;
+
+typedef struct WKContextConnectionClientV0 {
+WKContextConnectionClientBase base;
+
+// Version 0.
WKContextDidCreateConnectiondidCreateConnection;
-};
-typedef struct WKContextConnectionClient WKContextConnectionClient;
+} WKContextConnectionClientV0;
+// FIXME: Deprecate.
enum { kWKContextConnectionCli
[webkit-changes] [159983] trunk/Source/WebKit2
Title: [159983] trunk/Source/WebKit2
Revision 159983
Author ander...@apple.com
Date 2013-12-02 16:54:12 -0800 (Mon, 02 Dec 2013)
Log Message
Move WKContext clients to separate files
https://bugs.webkit.org/show_bug.cgi?id=125121
Reviewed by Andreas Kling.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/WKContextConnectionClient.h: Added.
* UIProcess/API/C/WKContextDownloadClient.h: Added.
* UIProcess/API/C/WKContextHistoryClient.h: Added.
* UIProcess/API/C/WKContextInjectedBundleClient.h: Added.
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKContext.h
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Added Paths
trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h
trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159982 => 159983)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 00:43:27 UTC (rev 159982)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 00:54:12 UTC (rev 159983)
@@ -1,3 +1,17 @@
+2013-12-02 Anders Carlsson
+
+Move WKContext clients to separate files
+https://bugs.webkit.org/show_bug.cgi?id=125121
+
+Reviewed by Andreas Kling.
+
+* UIProcess/API/C/WKContext.h:
+* UIProcess/API/C/WKContextConnectionClient.h: Added.
+* UIProcess/API/C/WKContextDownloadClient.h: Added.
+* UIProcess/API/C/WKContextHistoryClient.h: Added.
+* UIProcess/API/C/WKContextInjectedBundleClient.h: Added.
+* WebKit2.xcodeproj/project.pbxproj:
+
2013-12-02 Sam Weinig
WebPageGroups should keep track of what processes they are being used by
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (159982 => 159983)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-03 00:43:27 UTC (rev 159982)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-03 00:54:12 UTC (rev 159983)
@@ -27,6 +27,10 @@
#define WKContext_h
#include
+#include
+#include
+#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -57,90 +61,6 @@
enum { kWKContextClientCurrentVersion = 0 };
-// Injected Bundle Client
-typedef void (*WKContextDidReceiveMessageFromInjectedBundleCallback)(WKContextRef page, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo);
-typedef void (*WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback)(WKContextRef page, WKStringRef messageName, WKTypeRef messageBody, WKTypeRef* returnData, const void *clientInfo);
-typedef WKTypeRef (*WKContextGetInjectedBundleInitializationUserDataCallback)(WKContextRef context, const void *clientInfo);
-
-struct WKContextInjectedBundleClient {
-int version;
-const void *clientInfo;
-
-// Version 0.
-WKContextDidReceiveMessageFromInjectedBundleCallbackdidReceiveMessageFromInjectedBundle;
-WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback didReceiveSynchronousMessageFromInjectedBundle;
-
-// Version 1.
-WKContextGetInjectedBundleInitializationUserDataCallbackgetInjectedBundleInitializationUserData;
-};
-typedef struct WKContextInjectedBundleClient WKContextInjectedBundleClient;
-
-enum { kWKContextInjectedBundleClientCurrentVersion = 1 };
-
-// History Client
-typedef void (*WKContextDidNavigateWithNavigationDataCallback)(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo);
-typedef void (*WKContextDidPerformClientRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
-typedef void (*WKContextDidPerformServerRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
-typedef void (*WKContextDidUpdateHistoryTitleCallback)(WKContextRef context, WKPageRef page, WKStringRef title, WKURLRef URL, WKFrameRef frame, const void *clientInfo);
-typedef void (*WKContextPopulateVisitedLinksCallback)(WKContextRef context, const void *clientInfo);
-
-struct WKContextHistoryClient {
-int version;
-const void *clientInfo;
-WKContextDidNavigateWithNavigationDataCallback didNavigateWithNavigationData;
-WKContextDidPerformClientRedirectCallback didPerformClientRedirect;
-WKContextDidPerformServerRedirectCallback didPerformServerRedirect;
-WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle;
-
[webkit-changes] [159982] trunk/Source/WebKit2
Title: [159982] trunk/Source/WebKit2
Revision 159982
Author wei...@apple.com
Date 2013-12-02 16:43:27 -0800 (Mon, 02 Dec 2013)
Log Message
WebPageGroups should keep track of what processes they are being used by
https://bugs.webkit.org/show_bug.cgi?id=124556
Reviewed by Anders Carlsson.
* UIProcess/WebContextUserMessageCoders.h:
(WebKit::WebContextUserMessageEncoder::encode):
(WebKit::WebContextUserMessageDecoder::decode):
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::addProcess):
(WebKit::WebPageGroup::disconnectProcess):
* UIProcess/WebPageGroup.h:
(WebKit::WebPageGroup::sendToAllProcessesInGroup):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::disconnect):
(WebKit::WebProcessProxy::webPageGroup):
(WebKit::WebProcessProxy::addWebPageGroup):
* UIProcess/WebProcessProxy.h:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::webPageGroup):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h
trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp
trunk/Source/WebKit2/UIProcess/WebPageGroup.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
trunk/Source/WebKit2/WebProcess/WebProcess.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159981 => 159982)
--- trunk/Source/WebKit2/ChangeLog 2013-12-03 00:40:33 UTC (rev 159981)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 00:43:27 UTC (rev 159982)
@@ -1,3 +1,28 @@
+2013-12-02 Sam Weinig
+
+WebPageGroups should keep track of what processes they are being used by
+https://bugs.webkit.org/show_bug.cgi?id=124556
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/WebContextUserMessageCoders.h:
+(WebKit::WebContextUserMessageEncoder::encode):
+(WebKit::WebContextUserMessageDecoder::decode):
+* UIProcess/WebPageGroup.cpp:
+(WebKit::WebPageGroup::addProcess):
+(WebKit::WebPageGroup::disconnectProcess):
+* UIProcess/WebPageGroup.h:
+(WebKit::WebPageGroup::sendToAllProcessesInGroup):
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::initializeWebPage):
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::disconnect):
+(WebKit::WebProcessProxy::webPageGroup):
+(WebKit::WebProcessProxy::addWebPageGroup):
+* UIProcess/WebProcessProxy.h:
+* WebProcess/WebProcess.cpp:
+(WebKit::WebProcess::webPageGroup):
+
2013-12-02 Anders Carlsson
Add versioned structs for all clients except the ones in WKContext.h
Modified: trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h (159981 => 159982)
--- trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2013-12-03 00:40:33 UTC (rev 159981)
+++ trunk/Source/WebKit2/UIProcess/WebContextUserMessageCoders.h 2013-12-03 00:43:27 UTC (rev 159982)
@@ -76,6 +76,8 @@
}
case API::Object::Type::PageGroup: {
WebPageGroup* pageGroup = static_cast(m_root);
+if (pageGroup->addProcess(m_process))
+m_process.addWebPageGroup(*pageGroup);
encoder << pageGroup->data();
break;
}
@@ -145,7 +147,7 @@
uint64_t pageGroupID;
if (!decoder.decode(pageGroupID))
return false;
-coder.m_root = WebPageGroup::get(pageGroupID);
+coder.m_root = coder.m_process.webPageGroup(pageGroupID);
break;
}
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (159981 => 159982)
--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-03 00:40:33 UTC (rev 159981)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2013-12-03 00:43:27 UTC (rev 159982)
@@ -194,4 +194,14 @@
sendToAllProcessesInGroup(Messages::WebPageGroupProxy::RemoveAllUserContent(), m_data.pageGroupID);
}
+bool WebPageGroup::addProcess(WebProcessProxy& process)
+{
+return m_processes.add(&process).isNewEntry;
+}
+
+void WebPageGroup::disconnectProcess(WebProcessProxy& process)
+{
+m_processes.remove(&process);
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.h (159981 => 159982)
--- trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-03 00:40:33 UTC (rev 159981)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.h 2013-12-03 00:43:27 UTC (rev 159982)
@@ -65,26 +65,24 @@
void removeAllUserScripts();
void removeAllUserContent();
+bool addProcess(WebProcessProxy&);
+void disconnectProcess(WebProcessProxy&);
+
private:
template void sendToAllProcessesInGroup(const T&, uint64_t destinationID);
WebPageGroupData m_data;
mutable RefPtr m_preferences;
HashSet m_pages;
+HashSet m_processes;
};
template
void WebPageGroup::sendToAllProcessesInGroup(const T& message, uint64_t des
[webkit-changes] [159978] trunk/Tools
Title: [159978] trunk/Tools Revision 159978 Author commit-qu...@webkit.org Date 2013-12-02 15:55:06 -0800 (Mon, 02 Dec 2013) Log Message Instead of a large 'if' block, each failure class should write it's own result in test_result_writer.py https://bugs.webkit.org/show_bug.cgi?id=124714 Patch by Dániel Bátyai on 2013-12-02 Reviewed by Ryosuke Niwa. * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py: (write_test_result): * Scripts/webkitpy/layout_tests/models/test_failures.py: (TestFailure.write_failure): (FailureText): (FailureText.write_failure): (FailureAudio): (FailureAudio.write_failure): (FailureCrash.write_failure): (FailureMissingResult): (FailureTextMismatch): (FailureMissingImageHash.write_failure): (FailureMissingImage.write_failure): (FailureImageHashMismatch.write_failure): (FailureReftestMismatch.write_failure): (FailureReftestMismatchDidNotOccur.write_failure): (FailureMissingAudio): (FailureAudioMismatch): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py Diff Modified: trunk/Tools/ChangeLog (159977 => 159978) --- trunk/Tools/ChangeLog 2013-12-02 23:52:34 UTC (rev 159977) +++ trunk/Tools/ChangeLog 2013-12-02 23:55:06 UTC (rev 159978) @@ -1,3 +1,29 @@ +2013-12-02 Dániel Bátyai + +Instead of a large 'if' block, each failure class should write it's own result in test_result_writer.py +https://bugs.webkit.org/show_bug.cgi?id=124714 + +Reviewed by Ryosuke Niwa. + +* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py: +(write_test_result): +* Scripts/webkitpy/layout_tests/models/test_failures.py: +(TestFailure.write_failure): +(FailureText): +(FailureText.write_failure): +(FailureAudio): +(FailureAudio.write_failure): +(FailureCrash.write_failure): +(FailureMissingResult): +(FailureTextMismatch): +(FailureMissingImageHash.write_failure): +(FailureMissingImage.write_failure): +(FailureImageHashMismatch.write_failure): +(FailureReftestMismatch.write_failure): +(FailureReftestMismatchDidNotOccur.write_failure): +(FailureMissingAudio): +(FailureAudioMismatch): + 2013-12-02 László Langó Remove the stderr_write attribute from StyleProcessorConfiguration Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (159977 => 159978) --- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2013-12-02 23:52:34 UTC (rev 159977) +++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2013-12-02 23:55:06 UTC (rev 159978) @@ -45,44 +45,8 @@ writer.write_stderr(driver_output.error) for failure in failures: -# FIXME: Instead of this long 'if' block, each failure class might -# have a responsibility for writing a test result. -if isinstance(failure, (test_failures.FailureMissingResult, -test_failures.FailureTextMismatch)): -writer.write_text_files(driver_output.text, expected_driver_output.text) -writer.create_text_diff_and_write_result(driver_output.text, expected_driver_output.text) -elif isinstance(failure, test_failures.FailureMissingImage): -writer.write_image_files(driver_output.image, expected_image=None) -elif isinstance(failure, test_failures.FailureMissingImageHash): -writer.write_image_files(driver_output.image, expected_driver_output.image) -elif isinstance(failure, test_failures.FailureImageHashMismatch): -writer.write_image_files(driver_output.image, expected_driver_output.image) -writer.write_image_diff_files(driver_output.image_diff) -elif isinstance(failure, (test_failures.FailureAudioMismatch, - test_failures.FailureMissingAudio)): -writer.write_audio_files(driver_output.audio, expected_driver_output.audio) -elif isinstance(failure, test_failures.FailureCrash): -crashed_driver_output = expected_driver_output if failure.is_reftest else driver_output -writer.write_crash_log(crashed_driver_output.crash_log) -elif isinstance(failure, test_failures.FailureReftestMismatch): -writer.write_image_files(driver_output.image, expected_driver_output.image) -# FIXME: This work should be done earlier in the pipeline (e.g., when we compare images for non-ref tests). -# FIXME: We should always have 2 images here. -if driver_output.image and expected_driver_output.image: -diff_image, diff_percent, err_str = port.diff_image(expected_driver_output.image, driver_output.image, tolerance=0) -if diff_image: -writer.write_image_diff_fi
[webkit-changes] [159977] trunk/Tools
Title: [159977] trunk/Tools Revision 159977 Author commit-qu...@webkit.org Date 2013-12-02 15:52:34 -0800 (Mon, 02 Dec 2013) Log Message Remove the stderr_write attribute from StyleProcessorConfiguration https://bugs.webkit.org/show_bug.cgi?id=124703 Patch by László Langó on 2013-12-02 Reviewed by Ryosuke Niwa. Remove the stderr_write attribute from this class in checker and replace its use with calls to a logging module logger. We Should use logging module instead of writing to stderr directly. * Scripts/webkitpy/style/checker.py: Change stderr_write attribute to logging module logger. (check_webkit_style_configuration): (CheckerDispatcher.dispatch): Remove FIXME comment. (StyleProcessorConfiguration): (StyleProcessorConfiguration.__init__): (StyleProcessorConfiguration.write_style_error): * Scripts/webkitpy/style/checker_unittest.py: Update test to the modification. There is an "ERROR" prefix in log messiges from now. (StyleProcessorConfigurationTest): (StyleProcessorConfigurationTest._style_checker_configuration): (StyleProcessorConfigurationTest.test_init): (StyleProcessorConfigurationTest.test_write_style_error_emacs): (StyleProcessorConfigurationTest.test_write_style_error_vs7): (StyleProcessor_EndToEndTest.with): (StyleProcessor_EndToEndTest.test_init): (StyleProcessor_EndToEndTest.test_process): (StyleProcessor_CodeCoverageTest.setUp): * Scripts/webkitpy/style/error_handlers.py: Remove stderr_write usage and replace with logging module logger. (DefaultStyleErrorHandler.__call__): * Scripts/webkitpy/style/error_handlers_unittest.py: Update test to the modification. There is an "ERROR" prefix in log messiges from now. (DefaultStyleErrorHandlerTest): (DefaultStyleErrorHandlerTest.setUp): (DefaultStyleErrorHandlerTest._mock_increment_error_count): (DefaultStyleErrorHandlerTest._style_checker_configuration): (DefaultStyleErrorHandlerTest._check_initialized): (DefaultStyleErrorHandlerTest.test_non_reportable_error): (DefaultStyleErrorHandlerTest.test_max_reports_per_category): (DefaultStyleErrorHandlerTest.test_line_numbers): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/style/checker.py trunk/Tools/Scripts/webkitpy/style/checker_unittest.py trunk/Tools/Scripts/webkitpy/style/error_handlers.py trunk/Tools/Scripts/webkitpy/style/error_handlers_unittest.py Diff Modified: trunk/Tools/ChangeLog (159976 => 159977) --- trunk/Tools/ChangeLog 2013-12-02 23:48:35 UTC (rev 159976) +++ trunk/Tools/ChangeLog 2013-12-02 23:52:34 UTC (rev 159977) @@ -1,3 +1,44 @@ +2013-12-02 László Langó + +Remove the stderr_write attribute from StyleProcessorConfiguration +https://bugs.webkit.org/show_bug.cgi?id=124703 + +Reviewed by Ryosuke Niwa. + +Remove the stderr_write attribute from this class in checker and +replace its use with calls to a logging module logger. We Should +use logging module instead of writing to stderr directly. + +* Scripts/webkitpy/style/checker.py: Change stderr_write attribute to logging module logger. +(check_webkit_style_configuration): +(CheckerDispatcher.dispatch): Remove FIXME comment. +(StyleProcessorConfiguration): +(StyleProcessorConfiguration.__init__): +(StyleProcessorConfiguration.write_style_error): +* Scripts/webkitpy/style/checker_unittest.py: Update test to the modification. +There is an "ERROR" prefix in log messiges from now. +(StyleProcessorConfigurationTest): +(StyleProcessorConfigurationTest._style_checker_configuration): +(StyleProcessorConfigurationTest.test_init): +(StyleProcessorConfigurationTest.test_write_style_error_emacs): +(StyleProcessorConfigurationTest.test_write_style_error_vs7): +(StyleProcessor_EndToEndTest.with): +(StyleProcessor_EndToEndTest.test_init): +(StyleProcessor_EndToEndTest.test_process): +(StyleProcessor_CodeCoverageTest.setUp): +* Scripts/webkitpy/style/error_handlers.py: Remove stderr_write usage and replace with logging module logger. +(DefaultStyleErrorHandler.__call__): +* Scripts/webkitpy/style/error_handlers_unittest.py: Update test to the modification. +There is an "ERROR" prefix in log messiges from now. +(DefaultStyleErrorHandlerTest): +(DefaultStyleErrorHandlerTest.setUp): +(DefaultStyleErrorHandlerTest._mock_increment_error_count): +(DefaultStyleErrorHandlerTest._style_checker_configuration): +(DefaultStyleErrorHandlerTest._check_initialized): +(DefaultStyleErrorHandlerTest.test_non_reportable_error): +(DefaultStyleErrorHandlerTest.test_max_reports_per_category): +(DefaultStyleErrorHandlerTest.test_line_numbers): + 2013-12-02 Brian J. Burg Add _javascript_ style checker and teach checker.py about .js files Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (159976 => 159977) --- trunk/Tools/Scripts/webkit
[webkit-changes] [159975] trunk
Title: [159975] trunk
Revision 159975
Author a...@apple.com
Date 2013-12-02 15:43:01 -0800 (Mon, 02 Dec 2013)
Log Message
WebCrypto HMAC doesn't check key algorithm's hash
https://bugs.webkit.org/show_bug.cgi?id=125114
Reviewed by Anders Carlsson.
Source/WebCore:
Test: crypto/subtle/hmac-check-algorithm.html
* crypto/algorithms/CryptoAlgorithmHMAC.cpp:
(WebCore::CryptoAlgorithmHMAC::keyAlgorithmMatches): Check it.
LayoutTests:
* crypto/subtle/hmac-check-algorithm-expected.txt: Added.
* crypto/subtle/hmac-check-algorithm.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/crypto/algorithms/CryptoAlgorithmHMAC.cpp
Added Paths
trunk/LayoutTests/crypto/subtle/hmac-check-algorithm-expected.txt
trunk/LayoutTests/crypto/subtle/hmac-check-algorithm.html
Diff
Modified: trunk/LayoutTests/ChangeLog (159974 => 159975)
--- trunk/LayoutTests/ChangeLog 2013-12-02 23:30:53 UTC (rev 159974)
+++ trunk/LayoutTests/ChangeLog 2013-12-02 23:43:01 UTC (rev 159975)
@@ -1,3 +1,13 @@
+2013-12-02 Alexey Proskuryakov
+
+WebCrypto HMAC doesn't check key algorithm's hash
+https://bugs.webkit.org/show_bug.cgi?id=125114
+
+Reviewed by Anders Carlsson.
+
+* crypto/subtle/hmac-check-algorithm-expected.txt: Added.
+* crypto/subtle/hmac-check-algorithm.html: Added.
+
2013-12-02 Zoltan Horvath
[CSS Shapes] Support inset parsing
Added: trunk/LayoutTests/crypto/subtle/hmac-check-algorithm-expected.txt (0 => 159975)
--- trunk/LayoutTests/crypto/subtle/hmac-check-algorithm-expected.txt (rev 0)
+++ trunk/LayoutTests/crypto/subtle/hmac-check-algorithm-expected.txt 2013-12-02 23:43:01 UTC (rev 159975)
@@ -0,0 +1,12 @@
+Test that HMAC operations only work when hash functions match between invocation and key.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Importing a raw HMAC SHA-1 key from string literal...
+PASS crypto.subtle.sign({name: 'hmac', hash: {name: 'sha-256'}}, key, asciiToUint8Array('foo')) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS crypto.subtle.verify({name: 'hmac', hash: {name: 'sha-256'}}, key, asciiToUint8Array('fake signature'), asciiToUint8Array('foo')) threw exception Error: NotSupportedError: DOM Exception 9.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Property changes on: trunk/LayoutTests/crypto/subtle/hmac-check-algorithm-expected.txt
___
Added: svn:mime-type
Added: svn:eol-style
Added: trunk/LayoutTests/crypto/subtle/hmac-check-algorithm.html (0 => 159975)
--- trunk/LayoutTests/crypto/subtle/hmac-check-algorithm.html (rev 0)
+++ trunk/LayoutTests/crypto/subtle/hmac-check-algorithm.html 2013-12-02 23:43:01 UTC (rev 159975)
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+