date:20180416

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

2018-04-16 Thread nvasilyev

Title: [230701] trunk/Source/WebInspectorUI








Revision 230701
Author nvasil...@apple.com
Date 2018-04-16 22:48:41 -0700 (Mon, 16 Apr 2018)


Log Message
Web Inspector: Can't select and copy text from Network tab popover
https://bugs.webkit.org/show_bug.cgi?id=184606

Reviewed by Matt Baker.

* UserInterface/Views/ResourceTimingBreakdownView.css:
(.waterfall-popover .resource-timing-breakdown):

Modified Paths

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




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (230700 => 230701)

--- trunk/Source/WebInspectorUI/ChangeLog	2018-04-17 05:17:26 UTC (rev 230700)
+++ trunk/Source/WebInspectorUI/ChangeLog	2018-04-17 05:48:41 UTC (rev 230701)
@@ -1,3 +1,13 @@
+2018-04-16  Nikita Vasilyev  
+
+Web Inspector: Can't select and copy text from Network tab popover
+https://bugs.webkit.org/show_bug.cgi?id=184606
+
+Reviewed by Matt Baker.
+
+* UserInterface/Views/ResourceTimingBreakdownView.css:
+(.waterfall-popover .resource-timing-breakdown):
+
 2018-04-12  Nikita Vasilyev  
 
 Web Inspector: Refactoring: move popover styles from JS to CSS


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.css (230700 => 230701)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.css	2018-04-17 05:17:26 UTC (rev 230700)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTimingBreakdownView.css	2018-04-17 05:48:41 UTC (rev 230701)
@@ -29,6 +29,7 @@
 
 .waterfall-popover-content .resource-timing-breakdown {
 margin: 5px;
+-webkit-user-select: text;
 }
 
 .resource-timing-breakdown > table > tr > td.label {






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

[webkit-changes] [230700] trunk/Tools

2018-04-16 Thread zalan

Title: [230700] trunk/Tools








Revision 230700
Author za...@apple.com
Date 2018-04-16 22:17:26 -0700 (Mon, 16 Apr 2018)


Log Message
[LayoutReloaded] Add support for replaced box.
https://bugs.webkit.org/show_bug.cgi?id=184680

Reviewed by Antti Koivisto.

Basic support for inline replaced.

* LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
(InlineFormattingContext.prototype._handleInlineBox):
(InlineFormattingContext.prototype._handleInlineBlock):
(InlineFormattingContext.prototype._handleReplaced):
* LayoutReloaded/FormattingContext/InlineFormatting/Line.js:
(Line.prototype.lastLineBox):
(Line.prototype.addInlineBox):
(Line.prototype.addInlineContainerBox): Deleted.
* LayoutReloaded/TreeBuilder.js:
(TreeBuilder.prototype._createAndAttachBox):
* LayoutReloaded/Utils.js:
(Utils._dumpBox):
* LayoutReloaded/test/index.html:
* LayoutReloaded/test/inline-simple-replaced.html: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js
trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/Line.js
trunk/Tools/LayoutReloaded/TreeBuilder.js
trunk/Tools/LayoutReloaded/Utils.js
trunk/Tools/LayoutReloaded/test/index.html


Added Paths

trunk/Tools/LayoutReloaded/test/inline-simple-replaced.html




Diff

Modified: trunk/Tools/ChangeLog (230699 => 230700)

--- trunk/Tools/ChangeLog	2018-04-17 03:15:16 UTC (rev 230699)
+++ trunk/Tools/ChangeLog	2018-04-17 05:17:26 UTC (rev 230700)
@@ -1,5 +1,29 @@
 2018-04-16  Zalan Bujtas  
 
+[LayoutReloaded] Add support for replaced box.
+https://bugs.webkit.org/show_bug.cgi?id=184680
+
+Reviewed by Antti Koivisto.
+
+Basic support for inline replaced.
+
+* LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
+(InlineFormattingContext.prototype._handleInlineBox):
+(InlineFormattingContext.prototype._handleInlineBlock):
+(InlineFormattingContext.prototype._handleReplaced):
+* LayoutReloaded/FormattingContext/InlineFormatting/Line.js:
+(Line.prototype.lastLineBox):
+(Line.prototype.addInlineBox):
+(Line.prototype.addInlineContainerBox): Deleted.
+* LayoutReloaded/TreeBuilder.js:
+(TreeBuilder.prototype._createAndAttachBox):
+* LayoutReloaded/Utils.js:
+(Utils._dumpBox):
+* LayoutReloaded/test/index.html:
+* LayoutReloaded/test/inline-simple-replaced.html: Added.
+
+2018-04-16  Zalan Bujtas  
+
 [LayoutReloaded] Minor InlineFormattingContext::layout() cleanup.
 https://bugs.webkit.org/show_bug.cgi?id=184679
 


Modified: trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js (230699 => 230700)

--- trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js	2018-04-17 03:15:16 UTC (rev 230699)
+++ trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js	2018-04-17 05:17:26 UTC (rev 230700)
@@ -104,6 +104,8 @@
 _handleInlineBox(inlineBox) {
 if (inlineBox.text())
 return this._handleText(inlineBox);
+else
+return this._handleReplaced(inlineBox);
 }
 
 _handleInlineBlock(inlineBlockBox) {
@@ -110,13 +112,13 @@
 ASSERT(inlineBlockBox.establishesFormattingContext());
 let displayBox = this.displayBox(inlineBlockBox);
 
-// TODO: auto width/height
+// TODO: auto width/height and check if content actually at all.
 this._adjustLineForInlineContainerStart(inlineBlockBox);
 displayBox.setWidth(Utils.width(inlineBlockBox) + Utils.computedHorizontalBorderAndPadding(inlineBlockBox.node()));
 this.layoutState().formattingContext(inlineBlockBox).layout();
 displayBox.setHeight(Utils.height(inlineBlockBox) + Utils.computedVerticalBorderAndPadding(inlineBlockBox.node()));
+this._line().addInlineBox(displayBox.size());
 this._adjustLineForInlineContainerEnd(inlineBlockBox);
-this._line().addInlineContainerBox(displayBox.size());
 }
 
 _handleText(inlineBox) {
@@ -156,6 +158,18 @@
 this._line().moveContentHorizontally(floatWidth);
 }
 
+_handleReplaced(replacedBox) {
+// TODO: intrinsic size and check if content actually at all.
+let displayBox = this.displayBox(replacedBox);
+this._adjustLineForInlineContainerStart(replacedBox);
+displayBox.setWidth(Utils.width(replacedBox) + Utils.computedHorizontalBorderAndPadding(replacedBox.node()));
+
+displayBox.setHeight(Utils.height(replacedBox) + Utils.computedVerticalBorderAndPadding(replacedBox.node()));
+this._line().addInlineBox(displayBox.size());
+displayBox.setTopLeft(this._line().lastLineBox().lineBoxRect.topLeft());
+this._adjustLineForInlineContainerEnd(replacedBox);
+   }
+

[webkit-changes] [230699] trunk/Tools

2018-04-16 Thread zalan

Title: [230699] trunk/Tools








Revision 230699
Author za...@apple.com
Date 2018-04-16 20:15:16 -0700 (Mon, 16 Apr 2018)


Log Message
[LayoutReloaded] Minor InlineFormattingContext::layout() cleanup.
https://bugs.webkit.org/show_bug.cgi?id=184679

Reviewed by Antti Koivisto.

* LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
(InlineFormattingContext):
(InlineFormattingContext.prototype.layout):
(InlineFormattingContext.prototype._handleInlineContainer):
(InlineFormattingContext.prototype._handleInlineContent):
(InlineFormattingContext.prototype._handleInlineBlock):
(InlineFormattingContext.prototype._handleReplacedBox):
(InlineFormattingContext.prototype._clearNeedsLayoutAndMoveToNextSibling):
(InlineFormattingContext.prototype._handleInlineBlockContainer): Deleted.
(InlineFormattingContext.prototype._clearAndMoveToNext): Deleted.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js




Diff

Modified: trunk/Tools/ChangeLog (230698 => 230699)

--- trunk/Tools/ChangeLog	2018-04-17 03:01:08 UTC (rev 230698)
+++ trunk/Tools/ChangeLog	2018-04-17 03:15:16 UTC (rev 230699)
@@ -1,5 +1,23 @@
 2018-04-16  Zalan Bujtas  
 
+[LayoutReloaded] Minor InlineFormattingContext::layout() cleanup.
+https://bugs.webkit.org/show_bug.cgi?id=184679
+
+Reviewed by Antti Koivisto.
+
+* LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js:
+(InlineFormattingContext):
+(InlineFormattingContext.prototype.layout):
+(InlineFormattingContext.prototype._handleInlineContainer):
+(InlineFormattingContext.prototype._handleInlineContent):
+(InlineFormattingContext.prototype._handleInlineBlock):
+(InlineFormattingContext.prototype._handleReplacedBox):
+(InlineFormattingContext.prototype._clearNeedsLayoutAndMoveToNextSibling):
+(InlineFormattingContext.prototype._handleInlineBlockContainer): Deleted.
+(InlineFormattingContext.prototype._clearAndMoveToNext): Deleted.
+
+2018-04-16  Zalan Bujtas  
+
 [LayoutReloaded] Introduce fragmentation state/context.
 https://bugs.webkit.org/show_bug.cgi?id=184677
 


Modified: trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js (230698 => 230699)

--- trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js	2018-04-17 03:01:08 UTC (rev 230698)
+++ trunk/Tools/LayoutReloaded/FormattingContext/InlineFormatting/InlineFormattingContext.js	2018-04-17 03:15:16 UTC (rev 230699)
@@ -41,7 +41,6 @@
 constructor(inlineFormattingState) {
 super(inlineFormattingState);
 ASSERT(this.formattingRoot().isBlockContainerBox());
-this.m_inlineContainerStack = new Array();
 }
 
 layout() {
@@ -54,12 +53,21 @@
 this._addToLayoutQueue(this._firstInFlowChildWithNeedsLayout(this.formattingRoot()));
 while (this._descendantNeedsLayout()) {
 let layoutBox = this._nextInLayoutQueue();
-if (layoutBox.isInlineContainer())
-this._handleInlineContainer(layoutBox);
-else if (layoutBox.isInlineBlockBox())
-this._handleInlineBlockContainer(layoutBox);
-else
+if (layoutBox.isInlineContainer()) {
+let containerStart = inlineContainerStack.indexOf(layoutBox) == -1;
+this._handleInlineContainer(layoutBox, containerStart);
+// container start.
+if (containerStart) {
+inlineContainerStack.push(layoutBox);
+this._addToLayoutQueue(this._firstInFlowChildWithNeedsLayout(layoutBox));
+// Keep the inline container in the layout stack so that we can finish it when all the descendants are all set.
+continue;
+}
+// container end.
+inlineContainerStack.pop(layoutBox);
+} else
 this._handleInlineContent(layoutBox);
+this._clearNeedsLayoutAndMoveToNextSibling(layoutBox);
 }
 // Place the inflow positioned children.
 this._placeInFlowPositionedChildren(this.formattingRoot());
@@ -66,50 +74,31 @@
 // And take care of out-of-flow boxes as the final step.
 this._layoutOutOfFlowDescendants(this.formattingRoot());
 this._commitLine();
-ASSERT(!this.m_inlineContainerStack.length);
+ASSERT(!inlineContainerStack.length);
 ASSERT(!this.formattingState().layoutNeeded());
}
 
-_handleInlineContainer(inlineContainer) {
+_handleInlineContainer(inlineContainer, containerStart) {
 ASSERT(!inlineContainer.establishesFormattingContext());
-let inlineContainerStart = this.m_inlineContainerStack.indexOf(inlineContainer) == -1;
-if

[webkit-changes] [230698] trunk/Source/WebKit

2018-04-16 Thread timothy

Title: [230698] trunk/Source/WebKit








Revision 230698
Author timo...@apple.com
Date 2018-04-16 20:01:08 -0700 (Mon, 16 Apr 2018)


Log Message
Unreviewed 32-bit build fix for r230673.

https://bugs.webkit.org/show_bug.cgi?id=184657
rdar://problem/39463307


* Configurations/PluginProcessShim.xcconfig: Use the correct names.

Modified Paths

trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig




Diff

Modified: trunk/Source/WebKit/ChangeLog (230697 => 230698)

--- trunk/Source/WebKit/ChangeLog	2018-04-17 02:38:59 UTC (rev 230697)
+++ trunk/Source/WebKit/ChangeLog	2018-04-17 03:01:08 UTC (rev 230698)
@@ -1,3 +1,12 @@
+2018-04-16  Timothy Hatcher  
+
+Unreviewed 32-bit build fix for r230673.
+
+https://bugs.webkit.org/show_bug.cgi?id=184657
+rdar://problem/39463307
+
+* Configurations/PluginProcessShim.xcconfig: Use the correct names.
+
 2018-04-16  Andy Estes  
 
 [iOS] Enable WKPDFView by default


Modified: trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig (230697 => 230698)

--- trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig	2018-04-17 02:38:59 UTC (rev 230697)
+++ trunk/Source/WebKit/Configurations/PluginProcessShim.xcconfig	2018-04-17 03:01:08 UTC (rev 230698)
@@ -28,10 +28,10 @@
 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
 
-WK_CARBON_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_CARBON_LDFLAGS = $(WK_CARBON_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_CARBON_LDFLAGS_macosx = -framework Carbon;
 
-WK_QUARTZCORE_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
+WK_QUARTZCORE_LDFLAGS = $(WK_QUARTZCORE_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_QUARTZCORE_LDFLAGS_macosx = -framework QuartzCore;
 
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_QUARTZCORE_LDFLAGS);






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

[webkit-changes] [230697] trunk

2018-04-16 Thread utatane . tea

Title: [230697] trunk








Revision 230697
Author utatane@gmail.com
Date 2018-04-16 19:38:59 -0700 (Mon, 16 Apr 2018)


Log Message
[WebAssembly][Modules] Prototype wasm import
https://bugs.webkit.org/show_bug.cgi?id=184600

Reviewed by JF Bastien.

JSTests:

Add wasm and wat files since module loader want to load wasm files from FS.
Currently, importing the other modules from wasm is not supported.

* wasm.yaml:
* wasm/modules/constant.wasm: Added.
* wasm/modules/constant.wat: Added.
* wasm/modules/js-wasm-function-namespace.js: Added.
(assert.throws):
* wasm/modules/js-wasm-function.js: Added.
(assert.throws):
* wasm/modules/js-wasm-global-namespace.js: Added.
(assert.throws):
* wasm/modules/js-wasm-global.js: Added.
(assert.throws):
* wasm/modules/js-wasm-memory-namespace.js: Added.
(assert.throws):
* wasm/modules/js-wasm-memory.js: Added.
(assert.throws):
* wasm/modules/js-wasm-start.js: Added.
(then):
* wasm/modules/js-wasm-table-namespace.js: Added.
(assert.throws):
* wasm/modules/js-wasm-table.js: Added.
(assert.throws):
* wasm/modules/memory.wasm: Added.
* wasm/modules/memory.wat: Added.
* wasm/modules/start.wasm: Added.
* wasm/modules/start.wat: Added.
* wasm/modules/sum.wasm: Added.
* wasm/modules/sum.wat: Added.
* wasm/modules/table.wasm: Added.
* wasm/modules/table.wat: Added.

Source/_javascript_Core:

This patch is an initial attempt to implement Wasm loading in module pipeline.
Currently,

1. We only support Wasm loading in the JSC shell. Once loading mechanism is specified
   in whatwg HTML, we should integrate this into WebCore.

2. We only support exporting values from Wasm. Wasm module cannot import anything from
   the other modules now.

When loading a file, JSC shell checks wasm magic. If the wasm magic is found, JSC shell
loads the file with WebAssemblySourceProvider. It is wrapped into JSSourceCode and
module loader pipeline just handles it as the same to JS. When parsing a module, we
checks the type of JSSourceCode. If the source code is Wasm source code, we create a
WebAssemblyModuleRecord instead of JSModuleRecord. Our module pipeline handles
AbstractModuleRecord and Wasm module is instantiated, linked, and evaluated.

* builtins/ModuleLoaderPrototype.js:
(globalPrivate.newRegistryEntry):
(requestInstantiate):
(link):
* jsc.cpp:
(convertShebangToJSComment):
(fillBufferWithContentsOfFile):
(fetchModuleFromLocalFileSystem):
(GlobalObject::moduleLoaderFetch):
* parser/SourceProvider.h:
(JSC::WebAssemblySourceProvider::create):
(JSC::WebAssemblySourceProvider::WebAssemblySourceProvider):
* runtime/AbstractModuleRecord.cpp:
(JSC::AbstractModuleRecord::hostResolveImportedModule):
(JSC::AbstractModuleRecord::link):
(JSC::AbstractModuleRecord::evaluate):
(JSC::identifierToJSValue): Deleted.
* runtime/AbstractModuleRecord.h:
* runtime/JSModuleLoader.cpp:
(JSC::JSModuleLoader::evaluate):
* runtime/JSModuleRecord.cpp:
(JSC::JSModuleRecord::link):
(JSC::JSModuleRecord::instantiateDeclarations):
* runtime/JSModuleRecord.h:
* runtime/ModuleLoaderPrototype.cpp:
(JSC::moduleLoaderPrototypeParseModule):
(JSC::moduleLoaderPrototypeRequestedModules):
(JSC::moduleLoaderPrototypeModuleDeclarationInstantiation):
* wasm/js/JSWebAssemblyHelpers.h:
(JSC::getWasmBufferFromValue):
(JSC::createSourceBufferFromValue):
* wasm/js/JSWebAssemblyInstance.cpp:
(JSC::JSWebAssemblyInstance::finalizeCreation):
(JSC::JSWebAssemblyInstance::createPrivateModuleKey):
(JSC::JSWebAssemblyInstance::create):
* wasm/js/JSWebAssemblyInstance.h:
* wasm/js/WebAssemblyInstanceConstructor.cpp:
(JSC::constructJSWebAssemblyInstance):
* wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::prepareLink):
(JSC::WebAssemblyModuleRecord::link):
* wasm/js/WebAssemblyModuleRecord.h:
* wasm/js/WebAssemblyPrototype.cpp:
(JSC::resolve):
(JSC::instantiate):
(JSC::compileAndInstantiate):
(JSC::WebAssemblyPrototype::instantiate):
(JSC::webAssemblyInstantiateFunc):
(JSC::webAssemblyValidateFunc):
* wasm/js/WebAssemblyPrototype.h:

Modified Paths

trunk/JSTests/ChangeLog
trunk/JSTests/wasm.yaml
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/builtins/ModuleLoaderPrototype.js
trunk/Source/_javascript_Core/jsc.cpp
trunk/Source/_javascript_Core/parser/SourceProvider.h
trunk/Source/_javascript_Core/runtime/AbstractModuleRecord.cpp
trunk/Source/_javascript_Core/runtime/AbstractModuleRecord.h
trunk/Source/_javascript_Core/runtime/JSModuleLoader.cpp
trunk/Source/_javascript_Core/runtime/JSModuleRecord.cpp
trunk/Source/_javascript_Core/runtime/JSModuleRecord.h
trunk/Source/_javascript_Core/runtime/ModuleLoaderPrototype.cpp
trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyHelpers.h
trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyInstance.cpp
trunk/Source/_javascript_Core/wasm/js/JSWebAssemblyInstance.h
trunk/Source/_javascript_Core/wasm/js/WebAssemblyInstanceConstructor.cpp
trunk/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.cpp
trunk/Source/_javascript_Core/wasm/js/WebAssemblyModuleRecord.h

[webkit-changes] [230696] trunk/Tools

2018-04-16 Thread zalan

Title: [230696] trunk/Tools








Revision 230696
Author za...@apple.com
Date 2018-04-16 19:02:06 -0700 (Mon, 16 Apr 2018)


Log Message
[LayoutReloaded] Introduce fragmentation state/context.
https://bugs.webkit.org/show_bug.cgi?id=184677

Reviewed by Antti Koivisto.

State/context for fragmented content (multicol, regions, pagination etc).

* LayoutReloaded/FormattingContext/FragmentationContext.js: Added.
(FragmentationContext):
* LayoutReloaded/FormattingState/FragmentationState.js: Added.
(FragmentationState):
(FragmentationState.prototype.formattingState):

Modified Paths

trunk/Tools/ChangeLog


Added Paths

trunk/Tools/LayoutReloaded/FormattingContext/FragmentationContext.js
trunk/Tools/LayoutReloaded/FormattingState/FragmentationState.js




Diff

Modified: trunk/Tools/ChangeLog (230695 => 230696)

--- trunk/Tools/ChangeLog	2018-04-17 01:56:15 UTC (rev 230695)
+++ trunk/Tools/ChangeLog	2018-04-17 02:02:06 UTC (rev 230696)
@@ -1,3 +1,18 @@
+2018-04-16  Zalan Bujtas  
+
+[LayoutReloaded] Introduce fragmentation state/context.
+https://bugs.webkit.org/show_bug.cgi?id=184677
+
+Reviewed by Antti Koivisto.
+
+State/context for fragmented content (multicol, regions, pagination etc).
+
+* LayoutReloaded/FormattingContext/FragmentationContext.js: Added.
+(FragmentationContext):
+* LayoutReloaded/FormattingState/FragmentationState.js: Added.
+(FragmentationState):
+(FragmentationState.prototype.formattingState):
+
 2018-04-16  Andy Estes  
 
 [iOS] Enable WKPDFView by default


Added: trunk/Tools/LayoutReloaded/FormattingContext/FragmentationContext.js (0 => 230696)

--- trunk/Tools/LayoutReloaded/FormattingContext/FragmentationContext.js	(rev 0)
+++ trunk/Tools/LayoutReloaded/FormattingContext/FragmentationContext.js	2018-04-17 02:02:06 UTC (rev 230696)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2018 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. ``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
+ * 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.
+ */
+
+/*
+class FragmentationContext {
+public:
+};
+*/
+class FragmentationContext {
+constructor(fragmentationState) {
+this.m_fragmentationState = fragmentationState;
+}
+}


Added: trunk/Tools/LayoutReloaded/FormattingState/FragmentationState.js (0 => 230696)

--- trunk/Tools/LayoutReloaded/FormattingState/FragmentationState.js	(rev 0)
+++ trunk/Tools/LayoutReloaded/FormattingState/FragmentationState.js	2018-04-17 02:02:06 UTC (rev 230696)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2018 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. ``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
+ * 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

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

2018-04-16 Thread fpizlo

Title: [230695] trunk/Source/WebCore








Revision 230695
Author fpi...@apple.com
Date 2018-04-16 18:56:15 -0700 (Mon, 16 Apr 2018)


Log Message
MutationObserver should be in an IsoHeap
https://bugs.webkit.org/show_bug.cgi?id=184671


Reviewed by Sam Weinig.

No new tests because no new behavior.

* dom/MutationObserver.cpp:
* dom/MutationObserver.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/MutationObserver.cpp
trunk/Source/WebCore/dom/MutationObserver.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (230694 => 230695)

--- trunk/Source/WebCore/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
+++ trunk/Source/WebCore/ChangeLog	2018-04-17 01:56:15 UTC (rev 230695)
@@ -1,3 +1,16 @@
+2018-04-16  Filip Pizlo  
+
+MutationObserver should be in an IsoHeap
+https://bugs.webkit.org/show_bug.cgi?id=184671
+
+
+Reviewed by Sam Weinig.
+
+No new tests because no new behavior.
+
+* dom/MutationObserver.cpp:
+* dom/MutationObserver.h:
+
 2018-04-16  Youenn Fablet  
 
 Use NetworkLoadChecker to handle synchronous HTTP loads


Modified: trunk/Source/WebCore/dom/MutationObserver.cpp (230694 => 230695)

--- trunk/Source/WebCore/dom/MutationObserver.cpp	2018-04-17 01:20:43 UTC (rev 230694)
+++ trunk/Source/WebCore/dom/MutationObserver.cpp	2018-04-17 01:56:15 UTC (rev 230695)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2018 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
@@ -39,11 +40,14 @@
 #include "MutationObserverRegistration.h"
 #include "MutationRecord.h"
 #include 
+#include 
 #include 
 #include 
 
 namespace WebCore {
 
+WTF_MAKE_ISO_ALLOCATED_IMPL(MutationObserver);
+
 static unsigned s_observerPriority = 0;
 
 Ref MutationObserver::create(Ref&& callback)


Modified: trunk/Source/WebCore/dom/MutationObserver.h (230694 => 230695)

--- trunk/Source/WebCore/dom/MutationObserver.h	2018-04-17 01:20:43 UTC (rev 230694)
+++ trunk/Source/WebCore/dom/MutationObserver.h	2018-04-17 01:56:15 UTC (rev 230695)
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2018 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
@@ -33,6 +34,7 @@
 #include "ExceptionOr.h"
 #include 
 #include 
+#include 
 #include 
 
 namespace WebCore {
@@ -46,7 +48,8 @@
 using MutationObserverOptions = unsigned char;
 using MutationRecordDeliveryOptions = unsigned char;
 
-class MutationObserver : public RefCounted {
+class MutationObserver final : public RefCounted {
+WTF_MAKE_ISO_ALLOCATED(MutationObserver);
 friend class MutationObserverMicrotask;
 public:
 enum MutationType {






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

[webkit-changes] [230694] trunk

2018-04-16 Thread aestes

Title: [230694] trunk








Revision 230694
Author aes...@apple.com
Date 2018-04-16 18:20:43 -0700 (Mon, 16 Apr 2018)


Log Message
[iOS] Enable WKPDFView by default
https://bugs.webkit.org/show_bug.cgi?id=184675


Reviewed by Darin Adler.

Source/WebKit:

* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
(-[WKWebViewContentProviderRegistry init]):

Source/WTF:

* wtf/FeatureDefines.h:

Tools:

* TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FeatureDefines.h
trunk/Source/WebKit/ChangeLog
trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm




Diff

Modified: trunk/Source/WTF/ChangeLog (230693 => 230694)

--- trunk/Source/WTF/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WTF/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,13 @@
+2018-04-16  Andy Estes  
+
+[iOS] Enable WKPDFView by default
+https://bugs.webkit.org/show_bug.cgi?id=184675
+
+
+Reviewed by Darin Adler.
+
+* wtf/FeatureDefines.h:
+
 2018-04-16  Per Arne Vollan  
 
 Deactivate the WindowServer connection for the WebContent process.


Modified: trunk/Source/WTF/wtf/FeatureDefines.h (230693 => 230694)

--- trunk/Source/WTF/wtf/FeatureDefines.h	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WTF/wtf/FeatureDefines.h	2018-04-17 01:20:43 UTC (rev 230694)
@@ -167,7 +167,7 @@
 #endif
 
 #if !defined(ENABLE_WKLEGACYPDFVIEW)
-#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR)
+#if PLATFORM(IOS) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV) && !ENABLE(MINIMAL_SIMULATOR) && __IPHONE_OS_VERSION_MIN_REQUIRED < 12
 #define ENABLE_WKLEGACYPDFVIEW 1
 #endif
 #endif


Modified: trunk/Source/WebKit/ChangeLog (230693 => 230694)

--- trunk/Source/WebKit/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WebKit/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,14 @@
+2018-04-16  Andy Estes  
+
+[iOS] Enable WKPDFView by default
+https://bugs.webkit.org/show_bug.cgi?id=184675
+
+
+Reviewed by Darin Adler.
+
+* UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm:
+(-[WKWebViewContentProviderRegistry init]):
+
 2018-04-16  Brent Fulgham  
 
 [macOS] Don't establish unneeded Dock connections


Modified: trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm (230693 => 230694)

--- trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WKWebViewContentProviderRegistry.mm	2018-04-17 01:20:43 UTC (rev 230694)
@@ -31,6 +31,7 @@
 #if PLATFORM(IOS)
 
 #import "WKLegacyPDFView.h"
+#import "WKPDFView.h"
 #import "WKSystemPreviewView.h"
 #import "WKWebViewInternal.h"
 #import "WebPageProxy.h"
@@ -56,8 +57,11 @@
 if (!(self = [super init]))
 return nil;
 
-#if ENABLE(WKLEGACYPDFVIEW)
+#if ENABLE(WKPDFVIEW)
 for (auto& mimeType : WebCore::MIMETypeRegistry::getPDFMIMETypes())
+[self registerProvider:[WKPDFView class] forMIMEType:mimeType];
+#elif ENABLE(WKLEGACYPDFVIEW)
+for (auto& mimeType : WebCore::MIMETypeRegistry::getPDFMIMETypes())
 [self registerProvider:[WKLegacyPDFView class] forMIMEType:mimeType];
 #endif
 


Modified: trunk/Tools/ChangeLog (230693 => 230694)

--- trunk/Tools/ChangeLog	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Tools/ChangeLog	2018-04-17 01:20:43 UTC (rev 230694)
@@ -1,3 +1,13 @@
+2018-04-16  Andy Estes  
+
+[iOS] Enable WKPDFView by default
+https://bugs.webkit.org/show_bug.cgi?id=184675
+
+
+Reviewed by Darin Adler.
+
+* TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm:
+
 2018-04-16  Leo Balter  
 
 Perl-based Test262 runner


Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm (230693 => 230694)

--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm	2018-04-17 00:19:33 UTC (rev 230693)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKPDFView.mm	2018-04-17 01:20:43 UTC (rev 230694)
@@ -26,7 +26,8 @@
 #import "config.h"
 #import 
 
-#if WK_API_ENABLED && TARGET_OS_IPHONE
+// FIXME: Enable these tests on iOS 12 once rdar://problem/39475542 is resolved.
+#if WK_API_ENABLED && TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < 12
 
 #import "PlatformUtilities.h"
 #import "TestNavigationDelegate.h"






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

[webkit-changes] [230693] tags/Safari-606.1.13.2/Source

2018-04-16 Thread kocsen_chung

Title: [230693] tags/Safari-606.1.13.2/Source








Revision 230693
Author kocsen_ch...@apple.com
Date 2018-04-16 17:19:33 -0700 (Mon, 16 Apr 2018)


Log Message
Versioning.

Modified Paths

tags/Safari-606.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/WebKit/Configurations/Version.xcconfig
tags/Safari-606.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-606.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/_javascript_Core/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/WebCore/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/WebCore/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/WebCore/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/WebCore/PAL/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/WebInspectorUI/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/WebKit/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/WebKit/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/WebKit/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 


Modified: tags/Safari-606.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (230692 => 230693)

--- tags/Safari-606.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2018-04-17 00:17:42 UTC (rev 230692)
+++ tags/Safari-606.1.13.2/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2018-04-17 00:19:33 UTC (rev 230693)
@@ -24,7 +24,7 @@
 MAJOR_VERSION = 606;
 MINOR_VERSION = 1;
 TINY_VERSION = 13;
-MICRO_VERSION = 1;
+MICRO_VERSION = 2;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);
 






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

[webkit-changes] [230692] tags/Safari-606.1.13.2/

2018-04-16 Thread kocsen_chung

Title: [230692] tags/Safari-606.1.13.2/








Revision 230692
Author kocsen_ch...@apple.com
Date 2018-04-16 17:17:42 -0700 (Mon, 16 Apr 2018)


Log Message
New tag.

Added Paths

tags/Safari-606.1.13.2/




Diff




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

[webkit-changes] [230691] trunk/LayoutTests

2018-04-16 Thread krollin

Title: [230691] trunk/LayoutTests








Revision 230691
Author krol...@apple.com
Date 2018-04-16 16:57:08 -0700 (Mon, 16 Apr 2018)


Log Message
REGRESSION: [mac-wk2 release] LayoutTest http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=184673


Unreviewed test gardening. The test was flaky because the HTTP parser
would try to preload the _javascript_ resource. Sometimes this operation
would complete in time to print its own console message, duplicating a
subsequent one when the non-preloading resource-load occurs. Updated
the test to load the _javascript_ in such a way that it skips the reload
step.

* TestExpectations:
* http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt:
* http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt
trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html




Diff

Modified: trunk/LayoutTests/ChangeLog (230690 => 230691)

--- trunk/LayoutTests/ChangeLog	2018-04-16 23:46:54 UTC (rev 230690)
+++ trunk/LayoutTests/ChangeLog	2018-04-16 23:57:08 UTC (rev 230691)
@@ -1,3 +1,20 @@
+2018-04-16  Keith Rollin  
+
+REGRESSION: [mac-wk2 release] LayoutTest http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html is flaky
+https://bugs.webkit.org/show_bug.cgi?id=184673
+
+
+Unreviewed test gardening. The test was flaky because the HTTP parser
+would try to preload the _javascript_ resource. Sometimes this operation
+would complete in time to print its own console message, duplicating a
+subsequent one when the non-preloading resource-load occurs. Updated
+the test to load the _javascript_ in such a way that it skips the reload
+step.
+
+* TestExpectations:
+* http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt:
+* http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html:
+
 2018-04-16  Ross Kirsling  
 
 Unreviewed. Update WinCairo TestExpectations in preparation for LayoutTests automation.


Modified: trunk/LayoutTests/TestExpectations (230690 => 230691)

--- trunk/LayoutTests/TestExpectations	2018-04-16 23:46:54 UTC (rev 230690)
+++ trunk/LayoutTests/TestExpectations	2018-04-16 23:57:08 UTC (rev 230691)
@@ -1196,7 +1196,6 @@
 webkit.org/b/154203 http/tests/security/contentSecurityPolicy/1.1/frame-ancestors/frame-ancestors-overrides-xfo.html
 webkit.org/b/154522 http/tests/security/contentSecurityPolicy/1.1/securitypolicyviolation-base-uri-deny.html
 webkit.org/b/155132 http/tests/security/contentSecurityPolicy/video-with-https-url-allowed-by-csp-media-src-star.html [ Failure ]
-http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html [ Pass Failure ]
 webkit.org/b/158480 http/tests/websocket/tests/hybi/upgrade-simple-ws.html [ Skip ]
 
 # These state object tests purposefully stress a resource limit, and take multiple seconds to run.


Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt (230690 => 230691)

--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt	2018-04-16 23:46:54 UTC (rev 230690)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event-expected.txt	2018-04-16 23:57:08 UTC (rev 230691)
@@ -1,5 +1,4 @@
-CONSOLE MESSAGE: Refused to load the script 'http://localhost:8000/security/contentSecurityPolicy/resources/script-set-value.js' because it violates the following Content Security Policy directive: "script-src 'self' 'unsafe-inline'".
+CONSOLE MESSAGE: Refused to load http://localhost:8000/security/contentSecurityPolicy/resources/script-set-value.js because it does not appear in the script-src directive of the Content Security Policy.
 
-
 PASS Script element has error on bad script-src 
 


Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html (230690 => 230691)

--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html	2018-04-16 23:46:54 UTC (rev 230690)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/script-src-blocked-error-event.html	2018-04-16 23:57:08 UTC (rev 230691)
@@ -18,6 +18,12 @@
 
 
 
-+