[webkit-changes] [169932] trunk/Tools
Title: [169932] trunk/Tools
Revision 169932
Author calva...@igalia.com
Date 2014-06-13 02:01:38 -0700 (Fri, 13 Jun 2014)
Log Message
Create MSE and EME watchlist
https://bugs.webkit.org/show_bug.cgi?id=133810
Reviewed by Eric Carlson.
* Scripts/webkitpy/common/config/watchlist: Create MSEEME
definition and add Eric Carlson and myself to it.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/watchlist
Diff
Modified: trunk/Tools/ChangeLog (169931 => 169932)
--- trunk/Tools/ChangeLog 2014-06-13 06:40:00 UTC (rev 169931)
+++ trunk/Tools/ChangeLog 2014-06-13 09:01:38 UTC (rev 169932)
@@ -1,3 +1,13 @@
+2014-06-13 Xabier Rodriguez Calvar calva...@igalia.com
+
+Create MSE and EME watchlist
+https://bugs.webkit.org/show_bug.cgi?id=133810
+
+Reviewed by Eric Carlson.
+
+* Scripts/webkitpy/common/config/watchlist: Create MSEEME
+definition and add Eric Carlson and myself to it.
+
2014-06-12 Carlos Garcia Campos cgar...@igalia.com
[GTK] Remove all deprecated API from GObject DOM bindings
Modified: trunk/Tools/Scripts/webkitpy/common/config/watchlist (169931 => 169932)
--- trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-06-13 06:40:00 UTC (rev 169931)
+++ trunk/Tools/Scripts/webkitpy/common/config/watchlist 2014-06-13 09:01:38 UTC (rev 169932)
@@ -286,6 +286,12 @@
r|LayoutTests/platform/.*/fast/css-grid-layout/
r|LayoutTests/platform/.*/ietestcenter/css3/grid/,
},
+MSEEME: {
+filename: rSource/WebCore/Modules/encryptedmedia/
+r|Source/WebCore/Modules/mediasource/
+r|LayoutTests/media/encrypted-media/
+r|LayoutTests/media/media-source/,
+},
},
CC_RULES: {
# Note: All email addresses listed must be registered with bugzilla.
@@ -325,6 +331,7 @@
Loader: [ jap...@chromium.org ],
MathML: [ dbar...@mathscribe.com, mrobin...@webkit.org, fred.w...@free.fr ],
Media: [ eric.carl...@apple.com, jer.no...@apple.com, gl...@skynav.com, phil...@opera.com, sergio.corr...@openbossa.org ],
+MSEEME: [ eric.carl...@apple.com, calva...@igalia.com ],
Track: [ eric.carl...@apple.com, phil...@opera.com, calva...@igalia.com ],
MediaStream: [ tom...@google.com, h...@google.com, sergio.corr...@openbossa.org ],
NetworkInfo: [ gyuyoung@webkit.org, dch...@gmail.com ],
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169933] trunk/LayoutTests
Title: [169933] trunk/LayoutTests
Revision 169933
Author commit-qu...@webkit.org
Date 2014-06-13 03:16:43 -0700 (Fri, 13 Jun 2014)
Log Message
[EFL] Change expectations for two failing layout tests.
https://bugs.webkit.org/show_bug.cgi?id=133805
Unreviewed EFL gradening.
Patch by Andrzej Badowski a.badow...@samsung.com on 2014-06-13
* platform/efl/TestExpectations:
* platform/efl/fast/multicol/newmulticol/client-rects-expected.txt:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/efl/TestExpectations
trunk/LayoutTests/platform/efl/fast/multicol/newmulticol/client-rects-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (169932 => 169933)
--- trunk/LayoutTests/ChangeLog 2014-06-13 09:01:38 UTC (rev 169932)
+++ trunk/LayoutTests/ChangeLog 2014-06-13 10:16:43 UTC (rev 169933)
@@ -1,3 +1,13 @@
+2014-06-13 Andrzej Badowski a.badow...@samsung.com
+
+[EFL] Change expectations for two failing layout tests.
+https://bugs.webkit.org/show_bug.cgi?id=133805
+
+Unreviewed EFL gradening.
+
+* platform/efl/TestExpectations:
+* platform/efl/fast/multicol/newmulticol/client-rects-expected.txt:
+
2014-06-12 Zalan Bujtas za...@apple.com
Subpixel rendering: Make input type= and button elements' decoration subpixel aware.
Modified: trunk/LayoutTests/platform/efl/TestExpectations (169932 => 169933)
--- trunk/LayoutTests/platform/efl/TestExpectations 2014-06-13 09:01:38 UTC (rev 169932)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-06-13 10:16:43 UTC (rev 169933)
@@ -1640,4 +1640,5 @@
webkit.org/b/133734 css3/viewport-percentage-lengths/viewport-percentage-lengths-anonymous-block.html [ Failure ]
webkit.org/b/133735 css3/viewport-percentage-lengths/viewport-percentage-lengths-percent-size-child.html [ Failure ]
webkit.org/b/133737 css3/viewport-percentage-lengths/viewport-percentage-lengths-relative-font-size.html [ Failure ]
+webkit.org/b/133734 css3/viewport-percentage-lengths/viewport-percentage-lengths-resize.html [ Failure ]
Modified: trunk/LayoutTests/platform/efl/fast/multicol/newmulticol/client-rects-expected.txt (169932 => 169933)
--- trunk/LayoutTests/platform/efl/fast/multicol/newmulticol/client-rects-expected.txt 2014-06-13 09:01:38 UTC (rev 169932)
+++ trunk/LayoutTests/platform/efl/fast/multicol/newmulticol/client-rects-expected.txt 2014-06-13 10:16:43 UTC (rev 169933)
@@ -115,7 +115,7 @@
RenderBR {BR} at (0,0) size 0x25
RenderSlider {INPUT} at (2,27) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
RenderFlexibleBox {DIV} at (0,0) size 25x25
- RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,12) size 25x0
RenderBlock {DIV} at (0,0) size 25x0
layer at (608,63) size 116x66
RenderBlock {DIV} at (600,10) size 116x66 [color=#ADD8E6] [border: (3px solid #00)]
@@ -190,7 +190,7 @@
RenderBR {BR} at (0,0) size 25x0
RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
RenderFlexibleBox {DIV} at (0,0) size 25x25
- RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,12) size 25x0
RenderBlock {DIV} at (0,0) size 25x0
layer at (588,143) size 66x116
RenderBlock {DIV} at (580,90) size 66x116 [color=#ADD8E6] [border: (3px solid #00)]
@@ -265,7 +265,7 @@
RenderBR {BR} at (0,0) size 25x0
RenderSlider {INPUT} at (27,2) size 25x25 [color=#909090] [bgcolor=#ADD8E6]
RenderFlexibleBox {DIV} at (0,0) size 25x25
- RenderBlock {DIV} at (0,12) size 25x1
+ RenderBlock {DIV} at (0,12) size 25x0
RenderBlock {DIV} at (0,0) size 25x0
layer at (468,263) size 66x116
RenderBlock {DIV} at (460,210) size 66x116 [color=#ADD8E6] [border: (3px solid #00)]
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169935] trunk/Source/WebCore
Title: [169935] trunk/Source/WebCore Revision 169935 Author be...@igalia.com Date 2014-06-13 06:33:38 -0700 (Fri, 13 Jun 2014) Log Message [GTK] GLContextEGL.cpp: conflicting declaration 'typedef ptrdiff_t GLintptr' https://bugs.webkit.org/show_bug.cgi?id=133550 Reviewed by Gustavo Noronha Silva. Cairo includes some definitions from GLX that conflict with the ones provided by our GLES2 headers (GLintptr, GLsizeiptr). Since GLContextEGL doesn't use any GLX functions we can safely disable the inclusion of those functions in that source file. * platform/graphics/egl/GLContextEGL.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (169934 => 169935) --- trunk/Source/WebCore/ChangeLog 2014-06-13 13:09:58 UTC (rev 169934) +++ trunk/Source/WebCore/ChangeLog 2014-06-13 13:33:38 UTC (rev 169935) @@ -1,3 +1,18 @@ +2014-06-13 Alberto Garcia be...@igalia.com + +[GTK] GLContextEGL.cpp: conflicting declaration 'typedef ptrdiff_t GLintptr' +https://bugs.webkit.org/show_bug.cgi?id=133550 + +Reviewed by Gustavo Noronha Silva. + +Cairo includes some definitions from GLX that conflict with the +ones provided by our GLES2 headers (GLintptr, GLsizeiptr). + +Since GLContextEGL doesn't use any GLX functions we can safely +disable the inclusion of those functions in that source file. + +* platform/graphics/egl/GLContextEGL.cpp: + 2014-06-13 Manuel Rego Casasnovas r...@igalia.com [CSS Grid Layout] Introduce an explicit type for resolved grid positions Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (169934 => 169935) --- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-06-13 13:09:58 UTC (rev 169934) +++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-06-13 13:33:38 UTC (rev 169935) @@ -36,6 +36,10 @@ #endif #if ENABLE(ACCELERATED_2D_CANVAS) +// cairo-gl.h includes some definitions from GLX that conflict with +// the ones provided by us. Since GLContextEGL doesn't use any GLX +// functions we can safely disable them. +#undef CAIRO_HAS_GLX_FUNCTIONS #include cairo-gl.h #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169936] trunk
Title: [169936] trunk
Revision 169936
Author commit-qu...@webkit.org
Date 2014-06-13 09:12:27 -0700 (Fri, 13 Jun 2014)
Log Message
Source/WebCore: [ATK] Fix text inside span block in a block was not accessible.
https://bugs.webkit.org/show_bug.cgi?id=132349
Patch by Jarek Czekalski jarekc...@poczta.onet.pl on 2014-06-13
Reviewed by Mario Sanchez Prada.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp: Add link role
to the list of roles whose objects always expose atk_text interface.
LayoutTests: [ATK] Add test for accessibility of text inside span block in a block.
https://bugs.webkit.org/show_bug.cgi?id=132349
Patch by Jarek Czekalski jarekc...@poczta.onet.pl on 2014-06-13
Reviewed by Mario Sanchez Prada.
* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt: Added.
* platform/gtk/accessibility/text-in-span-block-in-a-block.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
Added Paths
trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt
trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html
Diff
Modified: trunk/LayoutTests/ChangeLog (169935 => 169936)
--- trunk/LayoutTests/ChangeLog 2014-06-13 13:33:38 UTC (rev 169935)
+++ trunk/LayoutTests/ChangeLog 2014-06-13 16:12:27 UTC (rev 169936)
@@ -1,3 +1,13 @@
+2014-06-13 Jarek Czekalski jarekc...@poczta.onet.pl
+
+[ATK] Add test for accessibility of text inside span block in a block.
+https://bugs.webkit.org/show_bug.cgi?id=132349
+
+Reviewed by Mario Sanchez Prada.
+
+* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt: Added.
+* platform/gtk/accessibility/text-in-span-block-in-a-block.html: Added.
+
2014-06-13 Andrzej Badowski a.badow...@samsung.com
[EFL] Change expectations for two failing layout tests.
Added: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (0 => 169936)
--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt 2014-06-13 16:12:27 UTC (rev 169936)
@@ -0,0 +1,33 @@
+one
+before
+two
+three
+before,
+four
+,after
+before
+five
+,after
+before,
+six
+This tests that text inside a block inside span block is accessible.
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+PASS accText is AXValue:one
+PASS setCaretOffset(elem, 1) is true
+PASS accText is AXValue:two
+PASS setCaretOffset(elem, 1) is true
+PASS accText is AXValue:three
+PASS setCaretOffset(elem, 1) is true
+PASS accText is AXValue:before,four,after
+PASS setCaretOffset(elem, 1) is true
+PASS accText is AXValue:five,after
+PASS setCaretOffset(elem, 1) is true
+PASS accText is AXValue:before,six
+PASS setCaretOffset(elem, 1) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (0 => 169936)
--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (rev 0)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html 2014-06-13 16:12:27 UTC (rev 169936)
@@ -0,0 +1,93 @@
+!DOCTYPE HTML PUBLIC -//IETF//DTD HTML//EN
+html
+head
+script src=""
+script src=""
+/head
+
+body
+
+!-- Suspected a element in several different configurations. --
+
+div
+ a id=id1 href="" style=display:block;
+span style=display:block;one/span
+ /a
+/div
+
+div
+ divbefore/div
+ a id=id2 href="" style=display:block;
+span style=display:block;two/span
+ /a
+/div
+
+a id=id3 href="" style=display:block;span style=display:block;three/span/a
+
+div
+ a id=id4 href="" style=display:block;
+before,
+span style=display:block;four/span
+,after
+ /a
+/div
+
+div
+ divbefore/div
+ a id=id5 href="" style=display:block;span style=display:block;five/span
+,after
+ /a
+/div
+
+a id=id6 href="" style=display:block;before,span style=display:block;six/span/a
+
+div id=console/div
+
+script
+var caretMovedData;
+
+function stripNonWhite(s)
+{
+var s2 = ;
+var i;
+for(i = 0; i s.length; i++)
+if (s[i] != ' ' s[i] != '\n')
+s2 += s[i];
+return s2.replace(/\\n/g, );
+}
+
+function globalListener(object, name, offset)
+{
+var role = object.role.replace('AXRole: AX', '');
+if (name == 'AXTextCaretMoved') {
+caretMovedData += role + '|' + offset;
+}
+}
+
+if (window.testRunner) {
+testRunner.overridePreference(WebKitEnableCaretBrowsing, true);
+testRunner.dumpAsText();
+}
+
+if (window.accessibilityController) {
+var i, linkText, accText, id;
+accessibilityController.addNotificationListener(globalListener)
+for (i = 1; i = 6; i++) {
+id
[webkit-changes] [169937] trunk/Source
Title: [169937] trunk/Source
Revision 169937
Author ander...@apple.com
Date 2014-06-13 10:33:45 -0700 (Fri, 13 Jun 2014)
Log Message
Add overloads of HTTPHeaderMap::find and remove that take enums
https://bugs.webkit.org/show_bug.cgi?id=133823
Reviewed by Sam Weinig.
Source/WebCore:
* WebCore.exp.in:
Update symbols.
* WebCore.xcodeproj/project.pbxproj:
Make HTTPHeaderNames.h private.
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::contains):
Convert the enum value to a string and call the contains overload that takes a string.
(WebCore::HTTPHeaderMap::remove):
Convert the enum value to a string and call the remove overload that takes a string.
* platform/network/HTTPHeaderMap.h:
Add new overloads taking HTTPHeaderName and mark the versions taking string literals as deleted.
* platform/network/HTTPHeaderNames.in:
Add new header names.
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::clearHTTPAuthorization):
(WebCore::ResourceRequestBase::clearHTTPContentType):
(WebCore::ResourceRequestBase::clearHTTPReferrer):
(WebCore::ResourceRequestBase::clearHTTPOrigin):
(WebCore::ResourceRequestBase::clearHTTPUserAgent):
(WebCore::ResourceRequestBase::clearHTTPAccept):
Update functions to use HTTPHeaderName enums.
(WebCore::ResourceRequestBase::isConditional):
(WebCore::ResourceRequestBase::makeUnconditional):
Simplify these.
Source/WebKit2:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::parsePostBuffer):
Update for WebCore changes.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp
trunk/Source/WebCore/platform/network/HTTPHeaderMap.h
trunk/Source/WebCore/platform/network/HTTPHeaderNames.in
trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp
trunk/Source/WebCore/plugins/PluginView.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (169936 => 169937)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 16:12:27 UTC (rev 169936)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 17:33:45 UTC (rev 169937)
@@ -1,3 +1,42 @@
+2014-06-12 Anders Carlsson ander...@apple.com
+
+Add overloads of HTTPHeaderMap::find and remove that take enums
+https://bugs.webkit.org/show_bug.cgi?id=133823
+
+Reviewed by Sam Weinig.
+
+* WebCore.exp.in:
+Update symbols.
+
+* WebCore.xcodeproj/project.pbxproj:
+Make HTTPHeaderNames.h private.
+
+* platform/network/HTTPHeaderMap.cpp:
+(WebCore::HTTPHeaderMap::contains):
+Convert the enum value to a string and call the contains overload that takes a string.
+
+(WebCore::HTTPHeaderMap::remove):
+Convert the enum value to a string and call the remove overload that takes a string.
+
+* platform/network/HTTPHeaderMap.h:
+Add new overloads taking HTTPHeaderName and mark the versions taking string literals as deleted.
+
+* platform/network/HTTPHeaderNames.in:
+Add new header names.
+
+* platform/network/ResourceRequestBase.cpp:
+(WebCore::ResourceRequestBase::clearHTTPAuthorization):
+(WebCore::ResourceRequestBase::clearHTTPContentType):
+(WebCore::ResourceRequestBase::clearHTTPReferrer):
+(WebCore::ResourceRequestBase::clearHTTPOrigin):
+(WebCore::ResourceRequestBase::clearHTTPUserAgent):
+(WebCore::ResourceRequestBase::clearHTTPAccept):
+Update functions to use HTTPHeaderName enums.
+
+(WebCore::ResourceRequestBase::isConditional):
+(WebCore::ResourceRequestBase::makeUnconditional):
+Simplify these.
+
2014-06-13 Jarek Czekalski jarekc...@poczta.onet.pl
[ATK] Fix text inside span block in a block was not accessible.
Modified: trunk/Source/WebCore/WebCore.exp.in (169936 => 169937)
--- trunk/Source/WebCore/WebCore.exp.in 2014-06-13 16:12:27 UTC (rev 169936)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-13 17:33:45 UTC (rev 169937)
@@ -291,7 +291,7 @@
__ZN7WebCore13GraphicsLayerD2Ev
__ZN7WebCore13HTTPHeaderMap3addERKN3WTF12AtomicStringERKNS1_6StringE
__ZN7WebCore13HTTPHeaderMap3setERKN3WTF12AtomicStringERKNS1_6StringE
-__ZN7WebCore13HTTPHeaderMap6removeEPKc
+__ZN7WebCore13HTTPHeaderMap6removeENS_14HTTPHeaderNameE
__ZN7WebCore13HTTPHeaderMapC1Ev
__ZN7WebCore13HTTPHeaderMapD1Ev
__ZN7WebCore13HitTestResultC1ERKNS_11LayoutPointE
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (169936 => 169937)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-13 16:12:27 UTC (rev 169936)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-06-13 17:33:45 UTC (rev 169937)
@@ -790,6 +790,7 @@
1AB1AE7B0C051FDE00139F4F /* zoomOutCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AB1AE790C051FDE00139F4F /*
[webkit-changes] [169942] trunk/Source/JavaScriptCore
Title: [169942] trunk/Source/_javascript_Core
Revision 169942
Author fpi...@apple.com
Date 2014-06-13 11:56:58 -0700 (Fri, 13 Jun 2014)
Log Message
Even better diagnostics from DFG traps
https://bugs.webkit.org/show_bug.cgi?id=133836
Reviewed by Oliver Hunt.
We now stuff the DFG::NodeType into a register before bailing. Also made the
DFGBailed abort reason a bit more specific. As planned, the new abort reasons use
different numbers than any previous abort reasons.
* assembler/AbortReason.h:
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::abortWithReason):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::abortWithReason):
* assembler/MacroAssemblerX86.h:
(JSC::MacroAssemblerX86::abortWithReason):
* assembler/MacroAssemblerX86_64.h:
(JSC::MacroAssemblerX86_64::abortWithReason):
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::SpeculativeJIT):
(JSC::DFG::SpeculativeJIT::bail):
(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
* dfg/DFGSpeculativeJIT.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/AbortReason.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169941 => 169942)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 18:56:58 UTC (rev 169942)
@@ -1,3 +1,29 @@
+2014-06-12 Filip Pizlo fpi...@apple.com
+
+Even better diagnostics from DFG traps
+https://bugs.webkit.org/show_bug.cgi?id=133836
+
+Reviewed by Oliver Hunt.
+
+We now stuff the DFG::NodeType into a register before bailing. Also made the
+DFGBailed abort reason a bit more specific. As planned, the new abort reasons use
+different numbers than any previous abort reasons.
+
+* assembler/AbortReason.h:
+* assembler/MacroAssemblerARM64.h:
+(JSC::MacroAssemblerARM64::abortWithReason):
+* assembler/MacroAssemblerARMv7.h:
+(JSC::MacroAssemblerARMv7::abortWithReason):
+* assembler/MacroAssemblerX86.h:
+(JSC::MacroAssemblerX86::abortWithReason):
+* assembler/MacroAssemblerX86_64.h:
+(JSC::MacroAssemblerX86_64::abortWithReason):
+* dfg/DFGSpeculativeJIT.cpp:
+(JSC::DFG::SpeculativeJIT::SpeculativeJIT):
+(JSC::DFG::SpeculativeJIT::bail):
+(JSC::DFG::SpeculativeJIT::compileCurrentBlock):
+* dfg/DFGSpeculativeJIT.h:
+
2014-06-12 Simon Fraser simon.fra...@apple.com
Fix assertions under JSC::setNeverInline() when running js tests in WebKitTestRunner
Modified: trunk/Source/_javascript_Core/assembler/AbortReason.h (169941 => 169942)
--- trunk/Source/_javascript_Core/assembler/AbortReason.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/_javascript_Core/assembler/AbortReason.h 2014-06-13 18:56:58 UTC (rev 169942)
@@ -48,7 +48,8 @@
AHTagTypeNumberNotInPlace = 130,
AHTypeInfoInlineTypeFlagsAreValid = 140,
AHTypeInfoIsValid = 150,
-DFGBailed = 160,
+DFGBailedAtTopOfBlock = 161,
+DFGBailedAtEndOfNode = 162,
DFGBasicStorageAllocatorZeroSize = 170,
DFGIsNotCell = 180,
DFGIneffectiveWatchpoint = 190,
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (169941 => 169942)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2014-06-13 18:56:58 UTC (rev 169942)
@@ -812,6 +812,12 @@
breakpoint();
}
+void abortWithReason(AbortReason reason, intptr_t misc)
+{
+move(TrustedImm64(misc), memoryTempRegister);
+abortWithReason(reason);
+}
+
ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
{
ConvertibleLoadLabel result(this);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (169941 => 169942)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 18:56:29 UTC (rev 169941)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 18:56:58 UTC (rev 169942)
@@ -638,6 +638,12 @@
breakpoint();
}
+void abortWithReason(AbortReason reason, intptr_t misc)
+{
+move(TrustedImm32(misc), memoryTempRegister);
+abortWithReason(reason);
+}
[webkit-changes] [169943] trunk/Source/WebCore
Title: [169943] trunk/Source/WebCore
Revision 169943
Author ander...@apple.com
Date 2014-06-13 12:35:05 -0700 (Fri, 13 Jun 2014)
Log Message
Add a HTTPHeaderMap::set overload that takes a HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133874
Reviewed by Tim Horton.
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::set):
* platform/network/HTTPHeaderMap.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
* platform/network/mac/ResourceRequestMac.mm:
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp
trunk/Source/WebCore/platform/network/HTTPHeaderMap.h
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm
trunk/Source/WebCore/xml/XMLHttpRequest.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (169942 => 169943)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 19:35:05 UTC (rev 169943)
@@ -1,5 +1,22 @@
2014-06-13 Anders Carlsson ander...@apple.com
+Add a HTTPHeaderMap::set overload that takes a HTTPHeaderName
+https://bugs.webkit.org/show_bug.cgi?id=133874
+
+Reviewed by Tim Horton.
+
+* platform/network/HTTPHeaderMap.cpp:
+(WebCore::HTTPHeaderMap::set):
+* platform/network/HTTPHeaderMap.h:
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+* platform/network/mac/ResourceRequestMac.mm:
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+* xml/XMLHttpRequest.cpp:
+(WebCore::XMLHttpRequest::send):
+
+2014-06-13 Anders Carlsson ander...@apple.com
+
Add a HTTPHeaderMap::find overload that takes a HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133872
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169942 => 169943)
--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 19:35:05 UTC (rev 169943)
@@ -99,6 +99,11 @@
}
};
+void HTTPHeaderMap::set(HTTPHeaderName name, const String value)
+{
+m_headers.set(httpHeaderNameString(name).toStringWithoutCopying(), value);
+}
+
bool HTTPHeaderMap::contains(HTTPHeaderName name) const
{
return m_headers.contains(httpHeaderNameString(name).toStringWithoutCopying());
Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169942 => 169943)
--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 19:35:05 UTC (rev 169943)
@@ -63,12 +63,15 @@
void set(const AtomicString name, const String value);
void add(const AtomicString name, const String value);
+void set(HTTPHeaderName, const String value);
bool contains(HTTPHeaderName) const;
String get(const char*) const;
const_iterator find(HTTPHeaderName) const;
bool remove(HTTPHeaderName);
// Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
+templatesize_t length void set(const char ()[length], const String) = delete;
+templatesize_t length void add(const char ()[length], const String) = delete;
templatesize_t length bool contains(const char ()[length]) = delete;
templatesize_t length const_iterator find(const char()[length]) = delete;
templatesize_t length bool remove(const char ()[length]) = delete;
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (169942 => 169943)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-13 19:35:05 UTC (rev 169943)
@@ -26,6 +26,7 @@
#include config.h
#include ResourceRequestCFNet.h
+#include HTTPHeaderNames.h
#include ResourceRequest.h
#include wtf/PassOwnPtr.h
@@ -219,12 +220,11 @@
if (RetainPtrCFReadStreamRef bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(cfRequest))) {
// For streams, provide a Content-Length to avoid using chunked encoding, and to get accurate total length in callbacks.
-RetainPtrCFStringRef lengthString = adoptCF(static_castCFStringRef(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName(;
-if (lengthString) {
+if (RetainPtrCFStringRef lengthString = adoptCF(static_castCFStringRef(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName() {
CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR(Content-Length), lengthString.get());
[webkit-changes] [169944] trunk/Source/JavaScriptCore
Title: [169944] trunk/Source/_javascript_Core
Revision 169944
Author fpi...@apple.com
Date 2014-06-13 12:54:48 -0700 (Fri, 13 Jun 2014)
Log Message
Unreviewed, fix ARMv7.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::abortWithReason):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169943 => 169944)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 19:35:05 UTC (rev 169943)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 19:54:48 UTC (rev 169944)
@@ -1,3 +1,10 @@
+2014-06-13 Filip Pizlo fpi...@apple.com
+
+Unreviewed, fix ARMv7.
+
+* assembler/MacroAssemblerARMv7.h:
+(JSC::MacroAssemblerARMv7::abortWithReason):
+
2014-06-12 Filip Pizlo fpi...@apple.com
Even better diagnostics from DFG traps
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (169943 => 169944)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 19:35:05 UTC (rev 169943)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 19:54:48 UTC (rev 169944)
@@ -640,7 +640,7 @@
void abortWithReason(AbortReason reason, intptr_t misc)
{
-move(TrustedImm32(misc), memoryTempRegister);
+move(TrustedImm32(misc), addressTempRegister);
abortWithReason(reason);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169946] trunk/Source
Title: [169946] trunk/Source
Revision 169946
Author ander...@apple.com
Date 2014-06-13 13:37:08 -0700 (Fri, 13 Jun 2014)
Log Message
Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133877
Reviewed by Andreas Kling.
Source/WebCore:
* Modules/websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::serverWebSocketProtocol):
(WebCore::WebSocketHandshake::serverSetCookie):
(WebCore::WebSocketHandshake::serverSetCookie2):
(WebCore::WebSocketHandshake::serverUpgrade):
(WebCore::WebSocketHandshake::serverConnection):
(WebCore::WebSocketHandshake::serverWebSocketAccept):
* WebCore.exp.in:
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::get):
* platform/network/HTTPHeaderMap.h:
* platform/network/HTTPHeaderNames.in:
* plugins/PluginView.cpp:
(WebCore::PluginView::handlePost):
Source/WebKit2:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::parsePostBuffer):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp
trunk/Source/WebCore/platform/network/HTTPHeaderMap.h
trunk/Source/WebCore/platform/network/HTTPHeaderNames.in
trunk/Source/WebCore/plugins/PluginView.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (169945 => 169946)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
@@ -1,3 +1,25 @@
+2014-06-13 Anders Carlsson ander...@apple.com
+
+Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
+https://bugs.webkit.org/show_bug.cgi?id=133877
+
+Reviewed by Andreas Kling.
+
+* Modules/websockets/WebSocketHandshake.cpp:
+(WebCore::WebSocketHandshake::serverWebSocketProtocol):
+(WebCore::WebSocketHandshake::serverSetCookie):
+(WebCore::WebSocketHandshake::serverSetCookie2):
+(WebCore::WebSocketHandshake::serverUpgrade):
+(WebCore::WebSocketHandshake::serverConnection):
+(WebCore::WebSocketHandshake::serverWebSocketAccept):
+* WebCore.exp.in:
+* platform/network/HTTPHeaderMap.cpp:
+(WebCore::HTTPHeaderMap::get):
+* platform/network/HTTPHeaderMap.h:
+* platform/network/HTTPHeaderNames.in:
+* plugins/PluginView.cpp:
+(WebCore::PluginView::handlePost):
+
2014-06-13 Commit Queue commit-qu...@webkit.org
Unreviewed, rolling out r169939.
Modified: trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp (169945 => 169946)
--- trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketHandshake.cpp 2014-06-13 20:37:08 UTC (rev 169946)
@@ -40,6 +40,7 @@
#include CookieJar.h
#include Document.h
#include HTTPHeaderMap.h
+#include HTTPHeaderNames.h
#include HTTPParsers.h
#include URL.h
#include Logging.h
@@ -337,32 +338,32 @@
String WebSocketHandshake::serverWebSocketProtocol() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(sec-websocket-protocol);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SecWebSocketProtocol);
}
String WebSocketHandshake::serverSetCookie() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(set-cookie);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SetCookie);
}
String WebSocketHandshake::serverSetCookie2() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(set-cookie2);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SetCookie2);
}
String WebSocketHandshake::serverUpgrade() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(upgrade);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::Upgrade);
}
String WebSocketHandshake::serverConnection() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(connection);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::Connection);
}
String WebSocketHandshake::serverWebSocketAccept() const
{
-return m_serverHandshakeResponse.httpHeaderFields().get(sec-websocket-accept);
+return m_serverHandshakeResponse.httpHeaderFields().get(HTTPHeaderName::SecWebSocketAccept);
}
String WebSocketHandshake::acceptedExtensions() const
Modified: trunk/Source/WebCore/WebCore.exp.in (169945 => 169946)
--- trunk/Source/WebCore/WebCore.exp.in 2014-06-13 20:34:54 UTC (rev 169945)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-13 20:37:08 UTC (rev 169946)
@@ -1609,7 +1609,7 @@
__ZNK7WebCore13GraphicsLayer18accumulatedOpacityEv
__ZNK7WebCore13GraphicsLayer18getDebugBorderInfoERNS_5ColorERf
[webkit-changes] [169947] trunk/Source
Title: [169947] trunk/Source
Revision 169947
Author commit-qu...@webkit.org
Date 2014-06-13 13:43:32 -0700 (Fri, 13 Jun 2014)
Log Message
Make css jit compile for armv7.
https://bugs.webkit.org/show_bug.cgi?id=133596
Patch by Alex Christensen achristen...@webkit.org on 2014-06-13
Reviewed by Benjamin Poulain.
Source/_javascript_Core:
* assembler/MacroAssembler.h:
Use branchPtr on ARM_THUMB2.
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::addPtrNoFlags):
(JSC::MacroAssemblerARMv7::or32):
(JSC::MacroAssemblerARMv7::test32):
(JSC::MacroAssemblerARMv7::branch):
(JSC::MacroAssemblerARMv7::branchPtr):
Added macros necessary for css jit.
Source/WebCore:
* cssjit/FunctionCall.h:
(WebCore::FunctionCall::swapArguments):
Implemented for ARM_THUMB2 and removed allocator hack.
* cssjit/RegisterAllocator.h:
Added list of ARM_THUMB2 general purpose registers.
(WebCore::RegisterAllocator::isValidRegister):
Added ARM register range and corrected ARM64 register range now that r15 is tempRegister.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::compile):
Return CannotCompile if compiling fails because of lack of registers.
(WebCore::SelectorCompiler::SelectorCodeGenerator::generatePrologue):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateEpilogue):
Implemented for ARM_THUMB2.
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
Return false if the selector cannot be compiled because of lack of registers.
(WebCore::SelectorCompiler::SelectorCodeGenerator::addFlagsToElementStyleFromContext):
Added code using 32-bit operations and used macro assembler for 64-bit operations.
(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
Implemented for APPLE_ARMV7S, where sdiv is not a template in the assembler.
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributesMatching):
Use addPtr instead of add64.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/assembler/MacroAssembler.h
trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/cssjit/FunctionCall.h
trunk/Source/WebCore/cssjit/RegisterAllocator.h
trunk/Source/WebCore/cssjit/SelectorCompiler.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169946 => 169947)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 20:43:32 UTC (rev 169947)
@@ -1,3 +1,20 @@
+2014-06-13 Alex Christensen achristen...@webkit.org
+
+Make css jit compile for armv7.
+https://bugs.webkit.org/show_bug.cgi?id=133596
+
+Reviewed by Benjamin Poulain.
+
+* assembler/MacroAssembler.h:
+Use branchPtr on ARM_THUMB2.
+* assembler/MacroAssemblerARMv7.h:
+(JSC::MacroAssemblerARMv7::addPtrNoFlags):
+(JSC::MacroAssemblerARMv7::or32):
+(JSC::MacroAssemblerARMv7::test32):
+(JSC::MacroAssemblerARMv7::branch):
+(JSC::MacroAssemblerARMv7::branchPtr):
+Added macros necessary for css jit.
+
2014-06-13 Filip Pizlo fpi...@apple.com
Unreviewed, fix ARMv7.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (169946 => 169947)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -117,9 +117,9 @@
using MacroAssemblerBase::and32;
using MacroAssemblerBase::branchAdd32;
using MacroAssemblerBase::branchMul32;
-#if CPU(ARM64) || CPU(X86_64)
+#if CPU(ARM64) || CPU(ARM_THUMB2) || CPU(X86_64)
using MacroAssemblerBase::branchPtr;
-#endif // CPU(X86_64)
+#endif
using MacroAssemblerBase::branchSub32;
using MacroAssemblerBase::lshift32;
using MacroAssemblerBase::or32;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (169946 => 169947)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 20:37:08 UTC (rev 169946)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-06-13 20:43:32 UTC (rev 169947)
@@ -226,6 +226,11 @@
store32(dataTempRegister, address.m_ptr);
}
+void addPtrNoFlags(TrustedImm32 imm, RegisterID srcDest)
+{
+add32(imm, srcDest);
+}
+
void add64(TrustedImm32 imm, AbsoluteAddress address)
{
move(TrustedImmPtr(address.m_ptr), addressTempRegister);
@@ -337,6 +342,13 @@
store32(dataTempRegister, addressTempRegister);
}
+void or32(TrustedImm32 imm, Address address)
+{
+load32(address, dataTempRegister);
+or32(imm, dataTempRegister, dataTempRegister);
+store32(dataTempRegister, address);
+}
+
void or32(TrustedImm32 imm, RegisterID dest)
{
or32(imm, dest, dest);
@@ -1336,6 +1348,16 @@
}
public:
+void
[webkit-changes] [169949] branches/ftlopt/Source/JavaScriptCore
Title: [169949] branches/ftlopt/Source/_javascript_Core
Revision 169949
Author fpi...@apple.com
Date 2014-06-13 14:30:27 -0700 (Fri, 13 Jun 2014)
Log Message
[ftlopt] Constant folding and strength reduction should work in SSA
https://bugs.webkit.org/show_bug.cgi?id=133839
Reviewed by Oliver Hunt.
* dfg/DFGAtTailAbstractState.cpp:
(JSC::DFG::AtTailAbstractState::AtTailAbstractState):
(JSC::DFG::AtTailAbstractState::forNode):
* dfg/DFGAtTailAbstractState.h:
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::foldConstants):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::convertToConstant):
* dfg/DFGIntegerCheckCombiningPhase.cpp:
(JSC::DFG::IntegerCheckCombiningPhase::rangeKeyAndAddend): Fix an unrelated regression that this uncovered.
* dfg/DFGLICMPhase.cpp:
(JSC::DFG::LICMPhase::LICMPhase):
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):
Modified Paths
branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.h
branches/ftlopt/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGGraph.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGIntegerCheckCombiningPhase.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGLICMPhase.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGPlan.cpp
Diff
Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (169948 => 169949)
--- branches/ftlopt/Source/_javascript_Core/ChangeLog 2014-06-13 21:13:43 UTC (rev 169948)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog 2014-06-13 21:30:27 UTC (rev 169949)
@@ -1,3 +1,25 @@
+2014-06-12 Filip Pizlo fpi...@apple.com
+
+[ftlopt] Constant folding and strength reduction should work in SSA
+https://bugs.webkit.org/show_bug.cgi?id=133839
+
+Reviewed by Oliver Hunt.
+
+* dfg/DFGAtTailAbstractState.cpp:
+(JSC::DFG::AtTailAbstractState::AtTailAbstractState):
+(JSC::DFG::AtTailAbstractState::forNode):
+* dfg/DFGAtTailAbstractState.h:
+* dfg/DFGConstantFoldingPhase.cpp:
+(JSC::DFG::ConstantFoldingPhase::foldConstants):
+* dfg/DFGGraph.cpp:
+(JSC::DFG::Graph::convertToConstant):
+* dfg/DFGIntegerCheckCombiningPhase.cpp:
+(JSC::DFG::IntegerCheckCombiningPhase::rangeKeyAndAddend): Fix an unrelated regression that this uncovered.
+* dfg/DFGLICMPhase.cpp:
+(JSC::DFG::LICMPhase::LICMPhase):
+* dfg/DFGPlan.cpp:
+(JSC::DFG::Plan::compileInThreadImpl):
+
2014-06-11 Filip Pizlo fpi...@apple.com
[ftlopt] DFG get_by_id should inline chain accesses with a slightly polymorphic base
Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.cpp (169948 => 169949)
--- branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.cpp 2014-06-13 21:13:43 UTC (rev 169948)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.cpp 2014-06-13 21:30:27 UTC (rev 169949)
@@ -32,8 +32,9 @@
namespace JSC { namespace DFG {
-AtTailAbstractState::AtTailAbstractState()
-: m_block(0)
+AtTailAbstractState::AtTailAbstractState(Graph graph)
+: m_graph(graph)
+, m_block(0)
{
}
@@ -47,7 +48,7 @@
AbstractValue AtTailAbstractState::forNode(Node* node)
{
HashMapNode*, AbstractValue::iterator iter = m_block-ssa-valuesAtTail.find(node);
-ASSERT(iter != m_block-ssa-valuesAtTail.end());
+DFG_ASSERT(m_graph, node, iter != m_block-ssa-valuesAtTail.end());
return iter-value;
}
Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.h (169948 => 169949)
--- branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.h 2014-06-13 21:13:43 UTC (rev 169948)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGAtTailAbstractState.h 2014-06-13 21:30:27 UTC (rev 169949)
@@ -36,7 +36,7 @@
class AtTailAbstractState {
public:
-AtTailAbstractState();
+AtTailAbstractState(Graph);
~AtTailAbstractState();
@@ -63,6 +63,7 @@
void setFoundConstants(bool) { }
private:
+Graph m_graph;
BasicBlock* m_block;
};
Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp (169948 => 169949)
--- branches/ftlopt/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp 2014-06-13 21:13:43 UTC (rev 169948)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGConstantFoldingPhase.cpp 2014-06-13 21:30:27 UTC (rev 169949)
@@ -294,11 +294,6 @@
NodeOrigin origin = node-origin;
AdjacencyList children = node-children;
-if (node-op() == GetLocal)
-m_graph.dethread();
-else
-ASSERT(!node-hasVariableAccessData(m_graph));
-
m_graph.convertToConstant(node, value);
m_insertionSet.insertNode(
indexInBlock, SpecNone, Phantom,
[webkit-changes] [169951] trunk/Source
Title: [169951] trunk/Source
Revision 169951
Author mhahnenb...@apple.com
Date 2014-06-13 15:18:52 -0700 (Fri, 13 Jun 2014)
Log Message
OSR exit should barrier the Executables for all InlineCallFrames, not just those on the stack at the time of exit
https://bugs.webkit.org/show_bug.cgi?id=133880
Reviewed by Filip Pizlo.
Source/_javascript_Core:
We could have exited due to a value received from an inlined block that's no longer on
the stack, so we should just barrier all InlineCallFrames.
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::adjustAndJumpToTarget):
Source/WTF:
* wtf/Bag.h:
(WTF::Bag::iterator::operator!=): Add != to the Bag iterator so we can use it in range-based iteration.
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Bag.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (169950 => 169951)
--- trunk/Source/_javascript_Core/ChangeLog 2014-06-13 21:49:09 UTC (rev 169950)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-06-13 22:18:52 UTC (rev 169951)
@@ -1,3 +1,16 @@
+2014-06-13 Mark Hahnenberg mhahnenb...@apple.com
+
+OSR exit should barrier the Executables for all InlineCallFrames, not just those on the stack at the time of exit
+https://bugs.webkit.org/show_bug.cgi?id=133880
+
+Reviewed by Filip Pizlo.
+
+We could have exited due to a value received from an inlined block that's no longer on
+the stack, so we should just barrier all InlineCallFrames.
+
+* dfg/DFGOSRExitCompilerCommon.cpp:
+(JSC::DFG::adjustAndJumpToTarget):
+
2014-06-13 Alex Christensen achristen...@webkit.org
Make css jit compile for armv7.
Modified: trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp (169950 => 169951)
--- trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2014-06-13 21:49:09 UTC (rev 169950)
+++ trunk/Source/_javascript_Core/dfg/DFGOSRExitCompilerCommon.cpp 2014-06-13 22:18:52 UTC (rev 169951)
@@ -199,13 +199,16 @@
void adjustAndJumpToTarget(CCallHelpers jit, const OSRExitBase exit)
{
#if ENABLE(GGC)
-// 11) Write barrier the owner executable because we're jumping into a different block.
-for (CodeOrigin codeOrigin = exit.m_codeOrigin; ; codeOrigin = codeOrigin.inlineCallFrame-caller) {
-CodeBlock* baselineCodeBlock = jit.baselineCodeBlockFor(codeOrigin);
-jit.move(AssemblyHelpers::TrustedImmPtr(baselineCodeBlock-ownerExecutable()), GPRInfo::nonArgGPR0);
-osrWriteBarrier(jit, GPRInfo::nonArgGPR0, GPRInfo::nonArgGPR1);
-if (!codeOrigin.inlineCallFrame)
-break;
+// 11) Write barrier the owner executables because we're jumping into a different block.
+jit.move(AssemblyHelpers::TrustedImmPtr(jit.codeBlock()-ownerExecutable()), GPRInfo::nonArgGPR0);
+osrWriteBarrier(jit, GPRInfo::nonArgGPR0, GPRInfo::nonArgGPR1);
+InlineCallFrameSet* inlineCallFrames = jit.codeBlock()-jitCode()-dfgCommon()-inlineCallFrames.get();
+if (inlineCallFrames) {
+for (InlineCallFrame* inlineCallFrame : *inlineCallFrames) {
+ScriptExecutable* ownerExecutable = inlineCallFrame-executable.get();
+jit.move(AssemblyHelpers::TrustedImmPtr(ownerExecutable), GPRInfo::nonArgGPR0);
+osrWriteBarrier(jit, GPRInfo::nonArgGPR0, GPRInfo::nonArgGPR1);
+}
}
#endif
Modified: trunk/Source/WTF/ChangeLog (169950 => 169951)
--- trunk/Source/WTF/ChangeLog 2014-06-13 21:49:09 UTC (rev 169950)
+++ trunk/Source/WTF/ChangeLog 2014-06-13 22:18:52 UTC (rev 169951)
@@ -1,3 +1,13 @@
+2014-06-13 Mark Hahnenberg mhahnenb...@apple.com
+
+OSR exit should barrier the Executables for all InlineCallFrames, not just those on the stack at the time of exit
+https://bugs.webkit.org/show_bug.cgi?id=133880
+
+Reviewed by Filip Pizlo.
+
+* wtf/Bag.h:
+(WTF::Bag::iterator::operator!=): Add != to the Bag iterator so we can use it in range-based iteration.
+
2014-06-12 Gavin Barraclough barraclo...@apple.com
Add support for thread/WorkQueue QoS
Modified: trunk/Source/WTF/wtf/Bag.h (169950 => 169951)
--- trunk/Source/WTF/wtf/Bag.h 2014-06-13 21:49:09 UTC (rev 169950)
+++ trunk/Source/WTF/wtf/Bag.h 2014-06-13 22:18:52 UTC (rev 169951)
@@ -83,6 +83,12 @@
{
return m_node == other.m_node;
}
+
+bool operator!=(const iterator other) const
+{
+return !(*this == other);
+}
+
private:
templatetypename U friend class WTF::Bag;
Node* m_node;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169952] trunk/Source/WebCore
Title: [169952] trunk/Source/WebCore
Revision 169952
Author commit-qu...@webkit.org
Date 2014-06-13 15:24:17 -0700 (Fri, 13 Jun 2014)
Log Message
set setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
https://bugs.webkit.org/show_bug.cgi?id=133829
Patch by Jeremy Jones jere...@apple.com on 2014-06-13
Reviewed by Eric Carlson.
When playing inline and external screen is active, don't use external playback.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
declare updateDisableExternalPlayback()
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
call updateDisableExternalPlayback when player is created
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
call updateDisableExternalPlayback when fullscreen mode changes
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback):
update setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h
trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (169951 => 169952)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 22:18:52 UTC (rev 169951)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 22:24:17 UTC (rev 169952)
@@ -1,3 +1,22 @@
+2014-06-13 Jeremy Jones jere...@apple.com
+
+set setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
+https://bugs.webkit.org/show_bug.cgi?id=133829
+
+Reviewed by Eric Carlson.
+
+When playing inline and external screen is active, don't use external playback.
+
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+declare updateDisableExternalPlayback()
+* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
+call updateDisableExternalPlayback when player is created
+(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
+call updateDisableExternalPlayback when fullscreen mode changes
+(WebCore::MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback):
+update setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
+
2014-06-13 Brent Fulgham bfulg...@apple.com
Convert LayerPool and TileCoverageMap from ObjC to C++
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (169951 => 169952)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-06-13 22:18:52 UTC (rev 169951)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-06-13 22:24:17 UTC (rev 169952)
@@ -263,6 +263,7 @@
virtual MediaPlayer::WirelessPlaybackTargetType wirelessPlaybackTargetType() const override;
virtual bool wirelessVideoPlaybackDisabled() const override;
virtual void setWirelessVideoPlaybackDisabled(bool) override;
+void updateDisableExternalPlayback();
#endif
WeakPtrFactoryMediaPlayerPrivateAVFoundationObjC m_weakPtrFactory;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (169951 => 169952)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-13 22:18:52 UTC (rev 169951)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-06-13 22:24:17 UTC (rev 169952)
@@ -737,7 +737,7 @@
[m_avPlayer.get() addObserver:m_objcObserver.get() forKeyPath:@rate options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
#if ENABLE(IOS_AIRPLAY)
[m_avPlayer.get() addObserver:m_objcObserver.get() forKeyPath:@externalPlaybackActive options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
-[m_avPlayer.get() setUsesExternalPlaybackWhileExternalScreenIsActive:YES];
+updateDisableExternalPlayback();
#endif
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
@@ -899,6 +899,9 @@
syncTextTrackBounds();
[m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
}
+#if ENABLE(IOS_AIRPLAY)
+updateDisableExternalPlayback();
+#endif
}
void MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenFrame(FloatRect frame)
@@ -2311,6 +2314,14 @@
[m_avPlayer.get() setAllowsExternalPlayback:!disabled];
}
+
+void MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback()
+{
+if (!m_avPlayer)
+return;
+
+[m_avPlayer
[webkit-changes] [169953] trunk/Source/WebCore
Title: [169953] trunk/Source/WebCore
Revision 169953
Author commit-qu...@webkit.org
Date 2014-06-13 15:26:52 -0700 (Fri, 13 Jun 2014)
Log Message
Make css jit allocator smarter.
https://bugs.webkit.org/show_bug.cgi?id=133834
Patch by Alex Christensen achristen...@webkit.org on 2014-06-13
Reviewed by Benjamin Poulain.
* cssjit/RegisterAllocator.h:
(WebCore::RegisterAllocator::allocateRegister):
(WebCore::RegisterAllocator::deallocateRegister):
(WebCore::RegisterAllocator::reserveCalleeSavedRegisters):
(WebCore::LocalRegister::LocalRegister):
(WebCore::RegisterAllocator::RegisterAllocator):
Use a Deque for the registers. Allocate from the front and deallocate to the back to cycle the register usage.
(WebCore::RegisterAllocator::allocateRegisterWithPreference):
(WebCore::LocalRegisterWithPreference::LocalRegisterWithPreference):
Added the ability to specify that we prefer a certain register if it is available while allocating.
These functions always return a register. It is just a different register than preferred if the preferred register is not available.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsActive):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsHovered):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
Whenever we are allocating a register for the second argument, we should specify that we
prefer to have argumentGPR1 to reduce register swapping when preparing for a function call.
This cannot be done for argumentGPR0 because elementAddressRegister is argumentGPR0 and it is always allocated.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/cssjit/RegisterAllocator.h
trunk/Source/WebCore/cssjit/SelectorCompiler.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (169952 => 169953)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 22:24:17 UTC (rev 169952)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 22:26:52 UTC (rev 169953)
@@ -1,3 +1,31 @@
+2014-06-13 Alex Christensen achristen...@webkit.org
+
+Make css jit allocator smarter.
+https://bugs.webkit.org/show_bug.cgi?id=133834
+
+Reviewed by Benjamin Poulain.
+
+* cssjit/RegisterAllocator.h:
+(WebCore::RegisterAllocator::allocateRegister):
+(WebCore::RegisterAllocator::deallocateRegister):
+(WebCore::RegisterAllocator::reserveCalleeSavedRegisters):
+(WebCore::LocalRegister::LocalRegister):
+(WebCore::RegisterAllocator::RegisterAllocator):
+Use a Deque for the registers. Allocate from the front and deallocate to the back to cycle the register usage.
+(WebCore::RegisterAllocator::allocateRegisterWithPreference):
+(WebCore::LocalRegisterWithPreference::LocalRegisterWithPreference):
+Added the ability to specify that we prefer a certain register if it is available while allocating.
+These functions always return a register. It is just a different register than preferred if the preferred register is not available.
+* cssjit/SelectorCompiler.cpp:
+(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeValueExactMatching):
+(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementAttributeFunctionCallValueMatching):
+(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsActive):
+(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsHovered):
+(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
+Whenever we are allocating a register for the second argument, we should specify that we
+prefer to have argumentGPR1 to reduce register swapping when preparing for a function call.
+This cannot be done for argumentGPR0 because elementAddressRegister is argumentGPR0 and it is always allocated.
+
2014-06-13 Jeremy Jones jere...@apple.com
set setUsesExternalPlaybackWhileExternalScreenIsActive based on fullscreen mode
Modified: trunk/Source/WebCore/cssjit/RegisterAllocator.h (169952 => 169953)
--- trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 22:24:17 UTC (rev 169952)
+++ trunk/Source/WebCore/cssjit/RegisterAllocator.h 2014-06-13 22:26:52 UTC (rev 169953)
@@ -29,7 +29,7 @@
#if ENABLE(CSS_SELECTOR_JIT)
#include _javascript_Core/MacroAssembler.h
-#include wtf/HashSet.h
+#include wtf/Deque.h
#include wtf/Vector.h
namespace WebCore {
@@ -102,9 +102,9 @@
JSC::MacroAssembler::RegisterID allocateRegister()
{
-auto first = m_registers.begin();
-JSC::MacroAssembler::RegisterID registerID = static_castJSC::MacroAssembler::RegisterID(*first);
-RELEASE_ASSERT(m_registers.remove(first));
+
[webkit-changes] [169955] trunk/Source/WebCore
Title: [169955] trunk/Source/WebCore
Revision 169955
Author ander...@apple.com
Date 2014-06-13 16:01:31 -0700 (Fri, 13 Jun 2014)
Log Message
Use the callOnMainThread version that takes an std::function in BlobResourceHandle::start()
https://bugs.webkit.org/show_bug.cgi?id=133886
Reviewed by Andreas Kling.
Also replace a couple of NSAutoreleasePools with @autoreleasepool and an OwnPtr with an std::unique_ptr.
* page/scrolling/mac/ScrollingThreadMac.mm:
(WebCore::ScrollingThread::threadRunLoopSourceCallback):
* platform/mac/SharedTimerMac.mm:
(WebCore::PowerObserver::PowerObserver):
(WebCore::timerFired):
(WebCore::setSharedTimerFireInterval):
(WebCore::PowerObserver::create): Deleted.
(WebCore::PowerObserver::didReceiveSystemPowerNotification): Deleted.
* platform/network/BlobResourceHandle.cpp:
(WebCore::BlobResourceHandle::start):
(WebCore::delayedStartBlobResourceHandle): Deleted.
* platform/network/BlobResourceHandle.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm
trunk/Source/WebCore/platform/mac/SharedTimerMac.mm
trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp
trunk/Source/WebCore/platform/network/BlobResourceHandle.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (169954 => 169955)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 22:52:50 UTC (rev 169954)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 23:01:31 UTC (rev 169955)
@@ -1,3 +1,25 @@
+2014-06-13 Anders Carlsson ander...@apple.com
+
+Use the callOnMainThread version that takes an std::function in BlobResourceHandle::start()
+https://bugs.webkit.org/show_bug.cgi?id=133886
+
+Reviewed by Andreas Kling.
+
+Also replace a couple of NSAutoreleasePools with @autoreleasepool and an OwnPtr with an std::unique_ptr.
+
+* page/scrolling/mac/ScrollingThreadMac.mm:
+(WebCore::ScrollingThread::threadRunLoopSourceCallback):
+* platform/mac/SharedTimerMac.mm:
+(WebCore::PowerObserver::PowerObserver):
+(WebCore::timerFired):
+(WebCore::setSharedTimerFireInterval):
+(WebCore::PowerObserver::create): Deleted.
+(WebCore::PowerObserver::didReceiveSystemPowerNotification): Deleted.
+* platform/network/BlobResourceHandle.cpp:
+(WebCore::BlobResourceHandle::start):
+(WebCore::delayedStartBlobResourceHandle): Deleted.
+* platform/network/BlobResourceHandle.h:
+
2014-06-12 Sam Weinig s...@webkit.org
Constructors should eagerly reify their properties too
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm (169954 => 169955)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm 2014-06-13 22:52:50 UTC (rev 169954)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingThreadMac.mm 2014-06-13 23:01:31 UTC (rev 169955)
@@ -63,9 +63,9 @@
void ScrollingThread::threadRunLoopSourceCallback()
{
-NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-dispatchFunctionsFromScrollingThread();
-[pool drain];
+@autoreleasepool {
+dispatchFunctionsFromScrollingThread();
+}
}
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mac/SharedTimerMac.mm (169954 => 169955)
--- trunk/Source/WebCore/platform/mac/SharedTimerMac.mm 2014-06-13 22:52:50 UTC (rev 169954)
+++ trunk/Source/WebCore/platform/mac/SharedTimerMac.mm 2014-06-13 23:01:31 UTC (rev 169955)
@@ -43,16 +43,10 @@
WTF_MAKE_NONCOPYABLE(PowerObserver);
public:
-static PassOwnPtrPowerObserver create()
-{
-return adoptPtr(new PowerObserver);
-}
+PowerObserver();
~PowerObserver();
private:
-PowerObserver();
-
-static void didReceiveSystemPowerNotification(void* context, io_service_t, uint32_t messageType, void* messageArgument);
void didReceiveSystemPowerNotification(io_service_t, uint32_t messageType, void* messageArgument);
void restartSharedTimer();
@@ -65,11 +59,13 @@
PowerObserver::PowerObserver()
: m_powerConnection(0)
-, m_notificationPort(0)
+, m_notificationPort(nullptr)
, m_notifierReference(0)
, m_dispatchQueue(dispatch_queue_create(com.apple.WebKit.PowerObserver, 0))
{
-m_powerConnection = IORegisterForSystemPower(this, m_notificationPort, didReceiveSystemPowerNotification, m_notifierReference);
+m_powerConnection = IORegisterForSystemPower(this, m_notificationPort, [](void* context, io_service_t service, uint32_t messageType, void* messageArgument) {
+static_castPowerObserver*(context)-didReceiveSystemPowerNotification(service, messageType, messageArgument);
+}, m_notifierReference);
if (!m_powerConnection)
return;
@@ -88,11 +84,6 @@
IONotificationPortDestroy(m_notificationPort);
}
-void PowerObserver::didReceiveSystemPowerNotification(void* context, io_service_t service, uint32_t messageType, void* messageArgument)
-{
-
[webkit-changes] [169956] trunk/Source/WebCore
Title: [169956] trunk/Source/WebCore
Revision 169956
Author achristen...@apple.com
Date 2014-06-13 16:37:22 -0700 (Fri, 13 Jun 2014)
Log Message
Make css jit compile on armv7.
https://bugs.webkit.org/show_bug.cgi?id=133889
Reviewed by Benjamin Poulain.
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::moduloHelper):
(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
Implement modulo using a function call for now.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/cssjit/SelectorCompiler.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (169955 => 169956)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 23:01:31 UTC (rev 169955)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 23:37:22 UTC (rev 169956)
@@ -1,3 +1,15 @@
+2014-06-13 Alex Christensen achristen...@webkit.org
+
+Make css jit compile on armv7.
+https://bugs.webkit.org/show_bug.cgi?id=133889
+
+Reviewed by Benjamin Poulain.
+
+* cssjit/SelectorCompiler.cpp:
+(WebCore::SelectorCompiler::moduloHelper):
+(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo):
+Implement modulo using a function call for now.
+
2014-06-13 Anders Carlsson ander...@apple.com
Use the callOnMainThread version that takes an std::function in BlobResourceHandle::start()
Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169955 => 169956)
--- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 23:01:31 UTC (rev 169955)
+++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-13 23:37:22 UTC (rev 169956)
@@ -1457,6 +1457,14 @@
}
}
+#if CPU(ARM_THUMB2) !CPU(APPLE_ARMV7S)
+// FIXME: This could be implemented in assembly to avoid a function call, and we know the divisor at jit-compile time.
+static int moduloHelper(int dividend, int divisor)
+{
+return dividend % divisor;
+}
+#endif
+
// The value in inputDividend is destroyed by the modulo operation.
Assembler::Jump SelectorCodeGenerator::modulo(Assembler::ResultCondition condition, Assembler::RegisterID inputDividend, int divisor)
{
@@ -1473,6 +1481,13 @@
#endif
m_assembler.mul32(divisorRegister, resultRegister);
return m_assembler.branchSub32(condition, inputDividend, resultRegister, resultRegister);
+#elif CPU(ARM_THUMB2) !CPU(APPLE_ARMV7S)
+LocalRegisterWithPreference divisorRegister(m_registerAllocator, , JSC::GPRInfo::argumentGPR1);
+m_assembler.move(Assembler::TrustedImm32(divisor), divisorRegister);
+FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls);
+functionCall.setFunctionAddress(moduloHelper);
+functionCall.setTwoArguments(inputDividend, divisorRegister);
+return functionCall.callAndBranchOnBooleanReturnValue(condition);
#elif CPU(X86_64)
// idiv takes RAX + an arbitrary register, and return RAX + RDX. Most of this code is about doing
// an efficient allocation of those registers. If a register is already in use and is not the inputDividend,
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169957] trunk/Source/WebKit2
Title: [169957] trunk/Source/WebKit2
Revision 169957
Author mh...@apple.com
Date 2014-06-13 17:04:03 -0700 (Fri, 13 Jun 2014)
Log Message
Clean up layers in RemoteLayerTreeHost::clearLayers().
https://bugs.webkit.org/show_bug.cgi?id=133888
Reviewed by Tim Horton.
* UIProcess/mac/RemoteLayerTreeHost.mm:
(WebKit::RemoteLayerTreeHost::clearLayers):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169956 => 169957)
--- trunk/Source/WebKit2/ChangeLog 2014-06-13 23:37:22 UTC (rev 169956)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 00:04:03 UTC (rev 169957)
@@ -1,3 +1,13 @@
+2014-06-13 Martin Hock mh...@apple.com
+
+Clean up layers in RemoteLayerTreeHost::clearLayers().
+https://bugs.webkit.org/show_bug.cgi?id=133888
+
+Reviewed by Tim Horton.
+
+* UIProcess/mac/RemoteLayerTreeHost.mm:
+(WebKit::RemoteLayerTreeHost::clearLayers):
+
2014-06-13 Anders Carlsson ander...@apple.com
Add a HTTPHeaderMap::get overload that takes an HTTPHeaderName
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (169956 => 169957)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-06-13 23:37:22 UTC (rev 169956)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm 2014-06-14 00:04:03 UTC (rev 169957)
@@ -32,11 +32,14 @@
#import ShareableBitmap.h
#import WebPageProxy.h
#import WebProcessProxy.h
+#import QuartzCore/QuartzCore.h
#import WebCore/PlatformLayer.h
#import WebCore/WebActionDisablingCALayerDelegate.h
#import WebKitSystemInterface.h
-#import QuartzCore/QuartzCore.h
+#if PLATFORM(IOS)
+#import UIKit/UIView.h
+#endif
using namespace WebCore;
@@ -140,7 +143,11 @@
{
for (auto idLayer : m_layers) {
m_animationDelegates.remove(idLayer.key);
-asLayer(idLayer.value.get()).contents = nullptr;
+#if PLATFORM(IOS)
+[idLayer.value.get() removeFromSuperview];
+#else
+[asLayer(idLayer.value.get()) removeFromSuperlayer];
+#endif
}
m_layers.clear();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169958] trunk/Source/WTF
Title: [169958] trunk/Source/WTF Revision 169958 Author achristen...@apple.com Date 2014-06-13 17:18:01 -0700 (Fri, 13 Jun 2014) Log Message Enable css jit for armv7 on iOS. https://bugs.webkit.org/show_bug.cgi?id=133890 rdar://problem/17310631 Reviewed by Andreas Kling. * wtf/Platform.h: Enable css jit for ARM thumb on iOS. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h Diff Modified: trunk/Source/WTF/ChangeLog (169957 => 169958) --- trunk/Source/WTF/ChangeLog 2014-06-14 00:04:03 UTC (rev 169957) +++ trunk/Source/WTF/ChangeLog 2014-06-14 00:18:01 UTC (rev 169958) @@ -1,3 +1,14 @@ +2014-06-13 Alex Christensen achristen...@webkit.org + +Enable css jit for armv7 on iOS. +https://bugs.webkit.org/show_bug.cgi?id=133890 +rdar://problem/17310631 + +Reviewed by Andreas Kling. + +* wtf/Platform.h: +Enable css jit for ARM thumb on iOS. + 2014-06-13 Mark Hahnenberg mhahnenb...@apple.com OSR exit should barrier the Executables for all InlineCallFrames, not just those on the stack at the time of exit Modified: trunk/Source/WTF/wtf/Platform.h (169957 => 169958) --- trunk/Source/WTF/wtf/Platform.h 2014-06-14 00:04:03 UTC (rev 169957) +++ trunk/Source/WTF/wtf/Platform.h 2014-06-14 00:18:01 UTC (rev 169958) @@ -853,7 +853,7 @@ /* CSS Selector JIT Compiler */ #if !defined(ENABLE_CSS_SELECTOR_JIT) -#if (CPU(X86_64) || CPU(ARM64)) ENABLE(JIT) (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(EFL)) +#if (CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) PLATFORM(IOS))) ENABLE(JIT) (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(EFL)) #define ENABLE_CSS_SELECTOR_JIT 1 #else #define ENABLE_CSS_SELECTOR_JIT 0 ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169959] trunk/Source
Title: [169959] trunk/Source Revision 169959 Author achristen...@apple.com Date 2014-06-13 17:35:13 -0700 (Fri, 13 Jun 2014) Log Message Unreviewed disabling css jit on armv7. It's not quite ready yet. Source/WebCore: * cssjit/SelectorCompiler.cpp: (WebCore::SelectorCompiler::SelectorCodeGenerator::modulo): Removed extra comma. Source/WTF: * wtf/Platform.h: Disable css jit on armv7. Modified Paths trunk/Source/WTF/ChangeLog trunk/Source/WTF/wtf/Platform.h trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/cssjit/SelectorCompiler.cpp Diff Modified: trunk/Source/WTF/ChangeLog (169958 => 169959) --- trunk/Source/WTF/ChangeLog 2014-06-14 00:18:01 UTC (rev 169958) +++ trunk/Source/WTF/ChangeLog 2014-06-14 00:35:13 UTC (rev 169959) @@ -1,5 +1,12 @@ 2014-06-13 Alex Christensen achristen...@webkit.org +Unreviewed disabling css jit on armv7. It's not quite ready yet. + +* wtf/Platform.h: +Disable css jit on armv7. + +2014-06-13 Alex Christensen achristen...@webkit.org + Enable css jit for armv7 on iOS. https://bugs.webkit.org/show_bug.cgi?id=133890 rdar://problem/17310631 Modified: trunk/Source/WTF/wtf/Platform.h (169958 => 169959) --- trunk/Source/WTF/wtf/Platform.h 2014-06-14 00:18:01 UTC (rev 169958) +++ trunk/Source/WTF/wtf/Platform.h 2014-06-14 00:35:13 UTC (rev 169959) @@ -853,7 +853,7 @@ /* CSS Selector JIT Compiler */ #if !defined(ENABLE_CSS_SELECTOR_JIT) -#if (CPU(X86_64) || CPU(ARM64) || (CPU(ARM_THUMB2) PLATFORM(IOS))) ENABLE(JIT) (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(EFL)) +#if (CPU(X86_64) || CPU(ARM64)) ENABLE(JIT) (OS(DARWIN) || PLATFORM(GTK) || PLATFORM(EFL)) #define ENABLE_CSS_SELECTOR_JIT 1 #else #define ENABLE_CSS_SELECTOR_JIT 0 Modified: trunk/Source/WebCore/ChangeLog (169958 => 169959) --- trunk/Source/WebCore/ChangeLog 2014-06-14 00:18:01 UTC (rev 169958) +++ trunk/Source/WebCore/ChangeLog 2014-06-14 00:35:13 UTC (rev 169959) @@ -1,5 +1,13 @@ 2014-06-13 Alex Christensen achristen...@webkit.org +Unreviewed disabling css jit on armv7. It's not quite ready yet. + +* cssjit/SelectorCompiler.cpp: +(WebCore::SelectorCompiler::SelectorCodeGenerator::modulo): +Removed extra comma. + +2014-06-13 Alex Christensen achristen...@webkit.org + Make css jit compile on armv7. https://bugs.webkit.org/show_bug.cgi?id=133889 Modified: trunk/Source/WebCore/cssjit/SelectorCompiler.cpp (169958 => 169959) --- trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-14 00:18:01 UTC (rev 169958) +++ trunk/Source/WebCore/cssjit/SelectorCompiler.cpp 2014-06-14 00:35:13 UTC (rev 169959) @@ -1482,7 +1482,7 @@ m_assembler.mul32(divisorRegister, resultRegister); return m_assembler.branchSub32(condition, inputDividend, resultRegister, resultRegister); #elif CPU(ARM_THUMB2) !CPU(APPLE_ARMV7S) -LocalRegisterWithPreference divisorRegister(m_registerAllocator, , JSC::GPRInfo::argumentGPR1); +LocalRegisterWithPreference divisorRegister(m_registerAllocator, JSC::GPRInfo::argumentGPR1); m_assembler.move(Assembler::TrustedImm32(divisor), divisorRegister); FunctionCall functionCall(m_assembler, m_registerAllocator, m_stackAllocator, m_functionCalls); functionCall.setFunctionAddress(moduloHelper); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169960] trunk/Source/WebCore
Title: [169960] trunk/Source/WebCore Revision 169960 Author bfulg...@apple.com Date 2014-06-13 19:59:00 -0700 (Fri, 13 Jun 2014) Log Message Move utility functions from WebLayer to PlatformCALayer https://bugs.webkit.org/show_bug.cgi?id=133887 rdar://problem/17309622 Reviewed by Simon Fraser. Move some utility functions from WebLayer.h/.mm to PlatformCALayer. Provide ObjC implementation in PlatformCALayerMac. A future patch will provide corresponding Windows versions. * WebCore.exp.in: * platform/graphics/ca/PlatformCALayer.cpp: (WebCore::PlatformCALayer::drawRepaintIndicator): * platform/graphics/ca/PlatformCALayer.h: * platform/graphics/ca/TileController.cpp: (WebCore::TileController::blankPixelCountForTiles): * platform/graphics/ca/TileGrid.cpp: (WebCore::TileGrid::platformCALayerPaintContents): * platform/graphics/ca/mac/PlatformCALayerMac.mm: (PlatformCALayer::collectRectsToPaint): (PlatformCALayer::drawLayerContents): (PlatformCALayer::frameForLayer): * platform/graphics/mac/WebLayer.h: * platform/graphics/mac/WebLayer.mm: (-[WebLayer drawInContext:]): (WebCore::collectRectsToPaint): Deleted. (WebCore::drawLayerContents): Deleted. (WebCore::drawRepaintIndicator): Deleted. (WebCore::frameForLayer): Deleted. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.exp.in trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h trunk/Source/WebCore/platform/graphics/ca/TileController.cpp trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp trunk/Source/WebCore/platform/graphics/ca/mac/PlatformCALayerMac.mm trunk/Source/WebCore/platform/graphics/mac/WebLayer.h trunk/Source/WebCore/platform/graphics/mac/WebLayer.mm Diff Modified: trunk/Source/WebCore/ChangeLog (169959 => 169960) --- trunk/Source/WebCore/ChangeLog 2014-06-14 00:35:13 UTC (rev 169959) +++ trunk/Source/WebCore/ChangeLog 2014-06-14 02:59:00 UTC (rev 169960) @@ -1,3 +1,35 @@ +2014-06-13 Brent Fulgham bfulg...@apple.com + +Move utility functions from WebLayer to PlatformCALayer +https://bugs.webkit.org/show_bug.cgi?id=133887 +rdar://problem/17309622 + +Reviewed by Simon Fraser. + +Move some utility functions from WebLayer.h/.mm to PlatformCALayer. +Provide ObjC implementation in PlatformCALayerMac. A future patch will +provide corresponding Windows versions. + +* WebCore.exp.in: +* platform/graphics/ca/PlatformCALayer.cpp: +(WebCore::PlatformCALayer::drawRepaintIndicator): +* platform/graphics/ca/PlatformCALayer.h: +* platform/graphics/ca/TileController.cpp: +(WebCore::TileController::blankPixelCountForTiles): +* platform/graphics/ca/TileGrid.cpp: +(WebCore::TileGrid::platformCALayerPaintContents): +* platform/graphics/ca/mac/PlatformCALayerMac.mm: +(PlatformCALayer::collectRectsToPaint): +(PlatformCALayer::drawLayerContents): +(PlatformCALayer::frameForLayer): +* platform/graphics/mac/WebLayer.h: +* platform/graphics/mac/WebLayer.mm: +(-[WebLayer drawInContext:]): +(WebCore::collectRectsToPaint): Deleted. +(WebCore::drawLayerContents): Deleted. +(WebCore::drawRepaintIndicator): Deleted. +(WebCore::frameForLayer): Deleted. + 2014-06-13 Alex Christensen achristen...@webkit.org Unreviewed disabling css jit on armv7. It's not quite ready yet. Modified: trunk/Source/WebCore/WebCore.exp.in (169959 => 169960) --- trunk/Source/WebCore/WebCore.exp.in 2014-06-14 00:35:13 UTC (rev 169959) +++ trunk/Source/WebCore/WebCore.exp.in 2014-06-14 02:59:00 UTC (rev 169960) @@ -600,6 +600,7 @@ __ZN7WebCore15PasteboardImageC1Ev __ZN7WebCore15PasteboardImageD1Ev __ZN7WebCore15PlatformCALayer15platformCALayerEPv +__ZN7WebCore15PlatformCALayer17drawLayerContentsEP9CGContextPS0_RN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE __ZN7WebCore15PlatformCALayerC2ENS0_9LayerTypeEPNS_21PlatformCALayerClientE __ZN7WebCore15PlatformCALayerD2Ev __ZN7WebCore15ProtectionSpaceC1ERKN3WTF6StringEiNS_25ProtectionSpaceServerTypeES4_NS_35ProtectionSpaceAuthenticationSchemeE @@ -758,7 +759,6 @@ __ZN7WebCore17SQLiteTransactionD1Ev __ZN7WebCore17SubresourceLoader6createEPNS_5FrameEPNS_14CachedResourceERKNS_15ResourceRequestERKNS_21ResourceLoaderOptionsE __ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE -__ZN7WebCore17drawLayerContentsEP9CGContextPNS_15PlatformCALayerERN3WTF6VectorINS_9FloatRectELm5ENS4_15CrashOnOverflowEEE __ZN7WebCore17encodeForFileNameERKN3WTF6StringE __ZN7WebCore17jsStringWithCacheEPN3JSC9ExecStateERKN3WTF6StringE __ZN7WebCore17languageDidChangeEv Modified: trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp (169959 => 169960) --- trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.cpp 2014-06-14 00:35:13 UTC (rev 169959) +++
[webkit-changes] [169961] trunk/Source/WebKit2
Title: [169961] trunk/Source/WebKit2
Revision 169961
Author timothy_hor...@apple.com
Date 2014-06-13 22:09:37 -0700 (Fri, 13 Jun 2014)
Log Message
Unreviewed; fix the build.
* Shared/mac/RemoteLayerBackingStore.mm:
(WebKit::RemoteLayerBackingStore::drawInContext):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (169960 => 169961)
--- trunk/Source/WebKit2/ChangeLog 2014-06-14 02:59:00 UTC (rev 169960)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 05:09:37 UTC (rev 169961)
@@ -1,3 +1,10 @@
+2014-06-13 Tim Horton timothy_hor...@apple.com
+
+Unreviewed; fix the build.
+
+* Shared/mac/RemoteLayerBackingStore.mm:
+(WebKit::RemoteLayerBackingStore::drawInContext):
+
2014-06-13 Martin Hock mh...@apple.com
Clean up layers in RemoteLayerTreeHost::clearLayers().
Modified: trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm (169960 => 169961)
--- trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-14 02:59:00 UTC (rev 169960)
+++ trunk/Source/WebKit2/Shared/mac/RemoteLayerBackingStore.mm 2014-06-14 05:09:37 UTC (rev 169961)
@@ -279,7 +279,7 @@
IntRect dirtyBounds = m_dirtyRegion.bounds();
VectorIntRect dirtyRects = m_dirtyRegion.rects();
-if (dirtyRects.size() webLayerMaxRectsToPaint || m_dirtyRegion.totalArea() webLayerWastedSpaceThreshold * dirtyBounds.width() * dirtyBounds.height()) {
+if (dirtyRects.size() PlatformCALayer::webLayerMaxRectsToPaint || m_dirtyRegion.totalArea() PlatformCALayer::webLayerWastedSpaceThreshold * dirtyBounds.width() * dirtyBounds.height()) {
dirtyRects.clear();
dirtyRects.append(dirtyBounds);
}
@@ -293,7 +293,7 @@
m_paintingRects.append(scaledRect);
}
-CGRect cgPaintingRects[webLayerMaxRectsToPaint];
+CGRect cgPaintingRects[PlatformCALayer::webLayerMaxRectsToPaint];
for (size_t i = 0, dirtyRectCount = m_paintingRects.size(); i dirtyRectCount; ++i) {
FloatRect scaledPaintingRect = m_paintingRects[i];
scaledPaintingRect.scale(m_scale);
@@ -324,7 +324,7 @@
m_layer-owner()-platformCALayerPaintContents(m_layer, context, dirtyBounds);
break;
case PlatformCALayer::LayerTypeWebLayer:
-drawLayerContents(cgContext, m_layer, m_paintingRects);
+PlatformCALayer::drawLayerContents(cgContext, m_layer, m_paintingRects);
break;
case PlatformCALayer::LayerTypeLayer:
case PlatformCALayer::LayerTypeTransformLayer:
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [169962] trunk/Source/WebKit2
Title: [169962] trunk/Source/WebKit2 Revision 169962 Author m...@apple.com Date 2014-06-13 22:32:07 -0700 (Fri, 13 Jun 2014) Log Message Make GenericCallback variadic https://bugs.webkit.org/show_bug.cgi?id=133897 Reviewed by Sam Weinig. Also eliminated legacy callback functions and all CallbackBase derived classes outside of GenericCallback.h. * UIProcess/API/C/WKPage.cpp: (WKPageValidateCommand): Changed legacy callback (with leading bool parameter) into modern callback (with trailing error parameter). (WKPageComputePagesForPrinting): Ditto. * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView _getWebArchiveDataWithCompletionHandler:]): Ditto. (-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]): Ditto. * UIProcess/API/Cocoa/_WKThumbnailView.mm: (-[_WKThumbnailView _requestSnapshotIfNeeded]): Ditto. * UIProcess/API/mac/WKView.mm: (-[WKView validateUserInterfaceItem:]): Ditto. (-[WKView startSpeaking:]): Ditto. * UIProcess/AutoCorrectionCallback.h: Replaced CallbackBase derived classes with GenericCallback specializations. * UIProcess/GenericCallback.h: - Made GenericCallback variadic: (WebKit::GenericCallback::performCallbackWithReturnValue): (WebKit::GenericCallback::invalidate): (WebKit::GenericAPICallback::create): - Replaced CallbackBase derived classes with GenericCallback specializations: (WebKit::GenericCallback::create): Deleted. (WebKit::ComputedPagesCallback::create): Deleted. (WebKit::ComputedPagesCallback::~ComputedPagesCallback): Deleted. (WebKit::ComputedPagesCallback::performCallbackWithReturnValue): Deleted. (WebKit::ComputedPagesCallback::invalidate): Deleted. (WebKit::ComputedPagesCallback::ComputedPagesCallback): Deleted. (WebKit::ImageCallback::create): Deleted. (WebKit::ImageCallback::~ImageCallback): Deleted. (WebKit::ImageCallback::performCallbackWithReturnValue): Deleted. (WebKit::ImageCallback::invalidate): Deleted. (WebKit::ImageCallback::ImageCallback): Deleted. * UIProcess/WebPageProxy.h: Replaced CallbackBase derived classes with GenericCallback specializations. * UIProcess/ios/WKContentViewInteraction.mm: (-[WKContentView requestAutocorrectionRectsForString:withCompletionHandler:]): Changed legacy callback (with leading bool parameter) into modern callback (with trailing error parameter). (-[WKContentView requestDictationContext:]): Ditto. (-[WKContentView requestAutocorrectionContextWithCompletionHandler:]): Ditto. * UIProcess/mac/WKPrintingView.mm: (-[WKPrintingView _preparePDFDataForPrintingOnSecondaryThread]): Ditto. (-[WKPrintingView _askPageToComputePageRects]): Ditto. (-[WKPrintingView _drawPreview:]): Ditto. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm trunk/Source/WebKit2/UIProcess/AutoCorrectionCallback.h trunk/Source/WebKit2/UIProcess/GenericCallback.h trunk/Source/WebKit2/UIProcess/WebPageProxy.h trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (169961 => 169962) --- trunk/Source/WebKit2/ChangeLog 2014-06-14 05:09:37 UTC (rev 169961) +++ trunk/Source/WebKit2/ChangeLog 2014-06-14 05:32:07 UTC (rev 169962) @@ -1,3 +1,66 @@ +2014-06-13 Dan Bernstein m...@apple.com + +Make GenericCallback variadic +https://bugs.webkit.org/show_bug.cgi?id=133897 + +Reviewed by Sam Weinig. + +Also eliminated legacy callback functions and all CallbackBase derived classes outside of +GenericCallback.h. + +* UIProcess/API/C/WKPage.cpp: +(WKPageValidateCommand): Changed legacy callback (with leading bool parameter) into modern +callback (with trailing error parameter). +(WKPageComputePagesForPrinting): Ditto. + +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView _getWebArchiveDataWithCompletionHandler:]): Ditto. +(-[WKWebView _snapshotRect:intoImageOfWidth:completionHandler:]): Ditto. + +* UIProcess/API/Cocoa/_WKThumbnailView.mm: +(-[_WKThumbnailView _requestSnapshotIfNeeded]): Ditto. + +* UIProcess/API/mac/WKView.mm: +(-[WKView validateUserInterfaceItem:]): Ditto. +(-[WKView startSpeaking:]): Ditto. + +* UIProcess/AutoCorrectionCallback.h: Replaced CallbackBase derived classes with +GenericCallback specializations. + +* UIProcess/GenericCallback.h: +- Made GenericCallback variadic: +(WebKit::GenericCallback::performCallbackWithReturnValue): +(WebKit::GenericCallback::invalidate): +(WebKit::GenericAPICallback::create): + +- Replaced CallbackBase derived classes with GenericCallback specializations: +(WebKit::GenericCallback::create): Deleted. +(WebKit::ComputedPagesCallback::create): Deleted. +
