[webkit-changes] [181389] trunk

2015-03-11 Thread commit-queue
Title: [181389] trunk








Revision 181389
Author commit-qu...@webkit.org
Date 2015-03-11 08:58:13 -0700 (Wed, 11 Mar 2015)


Log Message
Unreviewed, rolling out r181367.
https://bugs.webkit.org/show_bug.cgi?id=142581

Caused crashes on the debug bots (Requested by cdumez on
#webkit).

Reverted changeset:

Web Inspector: CSS parser errors in the console should
include column numbers
https://bugs.webkit.org/show_bug.cgi?id=114313
http://trac.webkit.org/changeset/181367

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSParser.h
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/css/StyleSheetContents.h
trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp
trunk/Source/WebCore/dom/InlineStyleSheetOwner.h
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js


Removed Paths

trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt
trunk/LayoutTests/inspector-protocol/console/warnings-errors.html
trunk/LayoutTests/inspector-protocol/resources/errors.css
trunk/LayoutTests/inspector-protocol/resources/errors.js




Diff

Modified: trunk/LayoutTests/ChangeLog (181388 => 181389)

--- trunk/LayoutTests/ChangeLog	2015-03-11 14:52:04 UTC (rev 181388)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 15:58:13 UTC (rev 181389)
@@ -1,3 +1,18 @@
+2015-03-11  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r181367.
+https://bugs.webkit.org/show_bug.cgi?id=142581
+
+Caused crashes on the debug bots (Requested by cdumez on
+#webkit).
+
+Reverted changeset:
+
+Web Inspector: CSS parser errors in the console should
+include column numbers
+https://bugs.webkit.org/show_bug.cgi?id=114313
+http://trac.webkit.org/changeset/181367
+
 2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
 
 Inline block children do not have correct baselines if their children are also block elements


Deleted: trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt (181388 => 181389)

--- trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-11 14:52:04 UTC (rev 181388)
+++ trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-11 15:58:13 UTC (rev 181389)
@@ -1,25 +0,0 @@
-CONSOLE MESSAGE: line 1: error script
-CONSOLE MESSAGE: line 1: warn script
-CONSOLE MESSAGE: line 5: error script
-CONSOLE MESSAGE: line 6: warn script
-CONSOLE MESSAGE: line 15: TypeError: undefined is not an object (evaluating '[].x.x')
-CONSOLE MESSAGE: line 17: warn 1
-CONSOLE MESSAGE: line 17: error 1
-CONSOLE MESSAGE: line 18: error 2
-Tests that CSS/_javascript_ errors and warnings are sent to the console with line and column information.
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:5:20}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:6:14}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:7:7}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:9:8}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:1:7}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:1:29}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:4:5}
-{source:console-api,level:error,text:error script,location:errors.js:1:14,parameters:[{type:string}]}
-{source:console-api,level:warning,text:warn script,location:errors.js:1:44,parameters:[{type:string}]}
-{source:console-api,level:error,text:error script,location:errors.js:5:18,parameters:[{type:string}]}
-{source:console-api,level:warning,text:warn script,location:errors.js:6:17,parameters:[{type:string}]}
-{source:_javascript_,level:error,text:TypeError: undefined is not an object (evaluating '[].x.x'),location:warnings-errors.html:15:18}
-{source:console-api,level:warning,text:warn 1,location:warnings-errors.html:17:13,parameters:[{type:string}]}
-{source:console-api,level:error,text:error 1,location:warnings-errors.html:17:38,parameters:[{type:string}]}
-{source:console-api,level:error,text:error 2,location:warnings-errors.html:18:17,parameters:[{type:string}]}
-


Deleted: trunk/LayoutTests/inspector-protocol/console/warnings-errors.html (181388 => 181389)

--- trunk/LayoutTests/inspector-protocol/console/warnings-errors.html	2015-03-11 14:52:04 UTC (rev 181388)
+++ trunk/LayoutTests/inspector-protocol/console/warnings-errors.html	2015-03-11 15:58:13 UTC (rev 181389)
@@ -1,46 +0,0 @@
-html
-head
-script type=text/_javascript_ src=""
-link rel=stylesheet href=""
-  stylediv { * color: red; }/style
-stylediv { * color: red; }
-div { * 

[webkit-changes] [181391] trunk/LayoutTests

2015-03-11 Thread mmaxfield
Title: [181391] trunk/LayoutTests








Revision 181391
Author mmaxfi...@apple.com
Date 2015-03-11 09:38:30 -0700 (Wed, 11 Mar 2015)


Log Message
[Win] Test gardening after r181260

Unreviewed.

* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.txt: Added.
* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.txt
trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (181390 => 181391)

--- trunk/LayoutTests/ChangeLog	2015-03-11 16:31:53 UTC (rev 181390)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 16:38:30 UTC (rev 181391)
@@ -1,5 +1,19 @@
 2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
 
+[Win] Test gardening after r181260
+
+Unreviewed.
+
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.txt: Added.
+* platform/win/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.txt: Added.
+
+2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
+
 Test gardening after r181278
 
 Unreviewed.


Added: trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt (0 => 181391)

--- trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt	2015-03-11 16:38:30 UTC (rev 181391)
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,4) size 318x89
+RenderSVGContainer {g} at (0,4) size 318x89
+  RenderSVGPath {svg:line} at (47,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#00]}] [x1=10.00] [y1=0.95] [x2=10.00] [y2=12.17]
+  RenderSVGPath {svg:line} at (114,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#00]}] [x1=23.39] [y1=0.95] [x2=23.39] [y2=12.17]
+  RenderSVGRect {svg:rect} at (50,4) size 67x57 [fill={[type=SOLID] [color=#FF] [opacity=0.40]}] [x=10.00] [y=0.95] [width=13.39] [height=11.17]
+  RenderSVGText {svg:text} at (0,27) size 127x10 contains 1 chunk(s)
+RenderSVGInlineText {#text} at (0,0) size 127x10
+  chunk 1 text run 1 at (0.00,35.00) startOffset 0 endOffset 41 width 126.80: Expected 'Te' to be selected, got: 'Text'
+RenderSVGText {text} at (10,0) size 50x13 contains 1 chunk(s)
+  RenderSVGInlineText {#text} at (0,0) size 50x12
+chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 73.20: Text to Squeeze
+selection start: position 0 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end:   position 4 of child 0 {#text} of child 5 {text} of child 0 {svg} of document


Added: trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt (0 => 181391)

--- trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/win/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt	2015-03-11 16:38:30 UTC (rev 181391)
@@ -0,0 +1,16 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) 

[webkit-changes] [181390] trunk/LayoutTests

2015-03-11 Thread mmaxfield
Title: [181390] trunk/LayoutTests








Revision 181390
Author mmaxfi...@apple.com
Date 2015-03-11 09:31:53 -0700 (Wed, 11 Mar 2015)


Log Message
Test gardening after r181278

Unreviewed.

Until Windows adopts the SVG - OTF Converter, we should mark this test as Mac-only.

* platform/mac/svg/fonts/resources/svg-font-general.svg: Renamed from LayoutTests/svg/fonts/resources/svg-font-general.svg.
* platform/mac/svg/fonts/svg-font-general-expected.html: Renamed from LayoutTests/svg/fonts/svg-font-general-expected.html.
* platform/mac/svg/fonts/svg-font-general.html: Renamed from LayoutTests/svg/fonts/svg-font-general.html.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/mac/svg/fonts/
trunk/LayoutTests/platform/mac/svg/fonts/resources/
trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg
trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html
trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general.html


Removed Paths

trunk/LayoutTests/svg/fonts/




Diff

Modified: trunk/LayoutTests/ChangeLog (181389 => 181390)

--- trunk/LayoutTests/ChangeLog	2015-03-11 15:58:13 UTC (rev 181389)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 16:31:53 UTC (rev 181390)
@@ -1,3 +1,15 @@
+2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
+
+Test gardening after r181278
+
+Unreviewed.
+
+Until Windows adopts the SVG - OTF Converter, we should mark this test as Mac-only.
+
+* platform/mac/svg/fonts/resources/svg-font-general.svg: Renamed from LayoutTests/svg/fonts/resources/svg-font-general.svg.
+* platform/mac/svg/fonts/svg-font-general-expected.html: Renamed from LayoutTests/svg/fonts/svg-font-general-expected.html.
+* platform/mac/svg/fonts/svg-font-general.html: Renamed from LayoutTests/svg/fonts/svg-font-general.html.
+
 2015-03-11  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r181367.


Copied: trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg (from rev 181389, trunk/LayoutTests/svg/fonts/resources/svg-font-general.svg) (0 => 181390)

--- trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg	(rev 0)
+++ trunk/LayoutTests/platform/mac/svg/fonts/resources/svg-font-general.svg	2015-03-11 16:31:53 UTC (rev 181390)
@@ -0,0 +1,48 @@
+?xml version=1.0 standalone=yes?
+svg  version=1.1 viewBox=0 0 160 160 xmlns = 'http://www.w3.org/2000/svg' xmlns:xlink=http://www.w3.org/1999/xlink
+  defs
+font id=Litherum horiz-adv-x=1000
+  font-face units-per-em=1000 ascent=1000 descent=0
+  /font-face
+glyph unicode=A horiz-adv-x=1000 d=M 500 0 H 1000 V 600 H 500 z/
+glyph unicode=B horiz-adv-x=1000/
+/font
+font id=Litherum2 horiz-adv-x=1000 horiz-origin-x=500 horiz-origin-y=300
+  font-face units-per-em=1000 ascent=1000 descent=0
+  /font-face
+glyph unicode=A horiz-adv-x=1000 d=M 0 -300 H 500 V 300 H 0 z/
+/font
+font id=Litherum3 horiz-adv-x=1000
+  font-face font-weight=normal font-style=normal units-per-em=1000 cap-height=600 x-height=400 ascent=1000 descent=0
+  /font-face
+glyph unicode=A d=M 0 0 H 500 V 600 H 0 z/
+glyph unicode=BC horiz-adv-x=500 d=M 0 0 H 500 L 250 600 z/
+glyph unicode=#x672c; horiz-adv-x=500 d=M 0 0 H 500 L 0 600 z/
+/font
+font id=Litherum4 horiz-adv-x=500
+  font-face font-weight=normal font-style=normal units-per-em=1000 cap-height=600 x-height=400 ascent=1000 descent=0
+  /font-face
+glyph unicode=A horiz-adv-x=1000 d=M 0 0 H 500 V 600 H 0 z/
+glyph unicode=D horiz-adv-x=500 d=M 0 0 H 500 L 250 600 z/
+glyph unicode=#x672c; horiz-adv-x=500 d=M 0 0 H 500 L 0 600 z/
+/font
+font id=Litherum5 horiz-adv-x=500
+glyph unicode=A horiz-adv-x=1000 d=M 0 0 H 250 V 600 H 0 z/
+/font
+font id=Litherum6
+  font-face units-per-em=1000 ascent=1000 descent=1000
+  /font-face
+glyph unicode=A horiz-adv-x=1000 d=M 0 0 V -1000 H 1000 V 1000 H 0 z/
+glyph unicode=B horiz-adv-x=1000 d=M 0 0 H 1000 V 1000 H 0 z/
+/font
+font horiz-adv-x=1000 id=Litherum7
+  font-face units-per-em=1000 ascent=1000 descent=0/
+  glyph unicode=A horiz-adv-x=1000 d=M 500 0 H 1000 V 600 z/
+/font
+font horiz-adv-x=1000 id=Litherum8
+  font-face units-per-em=1000 ascent=1000 descent=0/
+  glyph unicode=A horiz-adv-x=1000 d=M 500 0 H 1000 V 600 z/
+  missing-glyph d=M0 0V1000H1000V0z/
+/font
+  /defs
+/svg


Copied: trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html (from rev 181389, trunk/LayoutTests/svg/fonts/svg-font-general-expected.html) (0 => 181390)

--- trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html	(rev 0)
+++ trunk/LayoutTests/platform/mac/svg/fonts/svg-font-general-expected.html	2015-03-11 16:31:53 UTC (rev 181390)
@@ -0,0 +1,33 @@
+!DOCTYPE html
+html
+head
+style
+@font-face {
+

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

2015-03-11 Thread jer . noble
Title: [181403] trunk/Source/WebCore








Revision 181403
Author jer.no...@apple.com
Date 2015-03-11 13:27:42 -0700 (Wed, 11 Mar 2015)


Log Message
[Mac] Update fullscreen placeholder UI to use Vibrancy.
https://bugs.webkit.org/show_bug.cgi?id=142586

Reviewed by Eric Carlson.

Update the fullscreen placeholder with a translucent vibrant appearance
using NSVisualEffectView. Since NSVisuaEffectView is only available for
OS X 10.10 and above, wrap the new implementation in a version check and
retain the old implementation.

Drive-by: Update the strings for the placeholder view with new HI guidance
as well.

* English.lproj/Localizable.strings:
* platform/LocalizedStrings.cpp:
(WebCore::clickToExitFullScreenText):
* platform/mac/WebCoreFullScreenPlaceholderView.h:
* platform/mac/WebCoreFullScreenPlaceholderView.mm:
(-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/English.lproj/Localizable.strings
trunk/Source/WebCore/platform/LocalizedStrings.cpp
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h
trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (181402 => 181403)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 20:27:42 UTC (rev 181403)
@@ -1,3 +1,25 @@
+2015-03-11  Jer Noble  jer.no...@apple.com
+
+[Mac] Update fullscreen placeholder UI to use Vibrancy.
+https://bugs.webkit.org/show_bug.cgi?id=142586
+
+Reviewed by Eric Carlson.
+
+Update the fullscreen placeholder with a translucent vibrant appearance
+using NSVisualEffectView. Since NSVisuaEffectView is only available for
+OS X 10.10 and above, wrap the new implementation in a version check and
+retain the old implementation.
+
+Drive-by: Update the strings for the placeholder view with new HI guidance
+as well.
+
+* English.lproj/Localizable.strings:
+* platform/LocalizedStrings.cpp:
+(WebCore::clickToExitFullScreenText):
+* platform/mac/WebCoreFullScreenPlaceholderView.h:
+* platform/mac/WebCoreFullScreenPlaceholderView.mm:
+(-[WebCoreFullScreenPlaceholderView setExitWarningVisible:]):
+
 2015-03-11  Timothy Horton  timothy_hor...@apple.com
 
 Make it possible to zoom on pages that claim to lay out to device size and then fail to do so


Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (181402 => 181403)

--- trunk/Source/WebCore/English.lproj/Localizable.strings	2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings	2015-03-11 20:27:42 UTC (rev 181403)
@@ -167,7 +167,7 @@
 Clear Recent Searches = Clear Recent Searches;
 
 /* Message to display in browser window when in webkit full screen mode. */
-Click to exit full screen mode = Click to exit full screen mode;
+Click to Exit Full Screen = Click to Exit Full Screen;
 
 /* Subtitle of the label to show on a snapshotted plug-in */
 Click to restart = Click to restart;


Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (181402 => 181403)

--- trunk/Source/WebCore/platform/LocalizedStrings.cpp	2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp	2015-03-11 20:27:42 UTC (rev 181403)
@@ -1056,7 +1056,7 @@
 
 String clickToExitFullScreenText()
 {
-return WEB_UI_STRING(Click to exit full screen mode, Message to display in browser window when in webkit full screen mode.);
+return WEB_UI_STRING(Click to Exit Full Screen, Message to display in browser window when in webkit full screen mode.);
 }
 
 #if ENABLE(VIDEO_TRACK)


Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h (181402 => 181403)

--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.h	2015-03-11 20:27:42 UTC (rev 181403)
@@ -31,7 +31,12 @@
 #import wtf/RetainPtr.h
 
 WEBCORE_EXPORT @interface WebCoreFullScreenPlaceholderView : NSView {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 101000
+RetainPtrNSVisualEffectView _effectView;
+RetainPtrNSTextField _exitWarning;
+#else
 RetainPtrNSView _exitWarning;
+#endif
 NSObject* _target;
 SEL _action;
 }


Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm (181402 => 181403)

--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	2015-03-11 20:18:59 UTC (rev 181402)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenPlaceholderView.mm	2015-03-11 20:27:42 UTC (rev 181403)
@@ -45,6 +45,38 @@
 if (!self)
 return nil;
 
+#if __MAC_OS_X_VERSION_MIN_REQUIRED = 101000
+self.wantsLayer = YES;
+self.autoresizesSubviews = YES;
+self.layerContentsPlacement = NSViewLayerContentsPlacementTopLeft;
+

[webkit-changes] [181408] trunk

2015-03-11 Thread weinig
Title: [181408] trunk








Revision 181408
Author wei...@apple.com
Date 2015-03-11 15:01:01 -0700 (Wed, 11 Mar 2015)


Log Message
Allow adding a button in input elements for auto fill related functionality
rdar://problem/19782066
https://bugs.webkit.org/show_bug.cgi?id=142564

Reviewed by Anders Carlsson.

Source/WebCore:

Test: fast/forms/input-auto-fill-button.html

- Adds a new button that can be shown in input elements - AutoFillButtonElement.
- Makes the spelling of AutoFill consistent throughout WebCore and WebKit (except
  where not feasible due to exported API/SPI).

* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
Add new files.

* css/html.css:
(input::-webkit-auto-fill-button):
(input::-webkit-auto-fill-button:hover):
(input::-webkit-auto-fill-button:active):
Add default style rules for the AutoFill button based on the ones
used for caps lock indicator.

* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::HTMLInputElement):
(WebCore::HTMLInputElement::autoFillButtonElement):
(WebCore::HTMLInputElement::reset):
(WebCore::HTMLInputElement::setValueFromRenderer):
(WebCore::HTMLInputElement::setAutoFilled):
(WebCore::HTMLInputElement::setShowAutoFillButton):
(WebCore::HTMLInputElement::setAutofilled): Deleted.
* html/HTMLInputElement.h:
(WebCore::HTMLInputElement::isAutoFilled):
(WebCore::HTMLInputElement::showAutoFillButton):
(WebCore::HTMLInputElement::isAutofilled): Deleted.
Add new bit to represent whether the AutoFill button should be shown
or not. By default it is not shown, and the client must enable it.

* html/InputType.cpp:
(WebCore::InputType::updateAutoFillButton):
* html/InputType.h:
(WebCore::InputType::autoFillButtonElement):
Add new virtual methods for updating and accessing the AutoFill button.

* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::createShadowSubtree):
(WebCore::TextFieldInputType::autoFillButtonElement):
(WebCore::TextFieldInputType::destroyShadowSubtree):
(WebCore::TextFieldInputType::updatePlaceholderText):
(WebCore::TextFieldInputType::shouldDrawAutoFillButton):
(WebCore::TextFieldInputType::autoFillButtonElementWasClicked):
(WebCore::TextFieldInputType::createContainer):
(WebCore::TextFieldInputType::createAutoFillButton):
(WebCore::TextFieldInputType::updateAutoFillButton):
* html/TextFieldInputType.h:
Add support for adding the AutoFill to the shadow DOM of textfields. The implementation
is slightly different than for the caps lock indicator, because I didn't want to force
the creation of a container for all input elements just in case an AutoFill button was
added. Instead, if an AutoFill button is added, the container is created on the fly and
the existing DOM is updated to move into it. Once a container is created, it is never
removed.

* html/shadow/AutoFillButtonElement.cpp: Added.
(WebCore::AutoFillButtonElement::create):
(WebCore::AutoFillButtonElement::AutoFillButtonElement):
(WebCore::AutoFillButtonElement::defaultEventHandler):
* html/shadow/AutoFillButtonElement.h: Added.
Add div subclass that swallows the click event and forwards it to the ChromeClient.

* page/ChromeClient.h:
Add handleAutoFillButtonClick client function to inform WebKit that the AutoFill
button was clicked.

* testing/Internals.cpp:
(WebCore::Internals::setAutofilled):
(WebCore::Internals::setShowAutoFillButton):
* testing/Internals.h:
* testing/Internals.idl:
Expose a new internals.setShowAutoFillButton() function to allow testing
of the AutoFill button from layout tests.

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::isValueAutofilled):
* css/SelectorCheckerTestFunctions.h:
(WebCore::isAutofilled):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::canShareStyleWithControl):
Update for new spelling of AutoFill.

Source/WebKit/mac:

* DOM/WebDOMOperations.mm:
(-[DOMHTMLInputElement _setAutofilled:]):
Update for consistent spelling of AutoFill.

Source/WebKit2:

- Adds new SPI to respond to clicks on the AutoFill button (both bundle and UIProcess).
- Adds new SPI to enable/disable the display of the AutoFill button on an element.
- Adds new SPI to get the bounds of the AutoFill button.
- Updates spelling of AutoFill to be consistent.

* UIProcess/API/APIUIClient.h:
(API::UIClient::didClickAutoFillButton):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
* UIProcess/API/C/WKPageUIClient.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::handleAutoFillButtonClick):
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/InjectedBundle/API/APIInjectedBundlePageUIClient.h:
(API::InjectedBundle::PageUIClient::didClickAutoFillButton):
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.cpp:
(WebKit::InjectedBundlePageUIClient::didClickAutoFillButton):
* WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::handleAutoFillButtonClick):
* 

[webkit-changes] [181409] trunk

2015-03-11 Thread aestes
Title: [181409] trunk








Revision 181409
Author aes...@apple.com
Date 2015-03-11 15:02:01 -0700 (Wed, 11 Mar 2015)


Log Message
REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
https://bugs.webkit.org/show_bug.cgi?id=142526

Reviewed by Darin Adler.

Source/WebCore:

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::dataReceived): Don't delete m_contentFilter until after we're done using its replacement data.

LayoutTests:

* TestExpectations: Un-skipped contentfiltering/block-after-add-data.html.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/DocumentLoader.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (181408 => 181409)

--- trunk/LayoutTests/ChangeLog	2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 22:02:01 UTC (rev 181409)
@@ -1,3 +1,12 @@
+2015-03-10  Andy Estes  aes...@apple.com
+
+REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
+https://bugs.webkit.org/show_bug.cgi?id=142526
+
+Reviewed by Darin Adler.
+
+* TestExpectations: Un-skipped contentfiltering/block-after-add-data.html.
+
 2015-03-10  Sam Weinig  s...@webkit.org
 
 Allow adding a button in input elements for auto fill related functionality


Modified: trunk/LayoutTests/TestExpectations (181408 => 181409)

--- trunk/LayoutTests/TestExpectations	2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/LayoutTests/TestExpectations	2015-03-11 22:02:01 UTC (rev 181409)
@@ -491,8 +491,6 @@
 # Content extensions are Mac-WK2-only for now
 http/tests/contentextensions [ Skip ]
 
-webkit.org/b/142526 contentfiltering/block-after-add-data.html [ Skip ]
-
 # These tests were flaky on Mac only but they became flaky on all ports after r181345
 webkit.org/b/114280 svg/animations/smil-leak-dynamically-added-element-instances.svg [ Pass Failure ]
 webkit.org/b/114280 svg/animations/smil-leak-element-instances-noBaseValRef.svg [ Pass Failure ]


Modified: trunk/Source/WebCore/ChangeLog (181408 => 181409)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 22:02:01 UTC (rev 181409)
@@ -1,3 +1,13 @@
+2015-03-10  Andy Estes  aes...@apple.com
+
+REGRESSION (r180985): contentfiltering/block-after-add-data.html crashes with GuardMalloc
+https://bugs.webkit.org/show_bug.cgi?id=142526
+
+Reviewed by Darin Adler.
+
+* loader/DocumentLoader.cpp:
+(WebCore::DocumentLoader::dataReceived): Don't delete m_contentFilter until after we're done using its replacement data.
+
 2015-03-10  Sam Weinig  s...@webkit.org
 
 Allow adding a button in input elements for auto fill related functionality


Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (181408 => 181409)

--- trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-03-11 22:01:01 UTC (rev 181408)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp	2015-03-11 22:02:01 UTC (rev 181409)
@@ -875,10 +875,8 @@
 data = ""
 loadWasBlockedBeforeFinishing = m_contentFilter-didBlockData();
 
-if (loadWasBlockedBeforeFinishing) {
+if (loadWasBlockedBeforeFinishing)
 frameLoader()-client().contentFilterDidBlockLoad(m_contentFilter-unblockHandler());
-m_contentFilter = nullptr;
-}
 }
 #endif
 
@@ -892,8 +890,10 @@
 commitLoad(data, length);
 
 #if ENABLE(CONTENT_FILTERING)
-if (loadWasBlockedBeforeFinishing)
+if (loadWasBlockedBeforeFinishing) {
 cancelMainResourceLoad(frameLoader()-cancelledError(m_request));
+m_contentFilter = nullptr;
+}
 #endif
 }
 






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


[webkit-changes] [181404] trunk

2015-03-11 Thread rniwa
Title: [181404] trunk








Revision 181404
Author rn...@webkit.org
Date 2015-03-11 14:03:24 -0700 (Wed, 11 Mar 2015)


Log Message
Calling super() in a base class results in a crash
https://bugs.webkit.org/show_bug.cgi?id=142563

Reviewed by Filip Pizlo.

Source/_javascript_Core:

The bug was caused by BytecodeGenerator trying to generate super _expression_ inside the constructor of a base class.
Disallow that by keeping track of whether super has been used in the current scope or not (needsSuperBinding flag)
and then throwing a syntax error in parseFunctionInfo if it was used and the current scope wasn't the constructor of
a derived class.

* parser/Parser.cpp:
(JSC::ParserLexerType::parseFunctionInfo): Don't allow super() or super.foo outside the constructor of a derived class.
(JSC::ParserLexerType::parseClass): Pass in the constructor kind to parseGetterSetter.
(JSC::ParserLexerType::parseGetterSetter): Ditto to parseFunctionInfo.
(JSC::ParserLexerType::parseMemberExpression): Set needsSuperBinding flag true on the containing scope.
* parser/Parser.h:
(JSC::Scope::Scope):
(JSC::Scope::needsSuperBinding): Added.
(JSC::Scope::setNeedsSuperBinding): Added.

LayoutTests:

Added more test cases to an existing test.

* js/class-syntax-super-expected.txt:
* js/script-tests/class-syntax-super.js:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/js/class-syntax-super-expected.txt
trunk/LayoutTests/js/script-tests/class-syntax-super.js
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/parser/Parser.cpp
trunk/Source/_javascript_Core/parser/Parser.h




Diff

Modified: trunk/LayoutTests/ChangeLog (181403 => 181404)

--- trunk/LayoutTests/ChangeLog	2015-03-11 20:27:42 UTC (rev 181403)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 21:03:24 UTC (rev 181404)
@@ -1,3 +1,15 @@
+2015-03-11  Ryosuke Niwa  rn...@webkit.org
+
+Calling super() in a base class results in a crash
+https://bugs.webkit.org/show_bug.cgi?id=142563
+
+Reviewed by Filip Pizlo.
+
+Added more test cases to an existing test.
+
+* js/class-syntax-super-expected.txt:
+* js/script-tests/class-syntax-super.js:
+
 2015-03-11  Said Abou-Hallawa  sabouhall...@apple.com
 
 svg/animations/smil-leak-*.svg tests are flaky.


Modified: trunk/LayoutTests/js/class-syntax-super-expected.txt (181403 => 181404)

--- trunk/LayoutTests/js/class-syntax-super-expected.txt	2015-03-11 20:27:42 UTC (rev 181403)
+++ trunk/LayoutTests/js/class-syntax-super-expected.txt	2015-03-11 21:03:24 UTC (rev 181404)
@@ -35,6 +35,12 @@
 PASS new (class extends null { constructor() { } }) threw exception TypeError: Cannot return a non-object type in the constructor of a derived class..
 PASS new (class extends null { constructor() { return 1; } }) threw exception TypeError: Cannot return a non-object type in the constructor of a derived class..
 PASS new (class extends null { constructor() { super() } }) did not throw exception.
+PASS new (class { constructor() { super() } }) threw exception SyntaxError: Cannot call super() in a base class constructor..
+PASS function x() { super(); } threw exception SyntaxError: Cannot call super() outside of a class constructor..
+PASS new (class extends Object { constructor() { function x() { super() } } }) threw exception SyntaxError: Cannot call super() outside of a class constructor..
+PASS new (class extends Object { constructor() { function x() { super.method } } }) threw exception SyntaxError: super can only be used in a method of a derived class..
+PASS function x() { super.method(); } threw exception SyntaxError: super can only be used in a method of a derived class..
+PASS function x() { super(); } threw exception SyntaxError: Cannot call super() outside of a class constructor..
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/js/script-tests/class-syntax-super.js (181403 => 181404)

--- trunk/LayoutTests/js/script-tests/class-syntax-super.js	2015-03-11 20:27:42 UTC (rev 181403)
+++ trunk/LayoutTests/js/script-tests/class-syntax-super.js	2015-03-11 21:03:24 UTC (rev 181404)
@@ -61,5 +61,11 @@
 shouldThrow('new (class extends null { constructor() { } })', 'TypeError: Cannot return a non-object type in the constructor of a derived class.');
 shouldThrow('new (class extends null { constructor() { return 1; } })', 'TypeError: Cannot return a non-object type in the constructor of a derived class.');
 shouldNotThrow('new (class extends null { constructor() { super() } })');
+shouldThrow('new (class { constructor() { super() } })', 'SyntaxError: Cannot call super() in a base class constructor.');
+shouldThrow('function x() { super(); }', 'SyntaxError: Cannot call super() outside of a class constructor.');
+shouldThrow('new (class extends Object { constructor() { function x() { super() } } })', 'SyntaxError: Cannot call super() outside of a class constructor.');
+shouldThrow('new (class extends Object { constructor() { function x() { 

[webkit-changes] [181407] trunk/Source

2015-03-11 Thread ggaren
Title: [181407] trunk/Source








Revision 181407
Author gga...@apple.com
Date 2015-03-11 14:29:57 -0700 (Wed, 11 Mar 2015)


Log Message
Refactored the JSC::Heap extra cost API for clarity and to make some known bugs more obvious
https://bugs.webkit.org/show_bug.cgi?id=142589

Reviewed by Andreas Kling.

Source/_javascript_Core:

* API/JSBase.cpp:
(JSReportExtraMemoryCost): Added a FIXME to annotate a known bug.

* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::CodeBlock):
(JSC::CodeBlock::visitAggregate):
* bytecode/CodeBlock.h:
(JSC::CodeBlock::setJITCode): Updated for rename.

* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::reportExtraMemoryAllocatedSlowCase):
(JSC::Heap::deprecatedReportExtraMemorySlowCase): Renamed our reporting
APIs to clarify their relationship to each other: One must report extra
memory at the time of allocation, and at the time the GC visits it.

(JSC::Heap::extraMemorySize):
(JSC::Heap::size):
(JSC::Heap::capacity):
(JSC::Heap::sizeAfterCollect):
(JSC::Heap::willStartCollection): Updated for renames. Added explicit
API for deprecated users who can't use our best API.
 
(JSC::Heap::reportExtraMemoryCostSlowCase): Deleted.
(JSC::Heap::extraSize): Deleted.

* heap/Heap.h:
* heap/HeapInlines.h:
(JSC::Heap::reportExtraMemoryAllocated):
(JSC::Heap::reportExtraMemoryVisited):
(JSC::Heap::deprecatedReportExtraMemory):
(JSC::Heap::reportExtraMemoryCost): Deleted. Ditto.

* heap/SlotVisitor.h:
* heap/SlotVisitorInlines.h:
(JSC::SlotVisitor::reportExtraMemoryVisited):
(JSC::SlotVisitor::reportExtraMemoryUsage): Deleted. Moved this
functionality into the Heap since it's pretty detailed in its access
to the heap.

* runtime/JSArrayBufferView.cpp:
(JSC::JSArrayBufferView::ConstructionContext::ConstructionContext):
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayViewAdaptor::visitChildren): Updated for
renames.

* runtime/JSString.cpp:
(JSC::JSString::visitChildren):
(JSC::JSRopeString::resolveRopeToAtomicString):
(JSC::JSRopeString::resolveRope):
* runtime/JSString.h:
(JSC::JSString::finishCreation): Updated for renames.

* runtime/SparseArrayValueMap.cpp:
(JSC::SparseArrayValueMap::add): Added FIXME.

* runtime/WeakMapData.cpp:
(JSC::WeakMapData::visitChildren): Updated for rename.

Source/WebCore:

Updated for renames to JSC extra cost APIs.

Added FIXMEs to our 10 use cases that are currently wrong, including
canvas, which is the cause of https://bugs.webkit.org/show_bug.cgi?id=142457.

* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::appendBufferInternal):
(WebCore::SourceBuffer::sourceBufferPrivateAppendComplete):
(WebCore::SourceBuffer::reportExtraMemoryAllocated):
(WebCore::SourceBuffer::reportExtraMemoryCost): Deleted.
* Modules/mediasource/SourceBuffer.h:
* bindings/js/JSDocumentCustom.cpp:
(WebCore::toJS):
* bindings/js/JSImageDataCustom.cpp:
(WebCore::toJS):
* bindings/js/JSNodeListCustom.cpp:
(WebCore::createWrapper):
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
* dom/CollectionIndexCache.cpp:
(WebCore::reportExtraMemoryAllocatedForCollectionIndexCache):
(WebCore::reportExtraMemoryCostForCollectionIndexCache): Deleted.
* dom/CollectionIndexCache.h:
(WebCore::Iterator::computeNodeCountUpdatingListCache):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/HTMLCollection.h:
(WebCore::CollectionNamedElementCache::didPopulate):
* html/HTMLImageLoader.cpp:
(WebCore::HTMLImageLoader::imageChanged):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::dropProtection):

Modified Paths

trunk/Source/_javascript_Core/API/JSBase.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp
trunk/Source/_javascript_Core/bytecode/CodeBlock.h
trunk/Source/_javascript_Core/heap/Heap.cpp
trunk/Source/_javascript_Core/heap/Heap.h
trunk/Source/_javascript_Core/heap/HeapInlines.h
trunk/Source/_javascript_Core/heap/SlotVisitor.h
trunk/Source/_javascript_Core/heap/SlotVisitorInlines.h
trunk/Source/_javascript_Core/runtime/JSArrayBufferView.cpp
trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h
trunk/Source/_javascript_Core/runtime/JSString.cpp
trunk/Source/_javascript_Core/runtime/JSString.h
trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.cpp
trunk/Source/_javascript_Core/runtime/WeakMapData.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.h
trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp
trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp
trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp
trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
trunk/Source/WebCore/dom/CollectionIndexCache.cpp
trunk/Source/WebCore/dom/CollectionIndexCache.h
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
trunk/Source/WebCore/html/HTMLCollection.h

[webkit-changes] [181402] branches/safari-600.5-branch

2015-03-11 Thread bshafiei
Title: [181402] branches/safari-600.5-branch








Revision 181402
Author bshaf...@apple.com
Date 2015-03-11 13:18:59 -0700 (Wed, 11 Mar 2015)


Log Message
Merged r181351. rdar://problem/20123022

Modified Paths

branches/safari-600.5-branch/LayoutTests/ChangeLog
branches/safari-600.5-branch/LayoutTests/TestExpectations
branches/safari-600.5-branch/Source/WebCore/ChangeLog
branches/safari-600.5-branch/Source/WebCore/platform/text/TextBreakIterator.cpp


Added Paths

branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt
branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html




Diff

Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (181401 => 181402)

--- branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog	2015-03-11 20:18:59 UTC (rev 181402)
@@ -1,3 +1,18 @@
+2015-03-10  Babak Shafiei  bshaf...@apple.com
+
+Merge r181351.
+
+2015-03-10  Enrica Casucci  enr...@apple.com
+
+Add support for more emoji with variation.
+https://bugs.webkit.org/show_bug.cgi?id=142548
+rdar://problem/20105008
+
+Reviewed by Tim Horton.
+
+* editing/selection/extend-by-character-007-expected.txt: Added.
+* editing/selection/extend-by-character-007.html: Added.
+
 2015-03-04  Said Abou-Hallawa  sabouhall...@apple.com
 
 Crash when accessing an item in SVGTransformList and then removing a previous item from this list.


Modified: branches/safari-600.5-branch/LayoutTests/TestExpectations (181401 => 181402)

--- branches/safari-600.5-branch/LayoutTests/TestExpectations	2015-03-11 20:08:26 UTC (rev 181401)
+++ branches/safari-600.5-branch/LayoutTests/TestExpectations	2015-03-11 20:18:59 UTC (rev 181402)
@@ -132,6 +132,7 @@
 webkit.org/b/134769 fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html [ Skip ]
 
 webkit.org/b/141661 fast/text/emoji.html [ Failure ]
+webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Failure ]
 
 compositing/fixed-image-loading.html [ Skip ]
 fast/xsl/xslt-missing-namespace-in-xslt.xml [ Skip ]


Copied: branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007-expected.txt) (0 => 181402)

--- branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt	2015-03-11 20:18:59 UTC (rev 181402)
@@ -0,0 +1,20 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV  BODY  HTML  #document to 4 of DIV  BODY  HTML  #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x584
+  RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF)]
+RenderInline {SPAN} at (0,0) size 275x28
+  RenderText {#text} at (14,16) size 275x28
+text run at (14,16) width 275: \x{D83D}\x{DEA3}\x{D83C}\x{DFFB}\x{D83D}\x{DEA3}\x{D83C}\x{DFFC}\x{D83D}\x{DEA3}\x{D83C}\x{DFFD}\x{D83D}\x{DEA3}\x{D83C}\x{DFFE}\x{D83D}\x{DEA3}\x{D83C}\x{DFFF}\x{D83D}\x{DEA3}
+RenderText {#text} at (0,0) size 0x0
+RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body
+selection end:   position 16 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body


Copied: branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007.html) (0 => 181402)

--- branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html	(rev 0)
+++ branches/safari-600.5-branch/LayoutTests/editing/selection/extend-by-character-007.html	2015-03-11 20:18:59 UTC (rev 181402)
@@ -0,0 +1,35 @@
+html 
+head
+
+style
+.editing { 
+border: 2px solid red; 
+padding: 12px; 
+font-size: 24px; 
+}
+/style
+script src=""
+
+script
+
+function editingTest() {
+for (var i = 0; i  4; i++) {
+extendSelectionForwardByCharacterCommand();
+}
+}
+
+/script
+
+titleEditing Test/title 
+/head 
+body
+!-- 

[webkit-changes] [181396] trunk

2015-03-11 Thread hyatt
Title: [181396] trunk








Revision 181396
Author hy...@apple.com
Date 2015-03-11 11:13:45 -0700 (Wed, 11 Mar 2015)


Log Message
Optimize offsetWidth and offsetHeight to avoid doing layouts.
https://bugs.webkit.org/show_bug.cgi?id=142544

Reviewed by Beth Dakin.

Source/WebCore:

* dom/Document.cpp:
(WebCore::Document::updateLayoutIfDimensionsOutOfDate):
* dom/Document.h:
Added a new method that only updates layout if it determines that the desired dimensions are out
of date.

* dom/Element.cpp:
(WebCore::Element::offsetWidth):
(WebCore::Element::offsetHeight):
Patch offsetWidth and offsetHeight to call the new method rather than updateLayoutIgnorePendingStylesheets.

LayoutTests:

* fast/images/repaint-subrect-grid.html:
Patch this test to use the window.internals update layout method rather than
relying on document.body.offsetWidth.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/images/repaint-subrect-grid.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h
trunk/Source/WebCore/dom/Element.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (181395 => 181396)

--- trunk/LayoutTests/ChangeLog	2015-03-11 18:08:39 UTC (rev 181395)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 18:13:45 UTC (rev 181396)
@@ -1,3 +1,14 @@
+2015-03-11  David Hyatt  hy...@apple.com
+
+Optimize offsetWidth and offsetHeight to avoid doing layouts.
+https://bugs.webkit.org/show_bug.cgi?id=142544
+
+Reviewed by Beth Dakin.
+
+* fast/images/repaint-subrect-grid.html:
+Patch this test to use the window.internals update layout method rather than
+relying on document.body.offsetWidth.
+
 2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
 
 [Win] Test gardening after r181260


Modified: trunk/LayoutTests/fast/images/repaint-subrect-grid.html (181395 => 181396)

--- trunk/LayoutTests/fast/images/repaint-subrect-grid.html	2015-03-11 18:08:39 UTC (rev 181395)
+++ trunk/LayoutTests/fast/images/repaint-subrect-grid.html	2015-03-11 18:13:45 UTC (rev 181396)
@@ -40,8 +40,9 @@
 ++currentPos;
 
 // Force a style recalc.
-document.body.offsetWidth;
-
+if (internals)
+internals.updateLayoutIgnorePendingStylesheetsAndRunPostLayoutTasks();
+
 if (window.testRunner)
 repaintTest();
 else


Modified: trunk/Source/WebCore/ChangeLog (181395 => 181396)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 18:08:39 UTC (rev 181395)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 18:13:45 UTC (rev 181396)
@@ -1,3 +1,21 @@
+2015-03-11  David Hyatt  hy...@apple.com
+
+Optimize offsetWidth and offsetHeight to avoid doing layouts.
+https://bugs.webkit.org/show_bug.cgi?id=142544
+
+Reviewed by Beth Dakin.
+
+* dom/Document.cpp:
+(WebCore::Document::updateLayoutIfDimensionsOutOfDate):
+* dom/Document.h:
+Added a new method that only updates layout if it determines that the desired dimensions are out
+of date.
+
+* dom/Element.cpp:
+(WebCore::Element::offsetWidth):
+(WebCore::Element::offsetHeight):
+Patch offsetWidth and offsetHeight to call the new method rather than updateLayoutIgnorePendingStylesheets.
+
 2015-03-11  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r181367.


Modified: trunk/Source/WebCore/dom/Document.cpp (181395 => 181396)

--- trunk/Source/WebCore/dom/Document.cpp	2015-03-11 18:08:39 UTC (rev 181395)
+++ trunk/Source/WebCore/dom/Document.cpp	2015-03-11 18:13:45 UTC (rev 181396)
@@ -1892,6 +1892,103 @@
 return ensureStyleResolver().styleForElement(element, element-parentNode() ? element-parentNode()-computedStyle() : nullptr);
 }
 
+bool Document::updateLayoutIfDimensionsOutOfDate(Element* element, DimensionsCheck dimensionsCheck)
+{
+ASSERT(isMainThread());
+
+// If the stylesheets haven't loaded, just give up and do a full layout ignoring pending stylesheets.
+if (!haveStylesheetsLoaded()) {
+updateLayoutIgnorePendingStylesheets();
+return true;
+}
+
+// Check for re-entrancy and assert (same code that is in updateLayout()).
+FrameView* frameView = view();
+if (frameView  frameView-isInLayout()) {
+// View layout should not be re-entrant.
+ASSERT_NOT_REACHED();
+return true;
+}
+
+RenderView::RepaintRegionAccumulator repaintRegionAccumulator(renderView());
+
+// Mimic the structure of updateLayout(), but at each step, see if we have been forced into doing a full
+// layout.
+bool requireFullLayout = false;
+if (HTMLFrameOwnerElement* owner = ownerElement()) {
+if (owner-document().updateLayoutIfDimensionsOutOfDate(owner))
+requireFullLayout = true;
+}
+
+updateStyleIfNeeded();
+
+RenderObject* renderer = element-renderer();
+

[webkit-changes] [181405] trunk

2015-03-11 Thread benjamin
Title: [181405] trunk








Revision 181405
Author benja...@webkit.org
Date 2015-03-11 14:08:51 -0700 (Wed, 11 Mar 2015)


Log Message
Add basic support for BOL and EOL assertions to the URL Filter parser
https://bugs.webkit.org/show_bug.cgi?id=142568

Patch by Benjamin Poulain bpoul...@apple.com on 2015-03-11
Reviewed by Alex Christensen.

Source/WebCore:

This patch adds heavily restricted support for BOL and EOL to the URL filter parser.

Both assertions must be the first/last term of their pattern. Any advanced combination
results in a parsing error.

The BOL assertion is easy to represent: currently, any pattern starts at the beginning
of a line and the NFA are generated accordingly.

I had two options to represent the EOL assertion:
1) Add a new special transition on EOL.
2) Add a new vector of actions to the states, conditional to the EOL input.

I picked the first option to avoid growing every state by a vector
that would be empty in the vast majority of cases.


On the matching side, the interpreter was modified to support transitions on '\0'.
DFABytecodeInstruction::CheckValue now stops when running on a character after
the end of the string.

DFABytecodeInstruction::Jump gets two fixes: First we now account for the index
to avoid going past the end of the input. Second, stop on '\0' too... the reason
is that the unconditional jump is only used for fallback edges of the DFA, fallback
edge are not supposed to accept '\0'.

* contentextensions/DFA.cpp:
(WebCore::ContentExtensions::printTransitions):
* contentextensions/DFABytecodeInterpreter.cpp:
(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
* contentextensions/DFANode.h:
* contentextensions/NFA.cpp:
(WebCore::ContentExtensions::NFA::addTransition):
(WebCore::ContentExtensions::NFA::addEpsilonTransition):
(WebCore::ContentExtensions::printTransitions):
* contentextensions/NFANode.h:
* contentextensions/NFAToDFA.cpp:
(WebCore::ContentExtensions::populateTransitions):
(WebCore::ContentExtensions::NFAToDFA::convert):
* contentextensions/URLFilterParser.cpp:
(WebCore::ContentExtensions::Term::Term):
(WebCore::ContentExtensions::Term::isEndOfLineAssertion):
(WebCore::ContentExtensions::GraphBuilder::assertionBOL):
(WebCore::ContentExtensions::GraphBuilder::assertionEOL):
(WebCore::ContentExtensions::GraphBuilder::sinkFloatingTermIfNecessary):

Tools:

* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::TEST_F):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/contentextensions/DFA.cpp
trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp
trunk/Source/WebCore/contentextensions/DFANode.h
trunk/Source/WebCore/contentextensions/NFA.cpp
trunk/Source/WebCore/contentextensions/NFANode.h
trunk/Source/WebCore/contentextensions/NFAToDFA.cpp
trunk/Source/WebCore/contentextensions/URLFilterParser.cpp
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (181404 => 181405)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 21:03:24 UTC (rev 181404)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 21:08:51 UTC (rev 181405)
@@ -1,3 +1,55 @@
+2015-03-11  Benjamin Poulain  bpoul...@apple.com
+
+Add basic support for BOL and EOL assertions to the URL Filter parser
+https://bugs.webkit.org/show_bug.cgi?id=142568
+
+Reviewed by Alex Christensen.
+
+This patch adds heavily restricted support for BOL and EOL to the URL filter parser.
+
+Both assertions must be the first/last term of their pattern. Any advanced combination
+results in a parsing error.
+
+The BOL assertion is easy to represent: currently, any pattern starts at the beginning
+of a line and the NFA are generated accordingly.
+
+I had two options to represent the EOL assertion:
+1) Add a new special transition on EOL.
+2) Add a new vector of actions to the states, conditional to the EOL input.
+
+I picked the first option to avoid growing every state by a vector
+that would be empty in the vast majority of cases.
+
+
+On the matching side, the interpreter was modified to support transitions on '\0'.
+DFABytecodeInstruction::CheckValue now stops when running on a character after
+the end of the string.
+
+DFABytecodeInstruction::Jump gets two fixes: First we now account for the index
+to avoid going past the end of the input. Second, stop on '\0' too... the reason
+is that the unconditional jump is only used for fallback edges of the DFA, fallback
+edge are not supposed to accept '\0'.
+
+* contentextensions/DFA.cpp:
+(WebCore::ContentExtensions::printTransitions):
+* contentextensions/DFABytecodeInterpreter.cpp:
+(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
+* contentextensions/DFANode.h:
+* contentextensions/NFA.cpp:
+

[webkit-changes] [181406] branches/safari-600.1.4.15-branch

2015-03-11 Thread bshafiei
Title: [181406] branches/safari-600.1.4.15-branch








Revision 181406
Author bshaf...@apple.com
Date 2015-03-11 14:14:27 -0700 (Wed, 11 Mar 2015)


Log Message
Merged r181351.  rdar://problem/20123049

Modified Paths

branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog
branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations
branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog
branches/safari-600.1.4.15-branch/Source/WebCore/platform/text/TextBreakIterator.cpp


Added Paths

branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt
branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html




Diff

Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (181405 => 181406)

--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog	2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog	2015-03-11 21:14:27 UTC (rev 181406)
@@ -1,3 +1,18 @@
+2015-03-11  Babak Shafiei  bshaf...@apple.com
+
+Merge r181351.
+
+2015-03-10  Enrica Casucci  enr...@apple.com
+
+Add support for more emoji with variation.
+https://bugs.webkit.org/show_bug.cgi?id=142548
+rdar://problem/20105008
+
+Reviewed by Tim Horton.
+
+* editing/selection/extend-by-character-007-expected.txt: Added.
+* editing/selection/extend-by-character-007.html: Added.
+
 2015-03-06  Lucas Forschler  lforsch...@apple.com
 
 Merge r180337


Modified: branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations (181405 => 181406)

--- branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations	2015-03-11 21:08:51 UTC (rev 181405)
+++ branches/safari-600.1.4.15-branch/LayoutTests/TestExpectations	2015-03-11 21:14:27 UTC (rev 181406)
@@ -132,6 +132,7 @@
 webkit.org/b/134769 fast/dom/HTMLImageElement/sizes/image-sizes-js-change.html [ Skip ]
 
 webkit.org/b/141661 fast/text/emoji.html [ Failure ]
+webkit.org/b/142548 editing/selection/extend-by-character-007.html [ Failure ]
 
 # border painting diff (Path vs. drawLine)
 webkit.org/b/136078 fast/borders/border-painting-dashed.html [ ImageOnlyFailure ]


Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007-expected.txt) (0 => 181406)

--- branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt	(rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007-expected.txt	2015-03-11 21:14:27 UTC (rev 181406)
@@ -0,0 +1,20 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV  BODY  HTML  #document to 4 of DIV  BODY  HTML  #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x584
+  RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF)]
+RenderInline {SPAN} at (0,0) size 275x28
+  RenderText {#text} at (14,16) size 275x28
+text run at (14,16) width 275: \x{D83D}\x{DEA3}\x{D83C}\x{DFFB}\x{D83D}\x{DEA3}\x{D83C}\x{DFFC}\x{D83D}\x{DEA3}\x{D83C}\x{DFFD}\x{D83D}\x{DEA3}\x{D83C}\x{DFFE}\x{D83D}\x{DEA3}\x{D83C}\x{DFFF}\x{D83D}\x{DEA3}
+RenderText {#text} at (0,0) size 0x0
+RenderText {#text} at (0,0) size 0x0
+selection start: position 0 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body
+selection end:   position 16 of child 0 {#text} of child 1 {SPAN} of child 3 {DIV} of body


Copied: branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html (from rev 181351, trunk/LayoutTests/editing/selection/extend-by-character-007.html) (0 => 181406)

--- branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html	(rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/editing/selection/extend-by-character-007.html	2015-03-11 21:14:27 UTC (rev 181406)
@@ -0,0 +1,35 @@
+html 
+head
+
+style
+.editing { 
+border: 2px solid red; 
+padding: 12px; 
+font-size: 24px; 
+}
+/style
+script src=""
+
+script
+
+function editingTest() {
+for (var i = 0; i  4; i++) {
+extendSelectionForwardByCharacterCommand();
+}
+}
+
+/script
+
+titleEditing 

[webkit-changes] [181397] trunk

2015-03-11 Thread timothy_horton
Title: [181397] trunk








Revision 181397
Author timothy_hor...@apple.com
Date 2015-03-11 11:21:05 -0700 (Wed, 11 Mar 2015)


Log Message
attachments should be created when dropping files onto contentEditable areas
https://bugs.webkit.org/show_bug.cgi?id=142494
rdar://problem/19982553

Reviewed by Anders Carlsson.

Covered by existing tests.

* editing/mac/EditorMac.mm:
(WebCore::Editor::WebContentReader::readFilenames):
Instead of inserting the dropped URLs as strings, make an attachment
for each.

* editing/pasteboard/drag-files-to-editable-element-expected.txt:
* editing/pasteboard/drag-files-to-editable-element.html:
Update the test to expect attachments instead of filenames.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element-expected.txt
trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/editing/mac/EditorMac.mm




Diff

Modified: trunk/LayoutTests/ChangeLog (181396 => 181397)

--- trunk/LayoutTests/ChangeLog	2015-03-11 18:13:45 UTC (rev 181396)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 18:21:05 UTC (rev 181397)
@@ -1,3 +1,15 @@
+2015-03-11  Tim Horton  timothy_hor...@apple.com
+
+attachments should be created when dropping files onto contentEditable areas
+https://bugs.webkit.org/show_bug.cgi?id=142494
+rdar://problem/19982553
+
+Reviewed by Anders Carlsson.
+
+* editing/pasteboard/drag-files-to-editable-element-expected.txt:
+* editing/pasteboard/drag-files-to-editable-element.html:
+Update the test to expect attachments instead of filenames.
+
 2015-03-11  David Hyatt  hy...@apple.com
 
 Optimize offsetWidth and offsetHeight to avoid doing layouts.


Modified: trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element-expected.txt (181396 => 181397)

--- trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element-expected.txt	2015-03-11 18:13:45 UTC (rev 181396)
+++ trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element-expected.txt	2015-03-11 18:21:05 UTC (rev 181397)
@@ -1,9 +1,12 @@
-If we drag files onto an editable area, then the filenames should be inserted into the editable area.
+If we drag files onto an editable area, then attachments should be inserted into the editable area.
 
 On success, you will see a series of PASS messages, followed by TEST COMPLETE.
 
 
-PASS result is divLayoutTests/editing/pasteboard/foo/divdivLayoutTests/editing/pasteboard/bar/divdivLayoutTests/editing/pasteboard/baz/div
+PASS attachment.nodeName is ATTACHMENT
+PASS attachment.nodeName is ATTACHMENT
+PASS attachment.nodeName is ATTACHMENT
+PASS fileNames is foo bar baz 
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element.html (181396 => 181397)

--- trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element.html	2015-03-11 18:13:45 UTC (rev 181396)
+++ trunk/LayoutTests/editing/pasteboard/drag-files-to-editable-element.html	2015-03-11 18:21:05 UTC (rev 181397)
@@ -7,13 +7,19 @@
 div id=console/div
 div id=editable contentEditable=true style=width:200px; height:200px/div
 script
-description('If we drag files onto an editable area, then the filenames should be inserted into the editable area.');
+description('If we drag files onto an editable area, then attachments should be inserted into the editable area.');
 
 var editable = document.getElementById(editable);
 if (window.eventSender) {
 dragFilesOntoEditable(['foo', 'bar', 'baz']);
-var result = editable.innerHTML.replace(/file.*?LayoutTests/g, LayoutTests);
-shouldBeEqualToString('result', 'divLayoutTests/editing/pasteboard/foo/divdivLayoutTests/editing/pasteboard/bar/divdivLayoutTests/editing/pasteboard/baz/div');
+var resultChildren = editable.children;
+var fileNames = ;
+for (var i = 0; i  resultChildren.length; i++) {
+var attachment = resultChildren[i];
+shouldBeEqualToString('attachment.nodeName', 'ATTACHMENT');
+fileNames += attachment.file.name +  ;
+}
+shouldBeEqualToString('fileNames', 'foo bar baz ');
 editable.innerHTML = '';
 }
 


Modified: trunk/Source/WebCore/ChangeLog (181396 => 181397)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 18:13:45 UTC (rev 181396)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 18:21:05 UTC (rev 181397)
@@ -1,3 +1,18 @@
+2015-03-11  Timothy Horton  timothy_hor...@apple.com
+
+attachments should be created when dropping files onto contentEditable areas
+https://bugs.webkit.org/show_bug.cgi?id=142494
+rdar://problem/19982553
+
+Reviewed by Anders Carlsson.
+
+Covered by existing tests.
+
+* editing/mac/EditorMac.mm:
+(WebCore::Editor::WebContentReader::readFilenames):
+Instead of inserting the dropped URLs as strings, make an attachment
+for each.
+
 2015-03-11  David 

[webkit-changes] [181401] trunk/LayoutTests

2015-03-11 Thread said
Title: [181401] trunk/LayoutTests








Revision 181401
Author s...@apple.com
Date 2015-03-11 13:08:26 -0700 (Wed, 11 Mar 2015)


Log Message
svg/animations/smil-leak-*.svg tests are flaky.
https://bugs.webkit.org/show_bug.cgi?id=114280

Unreviewed.

Some svg tests were flaky on mac only but they became flaky on all ports
after r181345. They pass locally and on EWS but not on bots. Mark them to
be flaky on all ports till we figure out the problem with these tests.

* TestExpectations:
* platform/mac/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/TestExpectations
trunk/LayoutTests/platform/mac/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (181400 => 181401)

--- trunk/LayoutTests/ChangeLog	2015-03-11 19:16:20 UTC (rev 181400)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 20:08:26 UTC (rev 181401)
@@ -1,3 +1,17 @@
+2015-03-11  Said Abou-Hallawa  sabouhall...@apple.com
+
+svg/animations/smil-leak-*.svg tests are flaky.
+https://bugs.webkit.org/show_bug.cgi?id=114280
+
+Unreviewed.
+
+Some svg tests were flaky on mac only but they became flaky on all ports
+after r181345. They pass locally and on EWS but not on bots. Mark them to
+be flaky on all ports till we figure out the problem with these tests.
+
+* TestExpectations:
+* platform/mac/TestExpectations:
+
 2015-03-11  Tim Horton  timothy_hor...@apple.com
 
 attachments should be created when dropping files onto contentEditable areas


Modified: trunk/LayoutTests/TestExpectations (181400 => 181401)

--- trunk/LayoutTests/TestExpectations	2015-03-11 19:16:20 UTC (rev 181400)
+++ trunk/LayoutTests/TestExpectations	2015-03-11 20:08:26 UTC (rev 181401)
@@ -492,3 +492,9 @@
 http/tests/contentextensions [ Skip ]
 
 webkit.org/b/142526 contentfiltering/block-after-add-data.html [ Skip ]
+
+# These tests were flaky on Mac only but they became flaky on all ports after r181345
+webkit.org/b/114280 svg/animations/smil-leak-dynamically-added-element-instances.svg [ Pass Failure ]
+webkit.org/b/114280 svg/animations/smil-leak-element-instances-noBaseValRef.svg [ Pass Failure ]
+webkit.org/b/114280 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
+webkit.org/b/114280 svg/animations/smil-leak-elements.svg [ Pass Failure ]


Modified: trunk/LayoutTests/platform/mac/TestExpectations (181400 => 181401)

--- trunk/LayoutTests/platform/mac/TestExpectations	2015-03-11 19:16:20 UTC (rev 181400)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2015-03-11 20:08:26 UTC (rev 181401)
@@ -735,11 +735,6 @@
 
 webkit.org/b/120923 animations/cross-fade-background-image.html [ ImageOnlyFailure ]
 
-webkit.org/b/114280 svg/animations/smil-leak-dynamically-added-element-instances.svg [ Pass Failure ]
-webkit.org/b/114280 svg/animations/smil-leak-element-instances-noBaseValRef.svg [ Pass Failure ]
-webkit.org/b/114280 svg/animations/smil-leak-element-instances.svg [ Pass Failure ]
-webkit.org/b/114280 svg/animations/smil-leak-elements.svg [ Pass Failure ]
-
 webkit.org/b/131244 svg/as-image/svg-as-image-canvas.html [ Pass ImageOnlyFailure ]
 
 webkit.org/b/117427 compositing/reflections/load-video-in-reflection.html [ Pass Failure Crash Timeout ]






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


[webkit-changes] [181400] trunk/Source

2015-03-11 Thread timothy_horton
Title: [181400] trunk/Source








Revision 181400
Author timothy_hor...@apple.com
Date 2015-03-11 12:16:20 -0700 (Wed, 11 Mar 2015)


Log Message
Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
https://bugs.webkit.org/show_bug.cgi?id=142549

Reviewed by Simon Fraser.

* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::ViewportConfiguration):
Rename m_ignoreScalingConstraints to m_canIgnoreScalingConstraints,
because it being true does not guarantee that we will ignore scaling constraints,
but it being false does guarantee that we won't.

(WebCore::ViewportConfiguration::shouldIgnoreScalingConstraints):
Ignore scaling constraints if the page:
a) claimed to want to lay out to device-width and then laid out too wide
b) claimed to want to lay out to device-height and then laid out too tall
c) claimed to want to lay out with initialScale=1 and then laid out too wide

(WebCore::ViewportConfiguration::initialScale):
(WebCore::ViewportConfiguration::minimumScale):
(WebCore::ViewportConfiguration::allowsUserScaling):
Call shouldIgnoreScalingConstraints() instead of looking at the local, so we can
have some more logic here (as above).

(WebCore::ViewportConfiguration::description):
Dump whether we're ignoring scaling constraints.

(WebCore::ViewportConfiguration::dump):
Use WTFLogAlways so that the output goes to various other logging mechanisms
instead of just stderr.

* page/ViewportConfiguration.h:
(WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints):
(WebCore::ViewportConfiguration::setIgnoreScalingConstraints): Deleted.

* Shared/WebPreferencesDefinitions.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Flip the pref on by default.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/ViewportConfiguration.cpp
trunk/Source/WebCore/page/ViewportConfiguration.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (181399 => 181400)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 19:16:20 UTC (rev 181400)
@@ -1,3 +1,39 @@
+2015-03-11  Timothy Horton  timothy_hor...@apple.com
+
+Make it possible to zoom on pages that claim to lay out to device size and then fail to do so
+https://bugs.webkit.org/show_bug.cgi?id=142549
+
+Reviewed by Simon Fraser.
+
+* page/ViewportConfiguration.cpp:
+(WebCore::ViewportConfiguration::ViewportConfiguration):
+Rename m_ignoreScalingConstraints to m_canIgnoreScalingConstraints,
+because it being true does not guarantee that we will ignore scaling constraints,
+but it being false does guarantee that we won't.
+
+(WebCore::ViewportConfiguration::shouldIgnoreScalingConstraints):
+Ignore scaling constraints if the page:
+a) claimed to want to lay out to device-width and then laid out too wide
+b) claimed to want to lay out to device-height and then laid out too tall
+c) claimed to want to lay out with initialScale=1 and then laid out too wide
+
+(WebCore::ViewportConfiguration::initialScale):
+(WebCore::ViewportConfiguration::minimumScale):
+(WebCore::ViewportConfiguration::allowsUserScaling):
+Call shouldIgnoreScalingConstraints() instead of looking at the local, so we can
+have some more logic here (as above).
+
+(WebCore::ViewportConfiguration::description):
+Dump whether we're ignoring scaling constraints.
+
+(WebCore::ViewportConfiguration::dump):
+Use WTFLogAlways so that the output goes to various other logging mechanisms
+instead of just stderr.
+
+* page/ViewportConfiguration.h:
+(WebCore::ViewportConfiguration::setCanIgnoreScalingConstraints):
+(WebCore::ViewportConfiguration::setIgnoreScalingConstraints): Deleted.
+
 2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
 
 Use out-of-band messaging for RenderBox::firstLineBaseline() and RenderBox::inlineBlockBaseline()


Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (181399 => 181400)

--- trunk/Source/WebCore/page/ViewportConfiguration.cpp	2015-03-11 19:14:20 UTC (rev 181399)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp	2015-03-11 19:16:20 UTC (rev 181400)
@@ -46,7 +46,7 @@
 
 ViewportConfiguration::ViewportConfiguration()
 : m_minimumLayoutSize(1024, 768)
-, m_ignoreScalingConstraints(false)
+, m_canIgnoreScalingConstraints(false)
 {
 // Setup a reasonable default configuration to avoid computing infinite scale/sizes.
 // Those are the original iPhone configuration.
@@ -97,13 +97,32 @@
 return IntSize(layoutWidth(), layoutHeight());
 }
 
+bool ViewportConfiguration::shouldIgnoreScalingConstraints() const
+{
+if 

[webkit-changes] [181393] trunk/Tools

2015-03-11 Thread bfulgham
Title: [181393] trunk/Tools








Revision 181393
Author bfulg...@apple.com
Date 2015-03-11 10:49:04 -0700 (Wed, 11 Mar 2015)


Log Message
Add some DateMath tests to TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=142565

Reviewed by Alexey Proskuryakov.

* TestWebKitAPI/CMakeLists.txt: Add new DateMath.cpp file.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: Ditto.
* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters: Ditto.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Ditto.
* TestWebKitAPI/Tests/WTF/DateMath.cpp: Added.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/CMakeLists.txt
trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj
trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters
trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj


Added Paths

trunk/Tools/TestWebKitAPI/Tests/WTF/DateMath.cpp




Diff

Modified: trunk/Tools/ChangeLog (181392 => 181393)

--- trunk/Tools/ChangeLog	2015-03-11 17:47:38 UTC (rev 181392)
+++ trunk/Tools/ChangeLog	2015-03-11 17:49:04 UTC (rev 181393)
@@ -1,3 +1,16 @@
+2015-03-11  Brent Fulgham  bfulg...@apple.com
+
+Add some DateMath tests to TestWebKitAPI
+https://bugs.webkit.org/show_bug.cgi?id=142565
+
+Reviewed by Alexey Proskuryakov.
+
+* TestWebKitAPI/CMakeLists.txt: Add new DateMath.cpp file.
+* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj: Ditto.
+* TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters: Ditto.
+* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Ditto.
+* TestWebKitAPI/Tests/WTF/DateMath.cpp: Added.
+
 2015-03-10  Brent Fulgham  bfulg...@apple.com
 
 Regression(r181257): WTF_WorkQueue.Simple is flaky


Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (181392 => 181393)

--- trunk/Tools/TestWebKitAPI/CMakeLists.txt	2015-03-11 17:47:38 UTC (rev 181392)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt	2015-03-11 17:49:04 UTC (rev 181393)
@@ -77,6 +77,7 @@
 ${TESTWEBKITAPI_DIR}/Tests/WTF/AtomicString.cpp
 ${TESTWEBKITAPI_DIR}/Tests/WTF/CString.cpp
 ${TESTWEBKITAPI_DIR}/Tests/WTF/CheckedArithmeticOperations.cpp
+${TESTWEBKITAPI_DIR}/Tests/WTF/DateMath.cpp
 ${TESTWEBKITAPI_DIR}/Tests/WTF/Deque.cpp
 ${TESTWEBKITAPI_DIR}/Tests/WTF/Functional.cpp
 ${TESTWEBKITAPI_DIR}/Tests/WTF/HashMap.cpp


Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj (181392 => 181393)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj	2015-03-11 17:47:38 UTC (rev 181392)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj	2015-03-11 17:49:04 UTC (rev 181393)
@@ -313,6 +313,7 @@
 ClCompile Include=..\Tests\WTF\cf\RetainPtrHashing.cpp /
 ClCompile Include=..\Tests\WTF\CheckedArithmeticOperations.cpp /
 ClCompile Include=..\Tests\WTF\CString.cpp /
+ClCompile Include=..\Tests\WTF\DateMath.cpp /
 ClCompile Include=..\Tests\WTF\Deque.cpp /
 ClCompile Include=..\Tests\WTF\Functional.cpp /
 ClCompile Include=..\Tests\WTF\HashMap.cpp /


Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters (181392 => 181393)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters	2015-03-11 17:47:38 UTC (rev 181392)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj.filters	2015-03-11 17:49:04 UTC (rev 181393)
@@ -169,6 +169,9 @@
 ClCompile Include=..\Tests\WTF\WorkQueue.cpp
   FilterTests\WTF/Filter
 /ClCompile
+ClCompile Include=..\Tests\WTF\DateMath.cpp
+  FilterTests\WTF/Filter
+/ClCompile
   /ItemGroup
   ItemGroup
 None Include=TestWebKitAPIPostBuild.cmd /


Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (181392 => 181393)

--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2015-03-11 17:47:38 UTC (rev 181392)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2015-03-11 17:49:04 UTC (rev 181393)
@@ -56,6 +56,7 @@
 		7673499D1930C5BB00E44DF9 /* StopLoadingDuringDidFailProvisionalLoad_bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7673499A1930182E00E44DF9 /* StopLoadingDuringDidFailProvisionalLoad_bundle.cpp */; };
 		76E182DD1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 76E182DC1547569100F1FADD /* WillSendSubmitEvent_Bundle.cpp */; };
 		76E182DF154767E600F1FADD /* auto-submitting-form.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 76E182DE15475A8300F1FADD /* auto-submitting-form.html */; };
+		7AA021BB1AB09EA70052953F /* DateMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA021BA1AB09EA70052953F /* DateMath.cpp */; };
 		7AA6A1521AAC0B31002B2ED3 /* WorkQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA6A1511AAC0B31002B2ED3 /* WorkQueue.cpp */; };
 		7C486BA11AA12567003F6F9B /* 

[webkit-changes] [181394] tags/Safari-601.1.22

2015-03-11 Thread bshafiei
Title: [181394] tags/Safari-601.1.22








Revision 181394
Author bshaf...@apple.com
Date 2015-03-11 10:57:53 -0700 (Wed, 11 Mar 2015)


Log Message
Merged r181389.

Modified Paths

tags/Safari-601.1.22/LayoutTests/ChangeLog
tags/Safari-601.1.22/Source/WebCore/ChangeLog
tags/Safari-601.1.22/Source/WebCore/css/CSSParser.cpp
tags/Safari-601.1.22/Source/WebCore/css/CSSParser.h
tags/Safari-601.1.22/Source/WebCore/css/StyleSheetContents.cpp
tags/Safari-601.1.22/Source/WebCore/css/StyleSheetContents.h
tags/Safari-601.1.22/Source/WebCore/dom/InlineStyleSheetOwner.cpp
tags/Safari-601.1.22/Source/WebCore/dom/InlineStyleSheetOwner.h
tags/Safari-601.1.22/Source/WebCore/inspector/InspectorStyleSheet.cpp
tags/Safari-601.1.22/Source/WebInspectorUI/ChangeLog
tags/Safari-601.1.22/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js


Removed Paths

tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt
tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors.html
tags/Safari-601.1.22/LayoutTests/inspector-protocol/resources/errors.css
tags/Safari-601.1.22/LayoutTests/inspector-protocol/resources/errors.js




Diff

Modified: tags/Safari-601.1.22/LayoutTests/ChangeLog (181393 => 181394)

--- tags/Safari-601.1.22/LayoutTests/ChangeLog	2015-03-11 17:49:04 UTC (rev 181393)
+++ tags/Safari-601.1.22/LayoutTests/ChangeLog	2015-03-11 17:57:53 UTC (rev 181394)
@@ -1,3 +1,22 @@
+2015-03-11  Babak Shafiei  bshaf...@apple.com
+
+Merge r181389.
+
+2015-03-11  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r181367.
+https://bugs.webkit.org/show_bug.cgi?id=142581
+
+Caused crashes on the debug bots (Requested by cdumez on
+#webkit).
+
+Reverted changeset:
+
+Web Inspector: CSS parser errors in the console should
+include column numbers
+https://bugs.webkit.org/show_bug.cgi?id=114313
+http://trac.webkit.org/changeset/181367
+
 2015-03-10  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: CSS parser errors in the console should include column numbers


Deleted: tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt (181393 => 181394)

--- tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-11 17:49:04 UTC (rev 181393)
+++ tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-11 17:57:53 UTC (rev 181394)
@@ -1,25 +0,0 @@
-CONSOLE MESSAGE: line 1: error script
-CONSOLE MESSAGE: line 1: warn script
-CONSOLE MESSAGE: line 5: error script
-CONSOLE MESSAGE: line 6: warn script
-CONSOLE MESSAGE: line 15: TypeError: undefined is not an object (evaluating '[].x.x')
-CONSOLE MESSAGE: line 17: warn 1
-CONSOLE MESSAGE: line 17: error 1
-CONSOLE MESSAGE: line 18: error 2
-Tests that CSS/_javascript_ errors and warnings are sent to the console with line and column information.
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:5:20}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:6:14}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:7:7}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:9:8}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:1:7}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:1:29}
-{source:css,level:warning,text:Invalid CSS property declaration at: *,location:errors.css:4:5}
-{source:console-api,level:error,text:error script,location:errors.js:1:14,parameters:[{type:string}]}
-{source:console-api,level:warning,text:warn script,location:errors.js:1:44,parameters:[{type:string}]}
-{source:console-api,level:error,text:error script,location:errors.js:5:18,parameters:[{type:string}]}
-{source:console-api,level:warning,text:warn script,location:errors.js:6:17,parameters:[{type:string}]}
-{source:_javascript_,level:error,text:TypeError: undefined is not an object (evaluating '[].x.x'),location:warnings-errors.html:15:18}
-{source:console-api,level:warning,text:warn 1,location:warnings-errors.html:17:13,parameters:[{type:string}]}
-{source:console-api,level:error,text:error 1,location:warnings-errors.html:17:38,parameters:[{type:string}]}
-{source:console-api,level:error,text:error 2,location:warnings-errors.html:18:17,parameters:[{type:string}]}
-


Deleted: tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors.html (181393 => 181394)

--- tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors.html	2015-03-11 17:49:04 UTC (rev 181393)
+++ tags/Safari-601.1.22/LayoutTests/inspector-protocol/console/warnings-errors.html	2015-03-11 17:57:53 UTC (rev 181394)
@@ -1,46 +0,0 @@
-html

[webkit-changes] [181398] trunk

2015-03-11 Thread mmaxfield
Title: [181398] trunk








Revision 181398
Author mmaxfi...@apple.com
Date 2015-03-11 11:22:06 -0700 (Wed, 11 Mar 2015)


Log Message
Use out-of-band messaging for RenderBox::firstLineBaseline() and RenderBox::inlineBlockBaseline()
https://bugs.webkit.org/show_bug.cgi?id=142569

Reviewed by David Hyatt.

Source/WebCore:

Currently, RenderBox::firstLineBaseline() and RenderBox::inlineBlockBaseline() return -1 to mean
that its baseline should be skipped. Instead of using this sentinel value, this patch changes the
return type from int to Optionalint.

No new tests because there is no behavior change.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::baselinePosition):
(WebCore::RenderBlock::firstLineBaseline):
(WebCore::RenderBlock::inlineBlockBaseline):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::firstLineBaseline):
(WebCore::RenderBlockFlow::inlineBlockBaseline):
* rendering/RenderBlockFlow.h:
* rendering/RenderBox.h:
(WebCore::RenderBox::firstLineBaseline):
(WebCore::RenderBox::inlineBlockBaseline):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::baselinePosition):
(WebCore::RenderFlexibleBox::firstLineBaseline):
(WebCore::RenderFlexibleBox::inlineBlockBaseline):
(WebCore::RenderFlexibleBox::marginBoxAscentForChild):
* rendering/RenderFlexibleBox.h:
* rendering/RenderMenuList.h:
* rendering/RenderTable.cpp:
(WebCore::RenderTable::cellAbove):
(WebCore::RenderTable::cellBelow):
(WebCore::RenderTable::cellBefore):
(WebCore::RenderTable::cellAfter):
(WebCore::RenderTable::firstLineBlock):
(WebCore::RenderTable::baselinePosition):
(WebCore::RenderTable::inlineBlockBaseline):
(WebCore::RenderTable::firstLineBaseline):
* rendering/RenderTable.h:
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::cellBaselinePosition):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::firstLineBaseline):
* rendering/RenderTableSection.h:
* rendering/RenderTextControl.h:
* rendering/mathml/RenderMathMLBlock.cpp:
(WebCore::RenderMathMLBlock::baselinePosition):
(WebCore::RenderMathMLTable::firstLineBaseline):
* rendering/mathml/RenderMathMLBlock.h:
* rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::firstLineBaseline):
* rendering/mathml/RenderMathMLFraction.h:
* rendering/mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::firstLineBaseline):
* rendering/mathml/RenderMathMLOperator.h:
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::firstLineBaseline):
(WebCore::RenderMathMLRoot::layout):
* rendering/mathml/RenderMathMLRoot.h:
* rendering/mathml/RenderMathMLRow.cpp:
(WebCore::RenderMathMLRow::layout):
* rendering/mathml/RenderMathMLScripts.cpp:
(WebCore::RenderMathMLScripts::layout):
(WebCore::RenderMathMLScripts::firstLineBaseline):
* rendering/mathml/RenderMathMLScripts.h:
* rendering/mathml/RenderMathMLSpace.cpp:
(WebCore::RenderMathMLSpace::firstLineBaseline):
* rendering/mathml/RenderMathMLSpace.h:
* rendering/mathml/RenderMathMLUnderOver.cpp:
(WebCore::RenderMathMLUnderOver::firstLineBaseline):
* rendering/mathml/RenderMathMLUnderOver.h:

Source/WTF:

Provide a callback to Optional::valueOrCompute() which is evaluated only if necessary.

* wtf/Optional.h:
(WTF::Optional::valueOrCompute):

Tools:

Test Optional::valueOrCompute().

* TestWebKitAPI/Tests/WTF/Optional.cpp:
(TestWebKitAPI::TEST):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Optional.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlock.cpp
trunk/Source/WebCore/rendering/RenderBlock.h
trunk/Source/WebCore/rendering/RenderBlockFlow.cpp
trunk/Source/WebCore/rendering/RenderBlockFlow.h
trunk/Source/WebCore/rendering/RenderBox.h
trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp
trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp
trunk/Source/WebCore/rendering/RenderFlexibleBox.h
trunk/Source/WebCore/rendering/RenderMenuList.h
trunk/Source/WebCore/rendering/RenderTable.cpp
trunk/Source/WebCore/rendering/RenderTable.h
trunk/Source/WebCore/rendering/RenderTableCell.cpp
trunk/Source/WebCore/rendering/RenderTableSection.cpp
trunk/Source/WebCore/rendering/RenderTableSection.h
trunk/Source/WebCore/rendering/RenderTextControl.h
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h
trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp

[webkit-changes] [181392] trunk

2015-03-11 Thread carlosgc
Title: [181392] trunk








Revision 181392
Author carlo...@webkit.org
Date 2015-03-11 10:47:38 -0700 (Wed, 11 Mar 2015)


Log Message
[GTK] Do not look for child processes in the UI process binary path
https://bugs.webkit.org/show_bug.cgi?id=135752

Reviewed by Gustavo Noronha Silva.

.:

* Source/cmake/OptionsGTK.cmake: Add -DDEVELOPMENT_BUILD=1 to the
build for development builds.

Source/WebKit2:

It's only useful for internal tools and tests, but never when
installed, since we don't install the processes in the bin dir but
in the libexec dir.

* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::findWebKitProcess): Only look or the executables in the
UI process binary path or WEBKIT_EXEC_PATH for development builds.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(injectedBundleDirectory): Only check
WEBKIT_INJECTED_BUNDLE_PATH env var for development builds.

Modified Paths

trunk/ChangeLog
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
trunk/Source/cmake/OptionsGTK.cmake




Diff

Modified: trunk/ChangeLog (181391 => 181392)

--- trunk/ChangeLog	2015-03-11 16:38:30 UTC (rev 181391)
+++ trunk/ChangeLog	2015-03-11 17:47:38 UTC (rev 181392)
@@ -1,3 +1,13 @@
+2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] Do not look for child processes in the UI process binary path
+https://bugs.webkit.org/show_bug.cgi?id=135752
+
+Reviewed by Gustavo Noronha Silva.
+
+* Source/cmake/OptionsGTK.cmake: Add -DDEVELOPMENT_BUILD=1 to the
+build for development builds.
+
 2015-03-10  Carlos Garcia Campos  cgar...@igalia.com and José Dapena Paz  jdap...@igalia.com
 
 [GTK] Add a configure option to build with OpenGL ES 2


Modified: trunk/Source/WebKit2/ChangeLog (181391 => 181392)

--- trunk/Source/WebKit2/ChangeLog	2015-03-11 16:38:30 UTC (rev 181391)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-11 17:47:38 UTC (rev 181392)
@@ -1,3 +1,21 @@
+2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] Do not look for child processes in the UI process binary path
+https://bugs.webkit.org/show_bug.cgi?id=135752
+
+Reviewed by Gustavo Noronha Silva.
+
+It's only useful for internal tools and tests, but never when
+installed, since we don't install the processes in the bin dir but
+in the libexec dir.
+
+* Shared/gtk/ProcessExecutablePathGtk.cpp:
+(WebKit::findWebKitProcess): Only look or the executables in the
+UI process binary path or WEBKIT_EXEC_PATH for development builds.
+* UIProcess/API/gtk/WebKitWebContext.cpp:
+(injectedBundleDirectory): Only check
+WEBKIT_INJECTED_BUNDLE_PATH env var for development builds.
+
 2015-03-10  Antti Koivisto  an...@apple.com
 
 Add interface to delete disk cache entries


Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (181391 => 181392)

--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp	2015-03-11 16:38:30 UTC (rev 181391)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp	2015-03-11 17:47:38 UTC (rev 181392)
@@ -29,12 +29,16 @@
 
 #include WebCore/FileSystem.h
 #include glib.h
+
+#if defined(DEVELOPMENT_BUILD)
 #include wtf/gobject/GlibUtilities.h
+#endif
 
 using namespace WebCore;
 
 namespace WebKit {
 
+#if defined(DEVELOPMENT_BUILD)
 static String getExecutablePath()
 {
 CString executablePath = getCurrentExecutablePath();
@@ -42,9 +46,11 @@
 return directoryName(filenameToString(executablePath.data()));
 return String();
 }
+#endif
 
 static String findWebKitProcess(const char* processName)
 {
+#if defined(DEVELOPMENT_BUILD)
 static const char* execDirectory = g_getenv(WEBKIT_EXEC_PATH);
 if (execDirectory) {
 String processPath = pathByAppendingComponent(filenameToString(execDirectory), processName);
@@ -58,6 +64,7 @@
 if (fileExists(processPath))
 return processPath;
 }
+#endif
 
 return pathByAppendingComponent(filenameToString(LIBEXECDIR), processName);
 }


Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (181391 => 181392)

--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2015-03-11 16:38:30 UTC (rev 181391)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp	2015-03-11 17:47:38 UTC (rev 181392)
@@ -218,9 +218,11 @@
 
 static const char* injectedBundleDirectory()
 {
+#if defined(DEVELOPMENT_BUILD)
 const char* bundleDirectory = g_getenv(WEBKIT_INJECTED_BUNDLE_PATH);
 if (bundleDirectory  g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))
 return bundleDirectory;
+#endif
 
 static const char* injectedBundlePath = LIBDIR G_DIR_SEPARATOR_S webkit2gtk- WEBKITGTK_API_VERSION_STRING
 G_DIR_SEPARATOR_S injected-bundle G_DIR_SEPARATOR_S;


Modified: trunk/Source/cmake/OptionsGTK.cmake (181391 => 181392)

--- 

[webkit-changes] [181399] trunk/Tools

2015-03-11 Thread carlosgc
Title: [181399] trunk/Tools








Revision 181399
Author carlo...@webkit.org
Date 2015-03-11 12:14:20 -0700 (Wed, 11 Mar 2015)


Log Message
[GTK] Add support for handling TLS errors to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=142576

Reviewed by Sergio Villar Senin.

It's useful for testing TLS errors handling itself, but also to
allow ignoring TLS errors when testing.

* MiniBrowser/gtk/BrowserWindow.c:
(webViewLoadFailedWithTLSerrors):
(browserWindowConstructed):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c




Diff

Modified: trunk/Tools/ChangeLog (181398 => 181399)

--- trunk/Tools/ChangeLog	2015-03-11 18:22:06 UTC (rev 181398)
+++ trunk/Tools/ChangeLog	2015-03-11 19:14:20 UTC (rev 181399)
@@ -1,3 +1,17 @@
+2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] Add support for handling TLS errors to MiniBrowser
+https://bugs.webkit.org/show_bug.cgi?id=142576
+
+Reviewed by Sergio Villar Senin.
+
+It's useful for testing TLS errors handling itself, but also to
+allow ignoring TLS errors when testing.
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(webViewLoadFailedWithTLSerrors):
+(browserWindowConstructed):
+
 2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
 
 Use out-of-band messaging for RenderBox::firstLineBaseline() and RenderBox::inlineBlockBaseline()


Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (181398 => 181399)

--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2015-03-11 18:22:06 UTC (rev 181398)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c	2015-03-11 19:14:20 UTC (rev 181399)
@@ -368,6 +368,24 @@
 return FALSE;
 }
 
+static gboolean webViewLoadFailedWithTLSerrors(WebKitWebView *webView, const char *failingURI, GTlsCertificate *certificate, GTlsCertificateFlags errors, BrowserWindow *window)
+{
+GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, %s, Invalid TLS Certificate);
+gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), Failed to load %s: Do you want to continue ignoring the TLS errors?, failingURI);
+int response = gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(dialog);
+
+if (response == GTK_RESPONSE_YES) {
+SoupURI *uri = soup_uri_new(failingURI);
+webkit_web_context_allow_tls_certificate_for_host(webkit_web_view_get_context(webView), certificate, uri-host);
+soup_uri_free(uri);
+webkit_web_view_load_uri(webView, failingURI);
+}
+
+return TRUE;
+}
+
 static gboolean webViewDecidePolicy(WebKitWebView *webView, WebKitPolicyDecision *decision, WebKitPolicyDecisionType decisionType, BrowserWindow *window)
 {
 switch (decisionType) {
@@ -874,6 +892,7 @@
 g_signal_connect(window-webView, notify::title, G_CALLBACK(webViewTitleChanged), window);
 g_signal_connect(window-webView, create, G_CALLBACK(webViewCreate), window);
 g_signal_connect(window-webView, load-failed, G_CALLBACK(webViewLoadFailed), window);
+g_signal_connect(window-webView, load-failed-with-tls-errors, G_CALLBACK(webViewLoadFailedWithTLSerrors), window);
 g_signal_connect(window-webView, decide-policy, G_CALLBACK(webViewDecidePolicy), window);
 g_signal_connect(window-webView, permission-request, G_CALLBACK(webViewDecidePermissionRequest), window);
 g_signal_connect(window-webView, mouse-target-changed, G_CALLBACK(webViewMouseTargetChanged), window);






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


[webkit-changes] [181395] trunk

2015-03-11 Thread carlosgc
Title: [181395] trunk








Revision 181395
Author carlo...@webkit.org
Date 2015-03-11 11:08:39 -0700 (Wed, 11 Mar 2015)


Log Message
[GTK] Add an option to enable MiniBrowser for non developer builds and always install it
https://bugs.webkit.org/show_bug.cgi?id=126688

Reviewed by Gustavo Noronha Silva.

.:

Add ENABLE_MINIBROWSER option, enabled by default for development
builds and disabled for production builds unless explicilty enabled.

* Source/cmake/OptionsGTK.cmake:

Tools:

* CMakeLists.txt: Build testing tools only for developer builds,
but MiniBrowser when ENABLE_MINIBROWSER option is ON.
* MiniBrowser/gtk/CMakeLists.txt: Only add
-DWEBKIT_INJECTED_BUNDLE_PATH to the build for developer builds,
and add a rule to install the MiniBrowser.
* MiniBrowser/gtk/main.c:
(main): Only set WEBKIT_INJECTED_BUNDLE_PATH env var for developer
builds.

Modified Paths

trunk/ChangeLog
trunk/Source/cmake/OptionsGTK.cmake
trunk/Tools/CMakeLists.txt
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/CMakeLists.txt
trunk/Tools/MiniBrowser/gtk/main.c




Diff

Modified: trunk/ChangeLog (181394 => 181395)

--- trunk/ChangeLog	2015-03-11 17:57:53 UTC (rev 181394)
+++ trunk/ChangeLog	2015-03-11 18:08:39 UTC (rev 181395)
@@ -1,5 +1,17 @@
 2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
 
+[GTK] Add an option to enable MiniBrowser for non developer builds and always install it
+https://bugs.webkit.org/show_bug.cgi?id=126688
+
+Reviewed by Gustavo Noronha Silva.
+
+Add ENABLE_MINIBROWSER option, enabled by default for development
+builds and disabled for production builds unless explicilty enabled.
+
+* Source/cmake/OptionsGTK.cmake:
+
+2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
+
 [GTK] Do not look for child processes in the UI process binary path
 https://bugs.webkit.org/show_bug.cgi?id=135752
 


Modified: trunk/Source/cmake/OptionsGTK.cmake (181394 => 181395)

--- trunk/Source/cmake/OptionsGTK.cmake	2015-03-11 17:57:53 UTC (rev 181394)
+++ trunk/Source/cmake/OptionsGTK.cmake	2015-03-11 18:08:39 UTC (rev 181395)
@@ -78,6 +78,7 @@
 
 WEBKIT_OPTION_BEGIN()
 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 Whether to build WebKitPluginProcess2 to load GTK2 based plugins. ON)
+WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER Whether to enable MiniBrowser compilation. OFF)
 
 if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
@@ -125,10 +126,10 @@
 endif ()
 
 if (DEVELOPER_MODE)
-set(ENABLE_TOOLS ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
 else ()
-set(ENABLE_TOOLS OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
 set(WebKit2_VERSION_SCRIPT -Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter)
 endif ()


Modified: trunk/Tools/CMakeLists.txt (181394 => 181395)

--- trunk/Tools/CMakeLists.txt	2015-03-11 17:57:53 UTC (rev 181394)
+++ trunk/Tools/CMakeLists.txt	2015-03-11 18:08:39 UTC (rev 181395)
@@ -1,21 +1,24 @@
-if (ENABLE_WEBKIT2)
+if (${PORT} STREQUAL Efl)
 add_subdirectory(WebKitTestRunner)
-endif ()
-
-if (${PORT} STREQUAL Efl)
 add_subdirectory(ImageDiff)
 
 add_subdirectory(MiniBrowser/efl)
 add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
 elseif (${PORT} STREQUAL GTK)
-add_subdirectory(ImageDiff)
-if (ENABLE_WEBKIT2)
+if (DEVELOPER_MODE)
+  add_subdirectory(WebKitTestRunner)
+  add_subdirectory(ImageDiff)
+  if (ENABLE_API_TESTS)
+  add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
+  endif ()
+  if (ENABLE_X11_TARGET)
+  add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
+  endif ()
+endif ()
+
+if (ENABLE_MINIBROWSER)
 add_subdirectory(MiniBrowser/gtk)
-add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
 endif ()
-if (ENABLE_X11_TARGET)
-add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
-endif ()
 endif ()
 
 if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)


Modified: trunk/Tools/ChangeLog (181394 => 181395)

--- trunk/Tools/ChangeLog	2015-03-11 17:57:53 UTC (rev 181394)
+++ trunk/Tools/ChangeLog	2015-03-11 18:08:39 UTC (rev 181395)
@@ -1,3 +1,19 @@
+2015-03-11  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] Add an option to enable MiniBrowser for non developer builds and always install it
+https://bugs.webkit.org/show_bug.cgi?id=126688
+
+Reviewed by Gustavo Noronha Silva.
+
+* CMakeLists.txt: Build testing tools only for developer builds,
+but MiniBrowser when ENABLE_MINIBROWSER option is ON.
+* MiniBrowser/gtk/CMakeLists.txt: Only add
+-DWEBKIT_INJECTED_BUNDLE_PATH to the build for developer builds,
+and add a rule to install the MiniBrowser.
+* MiniBrowser/gtk/main.c:
+(main): Only set 

[webkit-changes] [181410] trunk/Source/WebKit2

2015-03-11 Thread mmaxfield
Title: [181410] trunk/Source/WebKit2








Revision 181410
Author mmaxfi...@apple.com
Date 2015-03-11 15:23:45 -0700 (Wed, 11 Mar 2015)


Log Message
Fix the build

Unreviewed.

* Shared/Downloads/mac/DownloadMac.mm:
(WebKit::Download::start):
(WebKit::Download::resume):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (181409 => 181410)

--- trunk/Source/WebKit2/ChangeLog	2015-03-11 22:02:01 UTC (rev 181409)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-11 22:23:45 UTC (rev 181410)
@@ -1,3 +1,13 @@
+2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
+
+Fix the build
+
+Unreviewed.
+
+* Shared/Downloads/mac/DownloadMac.mm:
+(WebKit::Download::start):
+(WebKit::Download::resume):
+
 2015-03-10  Sam Weinig  s...@webkit.org
 
 Allow adding a button in input elements for auto fill related functionality


Modified: trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm (181409 => 181410)

--- trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm	2015-03-11 22:02:01 UTC (rev 181409)
+++ trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm	2015-03-11 22:23:45 UTC (rev 181410)
@@ -62,7 +62,10 @@
 ASSERT(!m_delegate);
 
 m_delegate = adoptNS([[WKDownloadAsDelegate alloc] initWithDownload:this]);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
 m_nsURLDownload = adoptNS([[NSURLDownload alloc] initWithRequest:m_request.nsURLRequest(UpdateHTTPBody) delegate:m_delegate.get()]);
+#pragma clang diagnostic pop
 
 // FIXME: Allow this to be changed by the client.
 [m_nsURLDownload setDeletesFileUponFailure:NO];
@@ -93,10 +96,16 @@
 if (m_sandboxExtension)
 m_sandboxExtension-consume();
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
 m_delegate = adoptNS([[WKDownloadAsDelegate alloc] initWithDownload:this]);
+#pragma clang diagnostic pop
 
 auto nsData = adoptNS([[NSData alloc] initWithBytes:resumeData.data() length:resumeData.size()]);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored -Wdeprecated-declarations
 m_nsURLDownload = adoptNS([[NSURLDownload alloc] initWithResumeData:nsData.get() delegate:m_delegate.get() path:path]);
+#pragma clang diagnostic pop
 
 m_request = [m_nsURLDownload request];
 






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


[webkit-changes] [181418] trunk

2015-03-11 Thread timothy_horton
Title: [181418] trunk








Revision 181418
Author timothy_hor...@apple.com
Date 2015-03-11 17:33:07 -0700 (Wed, 11 Mar 2015)


Log Message
attachment shouldn't use user-select: all
https://bugs.webkit.org/show_bug.cgi?id=142453

Reviewed by Darin Adler.

It turns out that user-select: all is rife with bugs; in lieu of fixing them
all (at least for now), let's not use user-select: all in the default stylesheet
for attachment. It's really overkill anyway, since attachment can't have children.
The only user-select: all behavior we actually want is select-on-click.
So, we'll implement that in a slightly different way.

Tests: fast/attachment/attachment-select-on-click-inside-user-select-all.html
   fast/attachment/attachment-select-on-click.html

* css/html.css:
(attachment):
No more user-select: all.

(attachment:focus): Deleted.
We stopped using attachment focus a while back and forgot to remove this.

* dom/Node.h:
(WebCore::Node::shouldSelectOnMouseDown):
Add a virtual function that Node subclasses can override to indicate they
should be selected on mouse down.

* html/HTMLAttachmentElement.h:
Override the aforementioned virtual function; attachment should always
be selected on mouse down.

* page/EventHandler.cpp:
(WebCore::nodeToSelectOnMouseDownForNode):
Determine which node should be selected when a mousedown hits the given node.
If there's any user-select: all, we go with the outermost user-select: all.
Otherwise, we give the node a chance to say that it wants to be selected itself.

(WebCore::expandSelectionToRespectSelectOnMouseDown):
Rename this function, it's not just about user-select: all anymore.
Make use of nodeToSelectOnMouseDownForNode.

(WebCore::EventHandler::selectClosestWordFromHitTestResult):
(WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent):
(WebCore::EventHandler::handleMousePressEventTripleClick):
(WebCore::EventHandler::handleMousePressEventSingleClick):
(WebCore::expandSelectionToRespectUserSelectAll): Deleted.
Adjust to the new names.

* fast/attachment/attachment-select-on-click-inside-user-select-all.html: Added.
* fast/attachment/attachment-select-on-click.html: Added.
* platform/mac/fast/attachment/attachment-select-on-click-expected.png: Added.
* platform/mac/fast/attachment/attachment-select-on-click-expected.txt: Added.
* platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.png: Added.
* platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt: Added.
* platform/mac-mavericks/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt: Added.
* platform/mac-mavericks/fast/attachment/attachment-select-on-click-expected.txt: Added.
Add two tests. One, for the basic functionality of clicking on an
attachment to select it. The second, to test that clicking on an
attachment inside a larger user-select: all element still selects
the whole user-select: all element.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/html.css
trunk/Source/WebCore/dom/Node.h
trunk/Source/WebCore/html/HTMLAttachmentElement.h
trunk/Source/WebCore/page/EventHandler.cpp


Added Paths

trunk/LayoutTests/fast/attachment/attachment-select-on-click-inside-user-select-all.html
trunk/LayoutTests/fast/attachment/attachment-select-on-click.html
trunk/LayoutTests/platform/mac/fast/attachment/attachment-select-on-click-expected.png
trunk/LayoutTests/platform/mac/fast/attachment/attachment-select-on-click-expected.txt
trunk/LayoutTests/platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.png
trunk/LayoutTests/platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt
trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-select-on-click-expected.txt
trunk/LayoutTests/platform/mac-mavericks/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (181417 => 181418)

--- trunk/LayoutTests/ChangeLog	2015-03-12 00:29:45 UTC (rev 181417)
+++ trunk/LayoutTests/ChangeLog	2015-03-12 00:33:07 UTC (rev 181418)
@@ -1,3 +1,23 @@
+2015-03-11  Timothy Horton  timothy_hor...@apple.com
+
+attachment shouldn't use user-select: all
+https://bugs.webkit.org/show_bug.cgi?id=142453
+
+Reviewed by Darin Adler.
+
+* fast/attachment/attachment-select-on-click-inside-user-select-all.html: Added.
+* fast/attachment/attachment-select-on-click.html: Added.
+* platform/mac/fast/attachment/attachment-select-on-click-expected.png: Added.
+* platform/mac/fast/attachment/attachment-select-on-click-expected.txt: Added.
+* platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.png: Added.
+* platform/mac/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt: Added.
+* 

[webkit-changes] [181421] trunk

2015-03-11 Thread commit-queue
Title: [181421] trunk








Revision 181421
Author commit-qu...@webkit.org
Date 2015-03-11 18:03:43 -0700 (Wed, 11 Mar 2015)


Log Message
[Content Extensions] Add resource type and load type triggers.
https://bugs.webkit.org/show_bug.cgi?id=142422

Patch by Alex Christensen achristen...@webkit.org on 2015-03-11
Reviewed by Benjamin Poulain.

Source/WebCore:

New API tests.

* WebCore.xcodeproj/project.pbxproj:
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList):
* contentextensions/ContentExtensionParser.cpp:
(WebCore::ContentExtensions::getTypeFlags):
(WebCore::ContentExtensions::loadTrigger):
* contentextensions/ContentExtensionRule.h:
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForURL): Deleted.
* contentextensions/ContentExtensionsBackend.h:
* contentextensions/DFABytecode.h:
(WebCore::ContentExtensions::instructionSizeWithArguments):
* contentextensions/DFABytecodeCompiler.cpp:
(WebCore::ContentExtensions::DFABytecodeCompiler::emitAppendConditionalAction):
(WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):
* contentextensions/DFABytecodeCompiler.h:
* contentextensions/DFABytecodeInterpreter.cpp:
(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
* contentextensions/DFABytecodeInterpreter.h:
* loader/ResourceLoadInfo.cpp: Added.
(WebCore::toResourceType):
(WebCore::readResourceType):
(WebCore::readLoadType):
(WebCore::ResourceLoadInfo::isThirdParty):
(WebCore::ResourceLoadInfo::getResourceFlags):
* loader/ResourceLoadInfo.h: Added.
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestResource):
* page/UserContentController.cpp:
(WebCore::UserContentController::actionsForResourceLoad):
(WebCore::UserContentController::actionsForURL): Deleted.
* page/UserContentController.h:

Tools:

* TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
(TestWebKitAPI::testRequest):
(TestWebKitAPI::mainDocumentRequest):
(TestWebKitAPI::TEST_F):
(TestWebKitAPI::testURL): Deleted.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp
trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp
trunk/Source/WebCore/contentextensions/ContentExtensionRule.h
trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp
trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.h
trunk/Source/WebCore/contentextensions/DFABytecode.h
trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.cpp
trunk/Source/WebCore/contentextensions/DFABytecodeCompiler.h
trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.cpp
trunk/Source/WebCore/contentextensions/DFABytecodeInterpreter.h
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp
trunk/Source/WebCore/page/UserContentController.cpp
trunk/Source/WebCore/page/UserContentController.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp


Added Paths

trunk/Source/WebCore/loader/ResourceLoadInfo.cpp
trunk/Source/WebCore/loader/ResourceLoadInfo.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (181420 => 181421)

--- trunk/Source/WebCore/ChangeLog	2015-03-12 00:38:04 UTC (rev 181420)
+++ trunk/Source/WebCore/ChangeLog	2015-03-12 01:03:43 UTC (rev 181421)
@@ -1,3 +1,46 @@
+2015-03-11  Alex Christensen  achristen...@webkit.org
+
+[Content Extensions] Add resource type and load type triggers.
+https://bugs.webkit.org/show_bug.cgi?id=142422
+
+Reviewed by Benjamin Poulain.
+
+New API tests.
+
+* WebCore.xcodeproj/project.pbxproj:
+* contentextensions/ContentExtensionCompiler.cpp:
+(WebCore::ContentExtensions::compileRuleList):
+* contentextensions/ContentExtensionParser.cpp:
+(WebCore::ContentExtensions::getTypeFlags):
+(WebCore::ContentExtensions::loadTrigger):
+* contentextensions/ContentExtensionRule.h:
+* contentextensions/ContentExtensionsBackend.cpp:
+(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
+(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForURL): Deleted.
+* contentextensions/ContentExtensionsBackend.h:
+* contentextensions/DFABytecode.h:
+(WebCore::ContentExtensions::instructionSizeWithArguments):
+* contentextensions/DFABytecodeCompiler.cpp:
+(WebCore::ContentExtensions::DFABytecodeCompiler::emitAppendConditionalAction):
+(WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):
+* contentextensions/DFABytecodeCompiler.h:
+* contentextensions/DFABytecodeInterpreter.cpp:
+(WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
+* contentextensions/DFABytecodeInterpreter.h:
+* 

[webkit-changes] [181411] trunk/Source

2015-03-11 Thread ggaren
Title: [181411] trunk/Source








Revision 181411
Author gga...@apple.com
Date 2015-03-11 15:32:19 -0700 (Wed, 11 Mar 2015)


Log Message
Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth
https://bugs.webkit.org/show_bug.cgi?id=142593

Reviewed by Andreas Kling.

Adopt deprecatedReportExtraMemory as a short-term fix for runaway
memory growth in these cases where we have not adopted
reportExtraMemoryVisited.

Long-term, we should use reportExtraMemoryAllocated+reportExtraMemoryVisited.
That's tracked by https://bugs.webkit.org/show_bug.cgi?id=142595.

Source/_javascript_Core:

* API/JSBase.cpp:
(JSReportExtraMemoryCost):
* runtime/SparseArrayValueMap.cpp:
(JSC::SparseArrayValueMap::add):

Source/WebCore:

Using IOSDebug, I can see that the canvas stress test @ http://jsfiddle.net/fvyw4ba0/,
which used to keep  1000 1MB NonVolatile GPU allocations live, now keeps about 10 live.

* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::reportExtraMemoryAllocated):
* bindings/js/JSDocumentCustom.cpp:
(WebCore::toJS):
* bindings/js/JSImageDataCustom.cpp:
(WebCore::toJS):
* bindings/js/JSNodeListCustom.cpp:
(WebCore::createWrapper):
* dom/CollectionIndexCache.cpp:
(WebCore::reportExtraMemoryAllocatedForCollectionIndexCache):
* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::createImageBuffer):
* html/HTMLImageLoader.cpp:
(WebCore::HTMLImageLoader::imageChanged):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::dropProtection):

Modified Paths

trunk/Source/_javascript_Core/API/JSBase.cpp
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp
trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp
trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp
trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp
trunk/Source/WebCore/dom/CollectionIndexCache.cpp
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
trunk/Source/WebCore/html/HTMLImageLoader.cpp
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/xml/XMLHttpRequest.cpp




Diff

Modified: trunk/Source/_javascript_Core/API/JSBase.cpp (181410 => 181411)

--- trunk/Source/_javascript_Core/API/JSBase.cpp	2015-03-11 22:23:45 UTC (rev 181410)
+++ trunk/Source/_javascript_Core/API/JSBase.cpp	2015-03-11 22:32:19 UTC (rev 181411)
@@ -140,9 +140,7 @@
 ExecState* exec = toJS(ctx);
 JSLockHolder locker(exec);
 
-// FIXME: switch to deprecatedReportExtraMemory.
-// https://bugs.webkit.org/show_bug.cgi?id=142593
-exec-vm().heap.reportExtraMemoryAllocated(size);
+exec-vm().heap.deprecatedReportExtraMemory(size);
 }
 
 extern C JS_EXPORT void JSSynchronousGarbageCollectForDebugging(JSContextRef);


Modified: trunk/Source/_javascript_Core/ChangeLog (181410 => 181411)

--- trunk/Source/_javascript_Core/ChangeLog	2015-03-11 22:23:45 UTC (rev 181410)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-03-11 22:32:19 UTC (rev 181411)
@@ -1,5 +1,24 @@
 2015-03-11  Geoffrey Garen  gga...@apple.com
 
+Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth
+https://bugs.webkit.org/show_bug.cgi?id=142593
+
+Reviewed by Andreas Kling.
+
+Adopt deprecatedReportExtraMemory as a short-term fix for runaway
+memory growth in these cases where we have not adopted
+reportExtraMemoryVisited.
+
+Long-term, we should use reportExtraMemoryAllocated+reportExtraMemoryVisited.
+That's tracked by https://bugs.webkit.org/show_bug.cgi?id=142595.
+
+* API/JSBase.cpp:
+(JSReportExtraMemoryCost):
+* runtime/SparseArrayValueMap.cpp:
+(JSC::SparseArrayValueMap::add):
+
+2015-03-11  Geoffrey Garen  gga...@apple.com
+
 Refactored the JSC::Heap extra cost API for clarity and to make some known bugs more obvious
 https://bugs.webkit.org/show_bug.cgi?id=142589
 


Modified: trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.cpp (181410 => 181411)

--- trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.cpp	2015-03-11 22:23:45 UTC (rev 181410)
+++ trunk/Source/_javascript_Core/runtime/SparseArrayValueMap.cpp	2015-03-11 22:32:19 UTC (rev 181411)
@@ -80,9 +80,9 @@
 AddResult result = m_map.add(i, entry);
 size_t capacity = m_map.capacity();
 if (capacity != m_reportedCapacity) {
-// FIXME: Switch to deprecatedReportExtraMemory, or adopt reportExtraMemoryVisited.
-// https://bugs.webkit.org/show_bug.cgi?id=142593
-Heap::heap(array)-reportExtraMemoryAllocated((capacity - m_reportedCapacity) * (sizeof(unsigned) + sizeof(WriteBarrierUnknown)));
+// FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
+// https://bugs.webkit.org/show_bug.cgi?id=142595
+

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

2015-03-11 Thread roger_fong
Title: [181413] trunk/Source/WebCore








Revision 181413
Author roger_f...@apple.com
Date 2015-03-11 16:28:36 -0700 (Wed, 11 Mar 2015)


Log Message
A number of minor edits to the media controls on OSX.
https://bugs.webkit.org/show_bug.cgi?id=142551.
rdar://problem/20114707
Reviewed by Darin Adler.
This covers a slew of minor edits to the new media controls. They are as follows.
Small vertical placements adjustments to inline control elements.
Make sure buttons have no focus outlines.
Expand height of mute box that triggers the volume panel appearing.
Turn all button colors into an slightly transparent white.
Center status display text in fullscreen mode.
Lower position of captions container in fullscreen mode.
Show the controls on when done loading of the video an status display is hidden.
* Modules/mediacontrols/mediaControlsApple.css:
(audio::-webkit-media-controls-panel):
(audio::-webkit-media-controls-panel button:focus):
(audio::-webkit-media-controls-rewind-button):
(audio::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-play-button.paused):
(audio::-webkit-media-controls-panel .mute-box):
(video::-webkit-media-controls-volume-max-button):
(audio::-webkit-media-controls-panel .volume-box):
(video::-webkit-media-controls-volume-min-button):
(audio::-webkit-media-controls-wireless-playback-picker-button):
(audio::-webkit-media-controls-toggle-closed-captions-button):
(audio::-webkit-media-controls-closed-captions-container li.selected:hover::before):
(audio::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-fullscreen-button.exit):
(audio::-webkit-media-controls-status-display):
(audio::-webkit-media-controls-time-remaining-display):
(video:-webkit-full-screen::-webkit-media-controls-panel .volume-box):
(video:-webkit-full-screen::-webkit-media-controls-volume-max-button):
(video:-webkit-full-screen::-webkit-media-controls-volume-min-button):
(video:-webkit-full-screen::-webkit-media-controls-play-button):
(video:-webkit-full-screen::-webkit-media-controls-play-button.paused):
(video:-webkit-full-screen::-webkit-media-controls-seek-back-button):
(video:-webkit-full-screen::-webkit-media-controls-seek-forward-button):
(video:-webkit-full-screen::-webkit-media-controls-status-display):
(video:-webkit-full-screen::-webkit-media-controls-closed-captions-container):
(audio::-webkit-media-controls-panel button:active): Deleted.
* Modules/mediacontrols/mediaControlsApple.js:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.css
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (181412 => 181413)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 22:52:43 UTC (rev 181412)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 23:28:36 UTC (rev 181413)
@@ -1,3 +1,50 @@
+2015-03-11  Roger Fong  roger_f...@apple.com
+
+A number of minor edits to the media controls on OSX.
+https://bugs.webkit.org/show_bug.cgi?id=142551.
+rdar://problem/20114707
+
+Reviewed by Darin Adler.
+
+This covers a slew of minor edits to the new media controls. They are as follows.
+Small vertical placements adjustments to inline control elements.
+Make sure buttons have no focus outlines.
+Expand height of mute box that triggers the volume panel appearing.
+Turn all button colors into an slightly transparent white.
+Center status display text in fullscreen mode.
+Lower position of captions container in fullscreen mode.
+Show the controls on when done loading of the video an status display is hidden.
+
+* Modules/mediacontrols/mediaControlsApple.css:
+(audio::-webkit-media-controls-panel):
+(audio::-webkit-media-controls-panel button:focus):
+(audio::-webkit-media-controls-rewind-button):
+(audio::-webkit-media-controls-play-button):
+(audio::-webkit-media-controls-play-button.paused):
+(audio::-webkit-media-controls-panel .mute-box):
+(video::-webkit-media-controls-volume-max-button):
+(audio::-webkit-media-controls-panel .volume-box):
+(video::-webkit-media-controls-volume-min-button):
+(audio::-webkit-media-controls-wireless-playback-picker-button):
+(audio::-webkit-media-controls-toggle-closed-captions-button):
+(audio::-webkit-media-controls-closed-captions-container li.selected:hover::before):
+(audio::-webkit-media-controls-fullscreen-button):
+(audio::-webkit-media-controls-fullscreen-button.exit):
+(audio::-webkit-media-controls-status-display):
+(audio::-webkit-media-controls-time-remaining-display):
+(video:-webkit-full-screen::-webkit-media-controls-panel .volume-box):
+(video:-webkit-full-screen::-webkit-media-controls-volume-max-button):
+(video:-webkit-full-screen::-webkit-media-controls-volume-min-button):
+  

[webkit-changes] [181417] tags/Safari-600.1.4.15.14/

2015-03-11 Thread bshafiei
Title: [181417] tags/Safari-600.1.4.15.14/








Revision 181417
Author bshaf...@apple.com
Date 2015-03-11 17:29:45 -0700 (Wed, 11 Mar 2015)


Log Message
New tag.

Added Paths

tags/Safari-600.1.4.15.14/




Diff

Property changes: tags/Safari-600.1.4.15.14



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




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


[webkit-changes] [181416] tags/Safari-600.5.12/

2015-03-11 Thread bshafiei
Title: [181416] tags/Safari-600.5.12/








Revision 181416
Author bshaf...@apple.com
Date 2015-03-11 17:28:27 -0700 (Wed, 11 Mar 2015)


Log Message
New tag.

Added Paths

tags/Safari-600.5.12/




Diff

Property changes: tags/Safari-600.5.12



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




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


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

2015-03-11 Thread timothy_horton
Title: [181420] trunk/Source/WebCore








Revision 181420
Author timothy_hor...@apple.com
Date 2015-03-11 17:38:04 -0700 (Wed, 11 Mar 2015)


Log Message
Fix the build.

* page/EventHandler.cpp:
(WebCore::EventHandler::selectClosestWordFromHitTestResult):
(WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent):
(WebCore::EventHandler::handleMousePressEventTripleClick):
(WebCore::EventHandler::handleMousePressEventSingleClick):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EventHandler.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (181419 => 181420)

--- trunk/Source/WebCore/ChangeLog	2015-03-12 00:35:28 UTC (rev 181419)
+++ trunk/Source/WebCore/ChangeLog	2015-03-12 00:38:04 UTC (rev 181420)
@@ -1,3 +1,13 @@
+2015-03-11  Tim Horton  timothy_hor...@apple.com
+
+Fix the build.
+
+* page/EventHandler.cpp:
+(WebCore::EventHandler::selectClosestWordFromHitTestResult):
+(WebCore::EventHandler::selectClosestWordOrLinkFromMouseEvent):
+(WebCore::EventHandler::handleMousePressEventTripleClick):
+(WebCore::EventHandler::handleMousePressEventSingleClick):
+
 2015-03-11  Timothy Horton  timothy_hor...@apple.com
 
 attachment shouldn't use user-select: all


Modified: trunk/Source/WebCore/page/EventHandler.cpp (181419 => 181420)

--- trunk/Source/WebCore/page/EventHandler.cpp	2015-03-12 00:35:28 UTC (rev 181419)
+++ trunk/Source/WebCore/page/EventHandler.cpp	2015-03-12 00:38:04 UTC (rev 181420)
@@ -583,7 +583,7 @@
 if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace  newSelection.isRange())
 newSelection.appendTrailingWhitespace();
 
-updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(targetNode, newSelection), WordGranularity);
+updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), WordGranularity);
 }
 }
 
@@ -609,7 +609,7 @@
 if (pos.isNotNull()  pos.deepEquivalent().deprecatedNode()-isDescendantOf(URLElement))
 newSelection = VisibleSelection::selectionFromContentsOfNode(URLElement);
 
-updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(targetNode, newSelection), WordGranularity);
+updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), WordGranularity);
 }
 }
 
@@ -647,7 +647,7 @@
 newSelection.expandUsingGranularity(ParagraphGranularity);
 }
 
-return updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(targetNode, newSelection), ParagraphGranularity);
+return updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), ParagraphGranularity);
 }
 
 static int textDistance(const Position start, const Position end)
@@ -685,7 +685,7 @@
 TextGranularity granularity = CharacterGranularity;
 
 if (extendSelection  newSelection.isCaretOrRange()) {
-VisibleSelection selectionInUserSelectAll = expandSelectionToRespectSelectOnMouseDown(targetNode, VisibleSelection(pos));
+VisibleSelection selectionInUserSelectAll = expandSelectionToRespectSelectOnMouseDown(*targetNode, VisibleSelection(pos));
 if (selectionInUserSelectAll.isRange()) {
 if (comparePositions(selectionInUserSelectAll.start(), newSelection.start())  0)
 pos = selectionInUserSelectAll.start();
@@ -712,7 +712,7 @@
 newSelection.expandUsingGranularity(m_frame.selection().granularity());
 }
 } else
-newSelection = expandSelectionToRespectSelectOnMouseDown(targetNode, visiblePos);
+newSelection = expandSelectionToRespectSelectOnMouseDown(*targetNode, visiblePos);
 
 bool handled = updateSelectionForMouseDownDispatchingSelectStart(targetNode, newSelection, granularity);
 






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


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

2015-03-11 Thread commit-queue
Title: [181412] trunk/Source/WebCore








Revision 181412
Author commit-qu...@webkit.org
Date 2015-03-11 15:52:43 -0700 (Wed, 11 Mar 2015)


Log Message
Unreviewed, rolling out r179340 and r179344.
https://bugs.webkit.org/show_bug.cgi?id=142598

Caused images to stay alive forever when navigating away from
the page before they finish loading. (Requested by kling on
#webkit).

Reverted changesets:

CachedImage: ensure clients overrides imageChanged instead of
notifyFinished
https://bugs.webkit.org/show_bug.cgi?id=140722
http://trac.webkit.org/changeset/179340

HTMLImageLoader: fix build failure on assert condition after
r179340
https://bugs.webkit.org/show_bug.cgi?id=140722
http://trac.webkit.org/changeset/179344

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLImageLoader.cpp
trunk/Source/WebCore/html/HTMLImageLoader.h
trunk/Source/WebCore/loader/ImageLoader.cpp
trunk/Source/WebCore/loader/ImageLoader.h
trunk/Source/WebCore/loader/cache/CachedImage.cpp
trunk/Source/WebCore/loader/cache/CachedImageClient.h
trunk/Source/WebCore/rendering/RenderImage.cpp
trunk/Source/WebCore/rendering/RenderImage.h
trunk/Source/WebCore/svg/SVGFEImageElement.cpp
trunk/Source/WebCore/svg/SVGFEImageElement.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (181411 => 181412)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 22:32:19 UTC (rev 181411)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 22:52:43 UTC (rev 181412)
@@ -1,3 +1,24 @@
+2015-03-11  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r179340 and r179344.
+https://bugs.webkit.org/show_bug.cgi?id=142598
+
+Caused images to stay alive forever when navigating away from
+the page before they finish loading. (Requested by kling on
+#webkit).
+
+Reverted changesets:
+
+CachedImage: ensure clients overrides imageChanged instead of
+notifyFinished
+https://bugs.webkit.org/show_bug.cgi?id=140722
+http://trac.webkit.org/changeset/179340
+
+HTMLImageLoader: fix build failure on assert condition after
+r179340
+https://bugs.webkit.org/show_bug.cgi?id=140722
+http://trac.webkit.org/changeset/179344
+
 2015-03-11  Geoffrey Garen  gga...@apple.com
 
 Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth


Modified: trunk/Source/WebCore/html/HTMLImageLoader.cpp (181411 => 181412)

--- trunk/Source/WebCore/html/HTMLImageLoader.cpp	2015-03-11 22:32:19 UTC (rev 181411)
+++ trunk/Source/WebCore/html/HTMLImageLoader.cpp	2015-03-11 22:52:43 UTC (rev 181412)
@@ -73,15 +73,12 @@
 return stripLeadingAndTrailingHTMLSpaces(attr);
 }
 
-void HTMLImageLoader::imageChanged(CachedImage* cachedImage, const IntRect*)
+void HTMLImageLoader::notifyFinished(CachedResource*)
 {
-ASSERT(cachedImage == image());
+CachedImage* cachedImage = image();
 
-if (!cachedImage-isLoaded())
-return;
-
 RefElement protect(element());
-ImageLoader::imageChanged(cachedImage);
+ImageLoader::notifyFinished(cachedImage);
 
 bool loadError = cachedImage-errorOccurred() || cachedImage-response().httpStatusCode() = 400;
 if (!loadError) {


Modified: trunk/Source/WebCore/html/HTMLImageLoader.h (181411 => 181412)

--- trunk/Source/WebCore/html/HTMLImageLoader.h	2015-03-11 22:32:19 UTC (rev 181411)
+++ trunk/Source/WebCore/html/HTMLImageLoader.h	2015-03-11 22:52:43 UTC (rev 181412)
@@ -35,7 +35,7 @@
 virtual void dispatchLoadEvent() override;
 virtual String sourceURI(const AtomicString) const override;
 
-virtual void imageChanged(CachedImage*, const IntRect* = nullptr) override;
+virtual void notifyFinished(CachedResource*) override;
 };
 
 }


Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (181411 => 181412)

--- trunk/Source/WebCore/loader/ImageLoader.cpp	2015-03-11 22:32:19 UTC (rev 181411)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp	2015-03-11 22:52:43 UTC (rev 181412)
@@ -272,14 +272,11 @@
 updateFromElement();
 }
 
-void ImageLoader::imageChanged(CachedImage* cachedImage, const IntRect*)
+void ImageLoader::notifyFinished(CachedResource* resource)
 {
 ASSERT(m_failedLoadURL.isEmpty());
-ASSERT(cachedImage == m_image.get());
+ASSERT(resource == m_image.get());
 
-if (!cachedImage-isLoaded())
-return;
-
 m_imageComplete = true;
 if (!hasPendingBeforeLoadEvent())
 updateRenderer();
@@ -289,7 +286,7 @@
 
 if (element().fastHasAttribute(HTMLNames::crossoriginAttr)
  !element().document().securityOrigin()-canRequest(image()-response().url())
- !cachedImage-passesAccessControlCheck(element().document().securityOrigin())) {
+ !resource-passesAccessControlCheck(element().document().securityOrigin())) {
 
 setImageWithoutConsideringPendingLoadEvent(0);
 
@@ -307,7 +304,7 @@
 return;
 }
 
-if (cachedImage-wasCanceled()) {
+if (resource-wasCanceled()) {
 

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

2015-03-11 Thread ggaren
Title: [181415] trunk/Source/WebCore








Revision 181415
Author gga...@apple.com
Date 2015-03-11 17:15:21 -0700 (Wed, 11 Mar 2015)


Log Message
Users of Heap::deprecatedReportExtraMemory should switch to reportExtraMemoryAllocated+reportExtraMemoryVisited
https://bugs.webkit.org/show_bug.cgi?id=142595

Reviewed by Andreas Kling.

Fixed this bug for canvas.

* html/HTMLCanvasElement.cpp:
(WebCore::HTMLCanvasElement::memoryCost): Factored out the helper function
required by our IDL generator.

(WebCore::HTMLCanvasElement::createImageBuffer): Use
reportExtraMemoryAllocated.

* html/HTMLCanvasElement.h:

* html/HTMLCanvasElement.idl: Adopt the IDL for reporting cost in the
right way during GC. This will match our reportExtraMemoryAllocated
with a reportExtraMemoryVisited during GC.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLCanvasElement.cpp
trunk/Source/WebCore/html/HTMLCanvasElement.h
trunk/Source/WebCore/html/HTMLCanvasElement.idl




Diff

Modified: trunk/Source/WebCore/ChangeLog (181414 => 181415)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 23:52:45 UTC (rev 181414)
+++ trunk/Source/WebCore/ChangeLog	2015-03-12 00:15:21 UTC (rev 181415)
@@ -1,3 +1,25 @@
+2015-03-11  Geoffrey Garen  gga...@apple.com
+
+Users of Heap::deprecatedReportExtraMemory should switch to reportExtraMemoryAllocated+reportExtraMemoryVisited
+https://bugs.webkit.org/show_bug.cgi?id=142595
+
+Reviewed by Andreas Kling.
+
+Fixed this bug for canvas.
+
+* html/HTMLCanvasElement.cpp:
+(WebCore::HTMLCanvasElement::memoryCost): Factored out the helper function
+required by our IDL generator.
+
+(WebCore::HTMLCanvasElement::createImageBuffer): Use
+reportExtraMemoryAllocated.
+
+* html/HTMLCanvasElement.h:
+
+* html/HTMLCanvasElement.idl: Adopt the IDL for reporting cost in the
+right way during GC. This will match our reportExtraMemoryAllocated
+with a reportExtraMemoryVisited during GC.
+
 2015-03-11  Roger Fong  roger_f...@apple.com
 
 A number of minor edits to the media controls on OSX.


Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (181414 => 181415)

--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2015-03-11 23:52:45 UTC (rev 181414)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp	2015-03-12 00:15:21 UTC (rev 181415)
@@ -538,6 +538,13 @@
 #endif
 }
 
+size_t HTMLCanvasElement::memoryCost() const
+{
+if (!m_imageBuffer)
+return 0;
+return 4 * m_imageBuffer-internalSize().width() * m_imageBuffer-internalSize().height();
+}
+
 void HTMLCanvasElement::createImageBuffer() const
 {
 ASSERT(!m_imageBuffer);
@@ -575,10 +582,7 @@
 m_contextStateSaver = std::make_uniqueGraphicsContextStateSaver(*m_imageBuffer-context());
 
 JSC::JSLockHolder lock(scriptExecutionContext()-vm());
-size_t numBytes = 4 * m_imageBuffer-internalSize().width() * m_imageBuffer-internalSize().height();
-// FIXME: Adopt reportExtraMemoryVisited, and switch to reportExtraMemoryAllocated.
-// https://bugs.webkit.org/show_bug.cgi?id=142595
-scriptExecutionContext()-vm().heap.deprecatedReportExtraMemory(numBytes);
+scriptExecutionContext()-vm().heap.reportExtraMemoryAllocated(memoryCost());
 
 #if USE(IOSURFACE_CANVAS_BACKING_STORE) || ENABLE(ACCELERATED_2D_CANVAS)
 if (m_context  m_context-is2d())


Modified: trunk/Source/WebCore/html/HTMLCanvasElement.h (181414 => 181415)

--- trunk/Source/WebCore/html/HTMLCanvasElement.h	2015-03-11 23:52:45 UTC (rev 181414)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.h	2015-03-12 00:15:21 UTC (rev 181415)
@@ -135,6 +135,8 @@
 
 bool shouldAccelerate(const IntSize) const;
 
+size_t memoryCost() const;
+
 private:
 HTMLCanvasElement(const QualifiedName, Document);
 


Modified: trunk/Source/WebCore/html/HTMLCanvasElement.idl (181414 => 181415)

--- trunk/Source/WebCore/html/HTMLCanvasElement.idl	2015-03-11 23:52:45 UTC (rev 181414)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.idl	2015-03-12 00:15:21 UTC (rev 181415)
@@ -26,6 +26,7 @@
 
 [
 JSGenerateToNativeObject,
+ReportExtraMemoryCost
 ] interface HTMLCanvasElement : HTMLElement {
 
 attribute long width;






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


[webkit-changes] [181419] trunk/Source/JavaScriptCore

2015-03-11 Thread rniwa
Title: [181419] trunk/Source/_javascript_Core








Revision 181419
Author rn...@webkit.org
Date 2015-03-11 17:35:28 -0700 (Wed, 11 Mar 2015)


Log Message
static should not be a reserved keyword in non-strict mode even when ES6 class is enabled
https://bugs.webkit.org/show_bug.cgi?id=142600

Reviewed by Mark Lam.

Make static RESERVED_IF_STRICT and manually detect it in parseClass.

No new tests. This is already checked by js/reserved-words.html and js/keywords-and-reserved_words.html

* parser/Keywords.table:
* parser/Parser.cpp:
(JSC::ParserLexerType::parseClass):
* parser/ParserTokens.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/parser/Keywords.table
trunk/Source/_javascript_Core/parser/Parser.cpp
trunk/Source/_javascript_Core/parser/ParserTokens.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (181418 => 181419)

--- trunk/Source/_javascript_Core/ChangeLog	2015-03-12 00:33:07 UTC (rev 181418)
+++ trunk/Source/_javascript_Core/ChangeLog	2015-03-12 00:35:28 UTC (rev 181419)
@@ -1,3 +1,19 @@
+2015-03-11  Ryosuke Niwa  rn...@webkit.org
+
+static should not be a reserved keyword in non-strict mode even when ES6 class is enabled
+https://bugs.webkit.org/show_bug.cgi?id=142600
+
+Reviewed by Mark Lam.
+
+Make static RESERVED_IF_STRICT and manually detect it in parseClass.
+
+No new tests. This is already checked by js/reserved-words.html and js/keywords-and-reserved_words.html
+
+* parser/Keywords.table:
+* parser/Parser.cpp:
+(JSC::ParserLexerType::parseClass):
+* parser/ParserTokens.h:
+
 2015-03-11  Geoffrey Garen  gga...@apple.com
 
 Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth


Modified: trunk/Source/_javascript_Core/parser/Keywords.table (181418 => 181419)

--- trunk/Source/_javascript_Core/parser/Keywords.table	2015-03-12 00:33:07 UTC (rev 181418)
+++ trunk/Source/_javascript_Core/parser/Keywords.table	2015-03-12 00:35:28 UTC (rev 181419)
@@ -30,7 +30,6 @@
 while		WHILE
 else		ELSE
 in		INTOKEN
-static		STATICTOKEN
 super		SUPER
 switch		SWITCH
 throw		THROW
@@ -52,6 +51,7 @@
 private RESERVED_IF_STRICT
 protected   RESERVED_IF_STRICT
 public  RESERVED_IF_STRICT
+static  RESERVED_IF_STRICT
 yield   RESERVED_IF_STRICT
 
 @end


Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (181418 => 181419)

--- trunk/Source/_javascript_Core/parser/Parser.cpp	2015-03-12 00:33:07 UTC (rev 181418)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp	2015-03-12 00:35:28 UTC (rev 181419)
@@ -1491,7 +1491,8 @@
 JSTokenLocation methodLocation(tokenLocation());
 unsigned methodStart = tokenStart();
 
-bool isStaticMethod = match(STATICTOKEN);
+// For backwards compatibility, static is a non-reserved keyword in non-strict mode.
+bool isStaticMethod = match(RESERVED_IF_STRICT)  *m_token.m_data.ident == m_vm-propertyNames-staticKeyword;
 if (isStaticMethod)
 next();
 


Modified: trunk/Source/_javascript_Core/parser/ParserTokens.h (181418 => 181419)

--- trunk/Source/_javascript_Core/parser/ParserTokens.h	2015-03-12 00:33:07 UTC (rev 181418)
+++ trunk/Source/_javascript_Core/parser/ParserTokens.h	2015-03-12 00:35:28 UTC (rev 181419)
@@ -78,12 +78,10 @@
 #if ENABLE(ES6_CLASS_SYNTAX)
 CLASSTOKEN,
 EXTENDS,
-STATICTOKEN,
 SUPER,
 #else
 CLASSTOKEN = RESERVED,
 EXTENDS = RESERVED,
-STATICTOKEN = RESERVED_IF_STRICT,
 SUPER = RESERVED,
 #endif
 OPENBRACE = 0,






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


[webkit-changes] [181370] releases/WebKitGTK/webkit-2.8

2015-03-11 Thread carlosgc
Title: [181370] releases/WebKitGTK/webkit-2.8








Revision 181370
Author carlo...@webkit.org
Date 2015-03-11 00:45:26 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181292 - REGRESSION(r176978): Inline-blocks with overflowing contents have ascents that are too large
https://bugs.webkit.org/show_bug.cgi?id=141783

Reviewed by David Hyatt.

Source/WebCore:

When we have an inline-block element, and we want to find its baseline (to lay out other
elements on the same line) we loop through the element's children and ask them what their
baselines are. The children use the location of the top of their last line to compute this
value. However, if the child has overflow-y, this might not be the correct calculation.

This behavior is in the spec: The baseline of an 'inline-block' is the baseline of its last
line box in the normal flow, unless it has either no in-flow line boxes or if its 'overflow'
property has a computed value other than 'visible', in which case the baseline is the bottom
margin edge.
-- http://www.w3.org/TR/CSS21/visudet.html#leading

However, we believe that a better policy is, when overflow is not visible, to place the
baseline at the bottom of the block if the contents overflowed in the Y direction, and to place
it at the bottom of the last line if the contents did not overflow in the Y direction. This is
partially consistent with previous behavior, and isn't too far from the spec to cause too many
breakages.

Test: fast/css/inline-block-tricky-baselines.html
  fast/text/baseline-inline-block.html

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::inlineBlockBaseline):

LayoutTests:

Update expected results.

* css3/flexbox/child-overflow-expected.html:
* css3/flexbox/child-overflow.html:
* fast/css/inline-block-tricky-baselines-expected.html: Added.
* fast/css/inline-block-tricky-baselines.html: Added.
* fast/forms/textfield-overflow-by-value-update-expected.txt:
* fast/text/baseline-inline-block-expected.html: Added.
* fast/text/baseline-inline-block.html: Added.
* platform/mac/fast/forms/search-vertical-alignment-expected.txt:

Modified Paths

releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog
releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow-expected.html
releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow.html
releases/WebKitGTK/webkit-2.8/LayoutTests/fast/forms/textfield-overflow-by-value-update-expected.txt
releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac/fast/forms/search-vertical-alignment-expected.txt
releases/WebKitGTK/webkit-2.8/LayoutTests/platform/mac-mavericks/fast/forms/search-vertical-alignment-expected.txt
releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlockFlow.cpp


Added Paths

releases/WebKitGTK/webkit-2.8/LayoutTests/fast/css/inline-block-tricky-baselines-expected.html
releases/WebKitGTK/webkit-2.8/LayoutTests/fast/css/inline-block-tricky-baselines.html
releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-expected.html
releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block.html




Diff

Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (181369 => 181370)

--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog	2015-03-11 07:41:07 UTC (rev 181369)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog	2015-03-11 07:45:26 UTC (rev 181370)
@@ -1,3 +1,21 @@
+2015-03-09  Myles C. Maxfield  mmaxfi...@apple.com
+
+REGRESSION(r176978): Inline-blocks with overflowing contents have ascents that are too large
+https://bugs.webkit.org/show_bug.cgi?id=141783
+
+Reviewed by David Hyatt.
+
+Update expected results.
+
+* css3/flexbox/child-overflow-expected.html:
+* css3/flexbox/child-overflow.html:
+* fast/css/inline-block-tricky-baselines-expected.html: Added.
+* fast/css/inline-block-tricky-baselines.html: Added.
+* fast/forms/textfield-overflow-by-value-update-expected.txt:
+* fast/text/baseline-inline-block-expected.html: Added.
+* fast/text/baseline-inline-block.html: Added.
+* platform/mac/fast/forms/search-vertical-alignment-expected.txt:
+
 2015-03-06  Brent Fulgham  bfulg...@apple.com
 
 Setting scroll-snap-desination to (100% 100%) locks up WebKit


Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow-expected.html (181369 => 181370)

--- releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow-expected.html	2015-03-11 07:41:07 UTC (rev 181369)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow-expected.html	2015-03-11 07:45:26 UTC (rev 181370)
@@ -4,6 +4,7 @@
 style
 .container {
 display: inline-block;
+vertical-align: top;
 margin-right: 30px;
 width: 100px;
 height: 100px;


Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/css3/flexbox/child-overflow.html (181369 => 181370)

--- 

[webkit-changes] [181367] trunk

2015-03-11 Thread commit-queue
Title: [181367] trunk








Revision 181367
Author commit-qu...@webkit.org
Date 2015-03-10 23:11:10 -0700 (Tue, 10 Mar 2015)


Log Message
Web Inspector: CSS parser errors in the console should include column numbers
https://bugs.webkit.org/show_bug.cgi?id=114313

Patch by Joseph Pecoraro pecor...@apple.com on 2015-03-10
Reviewed by Benjamin Poulain.

Source/WebCore:

Test: inspector-protocol/console/warnings-errors.html

* css/CSSParser.h:
(WebCore::CSSParser::currentCharacterOffset):
Get the current character offset depending on the source type.
Add instance variables to track column position and start
line / column for inline stylesheets.

* css/CSSParser.cpp:
(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseSheet):
Initialize new instance variables.

(WebCore::CSSParser::currentLocation):
Update to include column information. Also, if we are on the first line
we may need to take into account a start column offset as well.

(WebCore::CSSParser::realLex):
When bumping the line number, reset the column offset for the next
line with the next character.

(WebCore::CSSParser::syntaxError):
(WebCore::CSSParser::logError):
Include column information.

* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::parseAuthorStyleSheet):
(WebCore::StyleSheetContents::parseString):
(WebCore::StyleSheetContents::parseStringAtLineAndColumn):
Include column information.

* css/StyleSheetContents.h:
* dom/InlineStyleSheetOwner.cpp:
(WebCore::InlineStyleSheetOwner::InlineStyleSheetOwner):
(WebCore::InlineStyleSheetOwner::createSheet):
Save and use column information later on.

* dom/InlineStyleSheetOwner.h:
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::ensureSourceData):
Updated parser signature needs starting column and no longer has optional parameters.

Source/WebInspectorUI:

* UserInterface/Views/ConsoleMessageImpl.js:
(WebInspector.ConsoleMessageImpl.prototype._linkifyLocation):
Column numbers in console messages are also 1 based and should be adjusted.

LayoutTests:

Test errors in both external and inline CSS and Scripts to ensure they have
expected line:column information.

* inspector-protocol/console/warnings-errors-expected.txt: Added.
* inspector-protocol/console/warnings-errors.html: Added.
* inspector-protocol/resources/errors.css: Added.
* inspector-protocol/resources/errors.js: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSParser.h
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/css/StyleSheetContents.h
trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp
trunk/Source/WebCore/dom/InlineStyleSheetOwner.h
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js


Added Paths

trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt
trunk/LayoutTests/inspector-protocol/console/warnings-errors.html
trunk/LayoutTests/inspector-protocol/resources/errors.css
trunk/LayoutTests/inspector-protocol/resources/errors.js




Diff

Modified: trunk/LayoutTests/ChangeLog (181366 => 181367)

--- trunk/LayoutTests/ChangeLog	2015-03-11 05:56:24 UTC (rev 181366)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 06:11:10 UTC (rev 181367)
@@ -1,3 +1,18 @@
+2015-03-10  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: CSS parser errors in the console should include column numbers
+https://bugs.webkit.org/show_bug.cgi?id=114313
+
+Reviewed by Benjamin Poulain.
+
+Test errors in both external and inline CSS and Scripts to ensure they have
+expected line:column information.
+
+* inspector-protocol/console/warnings-errors-expected.txt: Added.
+* inspector-protocol/console/warnings-errors.html: Added.
+* inspector-protocol/resources/errors.css: Added.
+* inspector-protocol/resources/errors.js: Added.
+
 2015-03-10  Gyuyoung Kim  gyuyoung@samsung.com
 
 Unreviewed EFL gardening on 10th Mar.


Added: trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt (0 => 181367)

--- trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	(rev 0)
+++ trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-11 06:11:10 UTC (rev 181367)
@@ -0,0 +1,25 @@
+CONSOLE MESSAGE: line 1: error script
+CONSOLE MESSAGE: line 1: warn script
+CONSOLE MESSAGE: line 5: error script
+CONSOLE MESSAGE: line 6: warn script
+CONSOLE MESSAGE: line 15: TypeError: undefined is not an object (evaluating '[].x.x')
+CONSOLE MESSAGE: line 17: warn 1
+CONSOLE MESSAGE: line 17: error 1
+CONSOLE MESSAGE: line 18: error 2
+Tests that CSS/_javascript_ errors and warnings are sent to the console with line and column information.
+{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:5:20}

[webkit-changes] [181383] releases/WebKitGTK/webkit-2.8/Source

2015-03-11 Thread carlosgc
Title: [181383] releases/WebKitGTK/webkit-2.8/Source








Revision 181383
Author carlo...@webkit.org
Date 2015-03-11 03:49:16 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181326 - GCC: CRASH() should be annotated with NORETURN
https://bugs.webkit.org/show_bug.cgi?id=142524

Patch by Michael Catanzaro mcatanz...@igalia.com on 2015-03-10
Reviewed by Anders Carlsson.

Source/_javascript_Core:

Don't return from a NORETURN function. This used to avoid a warning from GCC, but now it
causes one.

* jsc.cpp:

Source/WTF:

Add COMPILER(GCC) to #ifdefs that already exist for Clang.

* wtf/Assertions.cpp:
* wtf/Assertions.h:

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp
releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog (181382 => 181383)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-03-11 10:49:16 UTC (rev 181383)
@@ -1,3 +1,15 @@
+2015-03-10  Michael Catanzaro  mcatanz...@igalia.com
+
+GCC: CRASH() should be annotated with NORETURN
+https://bugs.webkit.org/show_bug.cgi?id=142524
+
+Reviewed by Anders Carlsson.
+
+Don't return from a NORETURN function. This used to avoid a warning from GCC, but now it
+causes one.
+
+* jsc.cpp:
+
 2015-03-09  Mark Lam  mark@apple.com
 
 8-bit version of weakCompareAndSwap() can cause an infinite loop.


Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp (181382 => 181383)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp	2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jsc.cpp	2015-03-11 10:49:16 UTC (rev 181383)
@@ -363,9 +363,6 @@
 static NO_RETURN_DUE_TO_CRASH bool deleteProperty(JSCell*, ExecState*, PropertyName)
 {
 RELEASE_ASSERT_NOT_REACHED();
-#if COMPILER_QUIRK(CONSIDERS_UNREACHABLE_CODE)
-return true;
-#endif
 }
 
 unsigned getLength() const { return m_vector.size(); }


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog (181382 => 181383)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 10:49:16 UTC (rev 181383)
@@ -1,3 +1,15 @@
+2015-03-10  Michael Catanzaro  mcatanz...@igalia.com
+
+GCC: CRASH() should be annotated with NORETURN
+https://bugs.webkit.org/show_bug.cgi?id=142524
+
+Reviewed by Anders Carlsson.
+
+Add COMPILER(GCC) to #ifdefs that already exist for Clang.
+
+* wtf/Assertions.cpp:
+* wtf/Assertions.h:
+
 2015-03-10  Geoffrey Garen  gga...@apple.com
 
 bmalloc: tryFastMalloc shouldn't crash


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp (181382 => 181383)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp	2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.cpp	2015-03-11 10:49:16 UTC (rev 181383)
@@ -320,7 +320,7 @@
 WTFReportBacktrace();
 *(int *)(uintptr_t)0xbbadbeef = 0;
 // More reliable, but doesn't say BBADBEEF.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
 __builtin_trap();
 #else
 ((void(*)())0)();
@@ -334,7 +334,7 @@
 WTFReportBacktrace();
 *(int *)(uintptr_t)0xfbadbeef = 0;
 // More reliable, but doesn't say fbadbeef.
-#if COMPILER(CLANG)
+#if COMPILER(CLANG) || COMPILER(GCC)
 __builtin_trap();
 #else
 ((void(*)())0)();


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h (181382 => 181383)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h	2015-03-11 10:23:37 UTC (rev 181382)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Assertions.h	2015-03-11 10:49:16 UTC (rev 181383)
@@ -112,7 +112,7 @@
 
Signals are ignored by the crash reporter on OS X so we must do better.
 */
-#if COMPILER(CLANG) || COMPILER(MSVC)
+#if COMPILER(CLANG) || COMPILER(GCC) || COMPILER(MSVC)
 #define NO_RETURN_DUE_TO_CRASH NO_RETURN
 #else
 #define NO_RETURN_DUE_TO_CRASH






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


[webkit-changes] [181372] tags/Safari-601.1.22/

2015-03-11 Thread bshafiei
Title: [181372] tags/Safari-601.1.22/








Revision 181372
Author bshaf...@apple.com
Date 2015-03-11 01:41:36 -0700 (Wed, 11 Mar 2015)


Log Message
New tag.

Added Paths

tags/Safari-601.1.22/




Diff

Property changes: tags/Safari-601.1.22



Added: svn:ignore
depcomp
compile
config.guess
GNUmakefile.in
config.sub
ltmain.sh
aconfig.h.in
autom4te.cache
missing
aclocal.m4
install-sh
autotoolsconfig.h.in
INSTALL
README
gtk-doc.make
out
Makefile.chromium
WebKitSupportLibrary.zip
WebKitBuild

Added: svn:mergeinfo




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


[webkit-changes] [181378] releases/WebKitGTK/webkit-2.8/Source/WebCore

2015-03-11 Thread carlosgc
Title: [181378] releases/WebKitGTK/webkit-2.8/Source/WebCore








Revision 181378
Author carlo...@webkit.org
Date 2015-03-11 03:19:01 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181320 - Shrink the CSSPropertyID enum type
https://bugs.webkit.org/show_bug.cgi?id=142456

Reviewed by Sam Weinig.

Specify uint16_t as the base type for the CSSPropertyID enum.
This is enough to cover all of the CSS properties (429 at this moment,
with static_assert covering future changes). It halves the enum type size,
from 4 bytes to 2, reducing the size of various CSSPropertyID containers.

No new tests -- no change in behavior.

* css/CSSPrimitiveValue.cpp:
(WebCore::propertyName): Remove the unnecessary propertyID  0 check.
* css/makeprop.pl:

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSPrimitiveValue.cpp
releases/WebKitGTK/webkit-2.8/Source/WebCore/css/makeprop.pl




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181377 => 181378)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:06:49 UTC (rev 181377)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:19:01 UTC (rev 181378)
@@ -1,3 +1,21 @@
+2015-03-10  Zan Dobersek  zdober...@igalia.com
+
+Shrink the CSSPropertyID enum type
+https://bugs.webkit.org/show_bug.cgi?id=142456
+
+Reviewed by Sam Weinig.
+
+Specify uint16_t as the base type for the CSSPropertyID enum.
+This is enough to cover all of the CSS properties (429 at this moment,
+with static_assert covering future changes). It halves the enum type size,
+from 4 bytes to 2, reducing the size of various CSSPropertyID containers.
+
+No new tests -- no change in behavior.
+
+* css/CSSPrimitiveValue.cpp:
+(WebCore::propertyName): Remove the unnecessary propertyID  0 check.
+* css/makeprop.pl:
+
 2015-03-09  Myles C. Maxfield  mmaxfi...@apple.com
 
 REGRESSION(r176978): Inline-blocks with overflowing contents have ascents that are too large


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSPrimitiveValue.cpp (181377 => 181378)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSPrimitiveValue.cpp	2015-03-11 10:06:49 UTC (rev 181377)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/css/CSSPrimitiveValue.cpp	2015-03-11 10:19:01 UTC (rev 181378)
@@ -220,9 +220,6 @@
 ASSERT_ARG(propertyID, propertyID = 0);
 ASSERT_ARG(propertyID, (propertyID = firstCSSProperty  propertyID  firstCSSProperty + numCSSProperties));
 
-if (propertyID  0)
-return nullAtom;
-
 return getPropertyNameAtomicString(propertyID);
 }
 


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/css/makeprop.pl (181377 => 181378)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/css/makeprop.pl	2015-03-11 10:06:49 UTC (rev 181377)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/css/makeprop.pl	2015-03-11 10:19:01 UTC (rev 181378)
@@ -132,6 +132,11 @@
 #endif
 
 namespace WebCore {
+
+// Using std::numeric_limitsuint16_t::max() here would be cleaner,
+// but is not possible due to missing constexpr support in MSVC 2013.
+static_assert(numCSSProperties + 1 = 65535, CSSPropertyID should fit into uint16_t.);
+
 EOF
 
 print GPERF const char* const propertyNameStrings[numCSSProperties] = {\n;
@@ -276,7 +281,7 @@
 
 namespace WebCore {
 
-enum CSSPropertyID {
+enum CSSPropertyID : uint16_t {
 CSSPropertyInvalid = 0,
 EOF
 






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


[webkit-changes] [181376] releases/WebKitGTK/webkit-2.8/Source/WTF

2015-03-11 Thread carlosgc
Title: [181376] releases/WebKitGTK/webkit-2.8/Source/WTF








Revision 181376
Author carlo...@webkit.org
Date 2015-03-11 02:38:16 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r180814 - Remove unused PossiblyNull
https://bugs.webkit.org/show_bug.cgi?id=142124

Reviewed by Andreas Kling.

* WTF.vcxproj/WTF.vcxproj: Removed the file.
* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
* WTF.xcodeproj/project.pbxproj: Ditto.
* wtf/CMakeLists.txt: Ditto.
* wtf/PossiblyNull.h: Removed.

* wtf/FastMalloc.h: Moved everything to the left.
Moved member functions out of the TryMallocReturnValue class definition.
(WTF::TryMallocReturnValue::operator PossiblyNullT): Deleted.
(WTF::TryMallocReturnValue::getValue): Marked inline, changed to work
only with pointer types, not arbitrary non-pointer types.

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj
releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.xcodeproj/project.pbxproj
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/CMakeLists.txt
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.h


Removed Paths

releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/PossiblyNull.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog (181375 => 181376)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 09:11:05 UTC (rev 181375)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 09:38:16 UTC (rev 181376)
@@ -1,3 +1,22 @@
+2015-02-27  Darin Adler  da...@apple.com
+
+Remove unused PossiblyNull
+https://bugs.webkit.org/show_bug.cgi?id=142124
+
+Reviewed by Andreas Kling.
+
+* WTF.vcxproj/WTF.vcxproj: Removed the file.
+* WTF.vcxproj/WTF.vcxproj.filters: Ditto.
+* WTF.xcodeproj/project.pbxproj: Ditto.
+* wtf/CMakeLists.txt: Ditto.
+* wtf/PossiblyNull.h: Removed.
+
+* wtf/FastMalloc.h: Moved everything to the left.
+Moved member functions out of the TryMallocReturnValue class definition.
+(WTF::TryMallocReturnValue::operator PossiblyNullT): Deleted.
+(WTF::TryMallocReturnValue::getValue): Marked inline, changed to work
+only with pointer types, not arbitrary non-pointer types.
+
 2015-03-09  Mark Lam  mark@apple.com
 
 8-bit version of weakCompareAndSwap() can cause an infinite loop.


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj (181375 => 181376)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj	2015-03-11 09:11:05 UTC (rev 181375)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj	2015-03-11 09:38:16 UTC (rev 181376)
@@ -253,7 +253,6 @@
 ClInclude Include=..\wtf\PassRef.h /
 ClInclude Include=..\wtf\PassRefPtr.h /
 ClInclude Include=..\wtf\Platform.h /
-ClInclude Include=..\wtf\PossiblyNull.h /
 ClInclude Include=..\wtf\PrintStream.h /
 ClInclude Include=..\wtf\RAMSize.h /
 ClInclude Include=..\wtf\RandomNumber.h /
@@ -776,4 +775,4 @@
   Import Project=$(VCTargetsPath)\Microsoft.Cpp.targets /
   ImportGroup Label=ExtensionTargets
   /ImportGroup
-/Project
\ No newline at end of file
+/Project


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (181375 => 181376)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters	2015-03-11 09:11:05 UTC (rev 181375)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters	2015-03-11 09:38:16 UTC (rev 181376)
@@ -567,9 +567,6 @@
 ClInclude Include=..\wtf\Platform.h
   Filterwtf/Filter
 /ClInclude
-ClInclude Include=..\wtf\PossiblyNull.h
-  Filterwtf/Filter
-/ClInclude
 ClInclude Include=..\wtf\PrintStream.h
   Filterwtf/Filter
 /ClInclude
@@ -733,4 +730,4 @@
 None Include=WTFPostBuild.cmd /
 None Include=WTFPreBuild.cmd /
   /ItemGroup
-/Project
\ No newline at end of file
+/Project


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.xcodeproj/project.pbxproj (181375 => 181376)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.xcodeproj/project.pbxproj	2015-03-11 09:11:05 UTC (rev 181375)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/WTF.xcodeproj/project.pbxproj	2015-03-11 09:38:16 UTC (rev 181376)
@@ -199,7 +199,6 @@
 		A8A47408151A825B004123FF /* ParallelJobsLibdispatch.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472E9151A825B004123FF /* ParallelJobsLibdispatch.h */; };
 		A8A4740B151A825B004123FF /* PassOwnPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472EC151A825B004123FF /* PassOwnPtr.h */; };
 		A8A4740C151A825B004123FF /* PassRefPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472ED151A825B004123FF /* PassRefPtr.h */; };
-		A8A4740F151A825B004123FF /* PossiblyNull.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A472F3151A825B004123FF /* PossiblyNull.h */; };
 		A8A47414151A825B004123FF /* 

[webkit-changes] [181384] releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore

2015-03-11 Thread carlosgc
Title: [181384] releases/WebKitGTK/webkit-2.8/Source/_javascript_Core








Revision 181384
Author carlo...@webkit.org
Date 2015-03-11 04:03:20 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181343 - Use std::numeric_limitsunsigned::max() instead of (unsigned)-1.
https://webkit.org/b/142539

Reviewed by Benjamin Poulain.

* jit/JIT.cpp:
(JSC::JIT::JIT):
(JSC::JIT::privateCompileMainPass):
(JSC::JIT::privateCompileSlowCases):
(JSC::JIT::privateCompile):
(JSC::JIT::privateCompileExceptionHandlers):
* jit/JITInlines.h:
(JSC::JIT::emitNakedCall):
(JSC::JIT::addSlowCase):
(JSC::JIT::addJump):
(JSC::JIT::emitJumpSlowToHot):
(JSC::JIT::emitGetVirtualRegister):
* jit/SlowPathCall.h:
(JSC::JITSlowPathCall::call):
* yarr/Yarr.h:

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/JIT.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/JITInlines.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/SlowPathCall.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/yarr/Yarr.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog (181383 => 181384)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-03-11 10:49:16 UTC (rev 181383)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog	2015-03-11 11:03:20 UTC (rev 181384)
@@ -1,3 +1,26 @@
+2015-03-10  Mark Lam  mark@apple.com
+
+Use std::numeric_limitsunsigned::max() instead of (unsigned)-1.
+https://webkit.org/b/142539
+
+Reviewed by Benjamin Poulain.
+
+* jit/JIT.cpp:
+(JSC::JIT::JIT):
+(JSC::JIT::privateCompileMainPass):
+(JSC::JIT::privateCompileSlowCases):
+(JSC::JIT::privateCompile):
+(JSC::JIT::privateCompileExceptionHandlers):
+* jit/JITInlines.h:
+(JSC::JIT::emitNakedCall):
+(JSC::JIT::addSlowCase):
+(JSC::JIT::addJump):
+(JSC::JIT::emitJumpSlowToHot):
+(JSC::JIT::emitGetVirtualRegister):
+* jit/SlowPathCall.h:
+(JSC::JITSlowPathCall::call):
+* yarr/Yarr.h:
+
 2015-03-10  Michael Catanzaro  mcatanz...@igalia.com
 
 GCC: CRASH() should be annotated with NORETURN


Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/JIT.cpp (181383 => 181384)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/JIT.cpp	2015-03-11 10:49:16 UTC (rev 181383)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/jit/JIT.cpp	2015-03-11 11:03:20 UTC (rev 181384)
@@ -75,7 +75,7 @@
 : JSInterfaceJIT(vm, codeBlock)
 , m_interpreter(vm-interpreter)
 , m_labels(codeBlock ? codeBlock-numberOfInstructions() : 0)
-, m_bytecodeOffset((unsigned)-1)
+, m_bytecodeOffset(std::numeric_limitsunsigned::max())
 , m_getByIdIndex(UINT_MAX)
 , m_putByIdIndex(UINT_MAX)
 , m_byValInstructionIndex(UINT_MAX)
@@ -317,7 +317,7 @@
 
 #ifndef NDEBUG
 // Reset this, in order to guard its use with ASSERTs.
-m_bytecodeOffset = (unsigned)-1;
+m_bytecodeOffset = std::numeric_limitsunsigned::max();
 #endif
 }
 
@@ -451,7 +451,7 @@
 
 #ifndef NDEBUG
 // Reset this, in order to guard its use with ASSERTs.
-m_bytecodeOffset = (unsigned)-1;
+m_bytecodeOffset = std::numeric_limitsunsigned::max();
 #endif
 }
 
@@ -524,7 +524,7 @@
 #endif
 
 if (m_codeBlock-codeType() == FunctionCode) {
-ASSERT(m_bytecodeOffset == (unsigned)-1);
+ASSERT(m_bytecodeOffset == std::numeric_limitsunsigned::max());
 if (shouldEmitProfiling()) {
 for (int argument = 0; argument  m_codeBlock-numParameters(); ++argument) {
 // If this is a constructor, then we want to put in a dummy profiling site (to
@@ -593,7 +593,7 @@
 emitNakedCall(m_vm-getCTIStub(arityFixupGenerator).code());
 
 #if !ASSERT_DISABLED
-m_bytecodeOffset = (unsigned)-1; // Reset this, in order to guard its use with ASSERTs.
+m_bytecodeOffset = std::numeric_limitsunsigned::max(); // Reset this, in order to guard its use with ASSERTs.
 #endif
 
 jump(beginLabel);
@@ -725,7 +725,7 @@
 poke(GPRInfo::argumentGPR0);
 poke(GPRInfo::argumentGPR1, 1);
 #endif
-m_calls.append(CallRecord(call(), (unsigned)-1, FunctionPtr(lookupExceptionHandlerFromCallerFrame).value()));
+m_calls.append(CallRecord(call(), std::numeric_limitsunsigned::max(), FunctionPtr(lookupExceptionHandlerFromCallerFrame).value()));
 jumpToExceptionHandler();
 }
 
@@ -741,7 +741,7 @@
 poke(GPRInfo::argumentGPR0);
 poke(GPRInfo::argumentGPR1, 1);
 #endif
-m_calls.append(CallRecord(call(), (unsigned)-1, FunctionPtr(lookupExceptionHandler).value()));
+m_calls.append(CallRecord(call(), std::numeric_limitsunsigned::max(), FunctionPtr(lookupExceptionHandler).value()));
 jumpToExceptionHandler();
 }
 }


Modified: 

[webkit-changes] [181374] releases/WebKitGTK/webkit-2.8/Source

2015-03-11 Thread carlosgc
Title: [181374] releases/WebKitGTK/webkit-2.8/Source








Revision 181374
Author carlo...@webkit.org
Date 2015-03-11 01:45:33 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181297 - Stale entries in WeakGCMaps are keeping tons of WeakBlocks alive unnecessarily.
https://webkit.org/b/142115
rdar://problem/19992268

Reviewed by Geoffrey Garen.

Prune stale entries from WeakGCMaps as part of every full garbage collection.
This frees up tons of previously-stuck WeakBlocks that were only sitting around
with finalized handles waiting to die.

Note that WeakGCMaps register/unregister themselves with the GC heap in their
ctor/dtor, so creating one now requires passing the VM.

Average time spent in the PruningStaleEntriesFromWeakGCMaps GC phase appears
to be between 0.01ms and 0.3ms, though I've seen a few longer ones at ~1.2ms.
It seems somewhat excessive to do this on every Eden collection, so it's only
doing work in full collections for now.

Because the GC may now mutate WeakGCMap below object allocation, I've made it
so that the classic HashMap::add() optimization can't be used with WeakGCMap.
This caused intermittent test failures when originally landed due to having
an invalid iterator on the stack after add() inserted a new entry and we
proceeded to allocate the new object, triggering GC.

* API/JSWeakObjectMapRefInternal.h:
(OpaqueJSWeakObjectMap::create):
(OpaqueJSWeakObjectMap::OpaqueJSWeakObjectMap):
* API/JSWeakObjectMapRefPrivate.cpp:
* API/JSWrapperMap.mm:
(-[JSWrapperMap initWithContext:]):
(-[JSWrapperMap jsWrapperForObject:]): Pass VM to WeakGCMap constructor.

* _javascript_Core.xcodeproj/project.pbxproj: Add WeakGCMapInlines.h and make
it project-private so WebCore clients can access it.

* heap/Heap.cpp:
(JSC::Heap::collect):
(JSC::Heap::pruneStaleEntriesFromWeakGCMaps): Added a new GC phase for pruning
stale entries from WeakGCMaps. This is only executed during full collections.

* heap/Heap.h:
* heap/HeapInlines.h:
(JSC::Heap::registerWeakGCMap):
(JSC::Heap::unregisterWeakGCMap): Added a mechanism for WeakGCMaps to register
themselves with the Heap and provide a pruning callback.

* runtime/PrototypeMap.h:
(JSC::PrototypeMap::PrototypeMap):
* runtime/Structure.cpp:
(JSC::StructureTransitionTable::add): Pass VM to WeakGCMap constructor.

* runtime/JSCInlines.h: Add WeakGCMapInlines.h

* runtime/JSGlobalObject.cpp: Include WeakGCMapInlines.h so this builds.

* runtime/JSString.cpp:
(JSC::jsStringWithCacheSlowCase):
* runtime/PrototypeMap.cpp:
(JSC::PrototypeMap::addPrototype):
(JSC::PrototypeMap::emptyObjectStructureForPrototype): Remove HashMap add()
optimization since it's not safe in the GC-managed WeakGCMap world.

* runtime/VM.cpp:
(JSC::VM::VM): Pass VM to WeakGCMap constructor.

* runtime/WeakGCMap.h:
(JSC::WeakGCMap::set):
(JSC::WeakGCMap::add):
(JSC::WeakGCMap::WeakGCMap): Deleted.
(JSC::WeakGCMap::gcMap): Deleted.
(JSC::WeakGCMap::gcMapIfNeeded): Deleted.
* runtime/WeakGCMapInlines.h: Added.
(JSC::WeakGCMap::WeakGCMap):
(JSC::WeakGCMap::~WeakGCMap):
(JSC::WeakGCMap::pruneStaleEntries): Moved ctor, dtor and pruning callback
to WeakGCMapInlines.h to fix interdependent header issues. Removed code that
prunes WeakGCMap at certain growth milestones and instead rely on the GC
callback for housekeeping.

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/JSWeakObjectMapRefInternal.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/JSWeakObjectMapRefPrivate.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/heap/Heap.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/heap/Heap.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/heap/HeapInlines.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/JSCInlines.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/JSGlobalObject.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/JSString.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/PrototypeMap.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/PrototypeMap.h
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/Structure.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/VM.cpp
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/WeakGCMap.h
releases/WebKitGTK/webkit-2.8/Source/WebCore/bindings/js/ScriptCachedFrameData.cpp


Added Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/runtime/WeakGCMapInlines.h
releases/WebKitGTK/webkit-2.8/Source/WebCore/ForwardingHeaders/runtime/WeakGCMapInlines.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/JSWeakObjectMapRefInternal.h (181373 => 181374)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/JSWeakObjectMapRefInternal.h	2015-03-11 08:44:12 UTC (rev 181373)
+++ 

[webkit-changes] [181377] releases/WebKitGTK/webkit-2.8/Source

2015-03-11 Thread carlosgc
Title: [181377] releases/WebKitGTK/webkit-2.8/Source








Revision 181377
Author carlo...@webkit.org
Date 2015-03-11 03:06:49 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181329 - bmalloc: tryFastMalloc shouldn't crash
https://bugs.webkit.org/show_bug.cgi?id=142443

Reviewed by Darin Adler.

Source/bmalloc:

Added support for tryMalloc.

We assume that non-x-large allocations always succeed, and we crash
otherwise, since normal allocation failure will just cause the next
non-try allocation or internal metadata allocation to fail, and it's
hard and not really useful to keep limping along after that. But
extra-large allocations can meaningfully fail, and we can recover.

* bmalloc/Heap.cpp:
(bmalloc::Heap::allocateXLarge):
(bmalloc::Heap::tryAllocateXLarge):
* bmalloc/Heap.h: Added support for non-crashy x-large allocation.

* bmalloc/VMAllocate.h:
(bmalloc::tryVMAllocate):
(bmalloc::vmAllocate): Added support for non-crashy VM allocation.

* bmalloc/bmalloc.h:
(bmalloc::api::tryMalloc):
(bmalloc::api::realloc):
(bmalloc::api::free): Tried to clarify our behavior with some comments.
Unfortunately, calling what we do malloc is still not quite right, since
malloc returns null on failure and we don't.

Source/WTF:

* wtf/FastMalloc.cpp:
(WTF::fastMalloc):
(WTF::fastRealloc):
(WTF::fastAlignedMalloc): Don't check for null. bmalloc automatically
crashes on allocation failure, and we'd rather not pay for an extra check.

(WTF::tryFastMalloc): Added an opt-out API to return null rather than
crashing, since some clients need this.

(WTF::tryFastRealloc): Deleted. Unused.

* wtf/FastMalloc.h:

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.cpp
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.h
releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.cpp
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.h
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Cache.cpp
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Cache.h
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Heap.cpp
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Heap.h
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/VMAllocate.h
releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/bmalloc.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog (181376 => 181377)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 09:38:16 UTC (rev 181376)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog	2015-03-11 10:06:49 UTC (rev 181377)
@@ -1,3 +1,54 @@
+2015-03-10  Geoffrey Garen  gga...@apple.com
+
+bmalloc: tryFastMalloc shouldn't crash
+https://bugs.webkit.org/show_bug.cgi?id=142443
+
+Reviewed by Sam Weinig.
+
+Rolling back in r181307 with a check for whether bmalloc is enabled, to
+avoid crashes when running with ASan and GuardMalloc.
+
+* wtf/FastMalloc.cpp:
+(WTF::fastMalloc):
+(WTF::fastRealloc):
+(WTF::fastAlignedMalloc):
+(WTF::tryFastMalloc):
+(WTF::tryFastRealloc): Deleted.
+* wtf/FastMalloc.h:
+
+2015-03-09  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r181307.
+https://bugs.webkit.org/show_bug.cgi?id=142525
+
+Broke ASan tests (Requested by ap on #webkit).
+
+Reverted changeset:
+
+bmalloc: tryFastMalloc shouldn't crash
+https://bugs.webkit.org/show_bug.cgi?id=142443
+http://trac.webkit.org/changeset/181307
+
+2015-03-09  Geoffrey Garen  gga...@apple.com
+
+bmalloc: tryFastMalloc shouldn't crash
+https://bugs.webkit.org/show_bug.cgi?id=142443
+
+Reviewed by Darin Adler.
+
+* wtf/FastMalloc.cpp:
+(WTF::fastMalloc):
+(WTF::fastRealloc):
+(WTF::fastAlignedMalloc): Don't check for null. bmalloc automatically
+crashes on allocation failure, and we'd rather not pay for an extra check.
+
+(WTF::tryFastMalloc): Added an opt-out API to return null rather than
+crashing, since some clients need this.
+
+(WTF::tryFastRealloc): Deleted. Unused.
+
+* wtf/FastMalloc.h:
+
 2015-02-27  Darin Adler  da...@apple.com
 
 Remove unused PossiblyNull


Modified: releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.cpp (181376 => 181377)

--- releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.cpp	2015-03-11 09:38:16 UTC (rev 181376)
+++ releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/FastMalloc.cpp	2015-03-11 10:06:49 UTC (rev 181377)
@@ -222,11 +222,6 @@
 free(p);
 }
 
-TryMallocReturnValue tryFastRealloc(void* p, size_t n)
-{
-return realloc(p, n);
-}
-
 void* fastRealloc(void* p, size_t n)
 {
 void* result = realloc(p, n);
@@ -272,10 +267,7 @@
 
 void* fastMalloc(size_t size)
 {
-void* result = bmalloc::api::malloc(size);
-if (!result)
-CRASH();
-

[webkit-changes] [181373] trunk/Source

2015-03-11 Thread bshafiei
Title: [181373] trunk/Source








Revision 181373
Author bshaf...@apple.com
Date 2015-03-11 01:44:12 -0700 (Wed, 11 Mar 2015)


Log Message
Versioning.

Modified Paths

trunk/Source/_javascript_Core/Configurations/Version.xcconfig
trunk/Source/WebCore/Configurations/Version.xcconfig
trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
trunk/Source/WebKit/mac/Configurations/Version.xcconfig
trunk/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (181372 => 181373)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-11 08:41:36 UTC (rev 181372)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-11 08:44:12 UTC (rev 181373)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 23;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (181372 => 181373)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2015-03-11 08:41:36 UTC (rev 181372)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2015-03-11 08:44:12 UTC (rev 181373)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 23;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (181372 => 181373)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-11 08:41:36 UTC (rev 181372)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-11 08:44:12 UTC (rev 181373)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 23;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (181372 => 181373)

--- trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-11 08:41:36 UTC (rev 181372)
+++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-11 08:44:12 UTC (rev 181373)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 23;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (181372 => 181373)

--- trunk/Source/WebKit2/Configurations/Version.xcconfig	2015-03-11 08:41:36 UTC (rev 181372)
+++ trunk/Source/WebKit2/Configurations/Version.xcconfig	2015-03-11 08:44:12 UTC (rev 181373)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 601;
 MINOR_VERSION = 1;
-TINY_VERSION = 22;
+TINY_VERSION = 23;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






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


[webkit-changes] [181382] releases/WebKitGTK/webkit-2.8/Source/WebKit2

2015-03-11 Thread carlosgc
Title: [181382] releases/WebKitGTK/webkit-2.8/Source/WebKit2








Revision 181382
Author carlo...@webkit.org
Date 2015-03-11 03:23:37 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181324 - [GTK] Contents not shown when entering AC mode unless the window is resized
https://bugs.webkit.org/show_bug.cgi?id=142347

Reviewed by Žan Doberšek.

The problem is once again that we are now creating the redirected
X window in realize method. When entering AC mode we resize the
redirected window to the drawing area size. Since the size hasn't
changed from the drawing area point of view, the web process is
not notified. The WebProcess always uses the window size, instead
of the root layer size, to make sure it's in sync, see the comment
in LayerTreeHostGtk::compositeLayersToContext(). So, we need to
enforce a resize when we change the size of the redirected window
when entering AC mode.

* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseEnterAcceleratedCompositingMode):
* UIProcess/DrawingAreaProxyImpl.h:
(WebKit::DrawingAreaProxyImpl::forceResize):

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181381 => 181382)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-03-11 10:22:13 UTC (rev 181381)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-03-11 10:23:37 UTC (rev 181382)
@@ -1,3 +1,25 @@
+2015-03-10  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] Contents not shown when entering AC mode unless the window is resized
+https://bugs.webkit.org/show_bug.cgi?id=142347
+
+Reviewed by Žan Doberšek.
+
+The problem is once again that we are now creating the redirected
+X window in realize method. When entering AC mode we resize the
+redirected window to the drawing area size. Since the size hasn't
+changed from the drawing area point of view, the web process is
+not notified. The WebProcess always uses the window size, instead
+of the root layer size, to make sure it's in sync, see the comment
+in LayerTreeHostGtk::compositeLayersToContext(). So, we need to
+enforce a resize when we change the size of the redirected window
+when entering AC mode.
+
+* UIProcess/API/gtk/WebKitWebViewBase.cpp:
+(webkitWebViewBaseEnterAcceleratedCompositingMode):
+* UIProcess/DrawingAreaProxyImpl.h:
+(WebKit::DrawingAreaProxyImpl::forceResize):
+
 2015-03-09  Geoffrey Garen  gga...@apple.com
 
 bmalloc: tryFastMalloc shouldn't crash


Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (181381 => 181382)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2015-03-11 10:22:13 UTC (rev 181381)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp	2015-03-11 10:23:37 UTC (rev 181382)
@@ -1318,7 +1318,10 @@
 DrawingAreaProxyImpl* drawingArea = static_castDrawingAreaProxyImpl*(priv-pageProxy-drawingArea());
 if (!drawingArea)
 return;
+
 priv-redirectedWindow-resize(drawingArea-size());
+// Force a resize to ensure the new redirected window size is used by the WebProcess.
+drawingArea-forceResize();
 #else
 UNUSED_PARAM(webkitWebViewBase);
 #endif


Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (181381 => 181382)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h	2015-03-11 10:22:13 UTC (rev 181381)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h	2015-03-11 10:23:37 UTC (rev 181382)
@@ -52,6 +52,8 @@
 void setNativeSurfaceHandleForCompositing(uint64_t);
 #endif
 
+void forceResize() { sizeDidChange(); }
+
 private:
 // DrawingAreaProxy
 virtual void sizeDidChange();






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


[webkit-changes] [181375] releases/WebKitGTK/webkit-2.8/Source

2015-03-11 Thread carlosgc
Title: [181375] releases/WebKitGTK/webkit-2.8/Source








Revision 181375
Author carlo...@webkit.org
Date 2015-03-11 02:11:05 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181305 - 8-bit version of weakCompareAndSwap() can cause an infinite loop.
https://webkit.org/b/142513

Reviewed by Filip Pizlo.

Source/_javascript_Core:

Added a test that exercises the 8-bit CAS from multiple threads.  The threads
will contend to set bits in a large array of bytes using the CAS function.

* API/tests/CompareAndSwapTest.cpp: Added.
(Bitmap::Bitmap):
(Bitmap::numBits):
(Bitmap::clearAll):
(Bitmap::concurrentTestAndSet):
(setBitThreadFunc):
(testCompareAndSwap):
* API/tests/testapi.c:
(main):
* _javascript_Core.vcxproj/testapi/testapi.vcxproj:
* _javascript_Core.vcxproj/testapi/testapi.vcxproj.filters:
* _javascript_Core.xcodeproj/project.pbxproj:

Source/WTF:

Presently, Bitmap::concurrentTestAndSet() uses the 8-bit version of
weakCompareAndSwap() (which compares and swaps an uint8_t value).
Bitmap::concurrentTestAndSet() has a loop that checks if a bit in the
byte of interest has been set.  If not, it will call the 8-bit CAS
function to set the bit.

Under the covers, for ARM, the 8-bit CAS function actually works with a
32-bit CAS.  The 8-bit CAS will first fetch the 32-bit value in memory
that should contain the 8-bit value, and check if it contains the
expected byte.  If the value in memory doesn't have the expected byte,
it will return early to its caller.  The expectation is that the caller
will reload the byte from memory and call the 8-bit CAS again.

Unfortunately, this code path that returns early does not have a
compiler fence.  Without a compiler fence, the C++ compiler can
optimize away the reloading of the expected byte value, leaving it
unchanged.  As a result, we'll have a infinite loop here that checks a
value that will never change, and the loop will not terminate until the
value changes.

The fix is to eliminate the early return check in the 8-bit CAS, and
have it always call down to the 32-bit CAS.  The 32-bit CAS has a
compiler fence which will prevent this issue.

* wtf/Atomics.h:
(WTF::weakCompareAndSwap):

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/tests/testapi.c
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/_javascript_Core.vcxproj/testapi/testapi.vcxproj.filters
releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
releases/WebKitGTK/webkit-2.8/Source/WTF/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WTF/wtf/Atomics.h


Added Paths

releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/tests/CompareAndSwapTest.cpp




Diff

Added: releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/tests/CompareAndSwapTest.cpp (0 => 181375)

--- releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/tests/CompareAndSwapTest.cpp	(rev 0)
+++ releases/WebKitGTK/webkit-2.8/Source/_javascript_Core/API/tests/CompareAndSwapTest.cpp	2015-03-11 09:11:05 UTC (rev 181375)
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include config.h
+
+#include stdio.h
+#include thread
+#include wtf/Atomics.h
+
+// Regression test for webkit.org/b/142513
+extern C void testCompareAndSwap();
+
+class Bitmap {
+public:
+Bitmap() { clearAll(); }
+
+inline void clearAll();
+inline bool concurrentTestAndSet(size_t n);
+inline size_t numBits() const { return words * wordSize; }
+
+private:
+static const 

[webkit-changes] [181379] releases/WebKitGTK/webkit-2.8

2015-03-11 Thread carlosgc
Title: [181379] releases/WebKitGTK/webkit-2.8








Revision 181379
Author carlo...@webkit.org
Date 2015-03-11 03:20:31 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181321 - [GTK] Add a configure option to build with OpenGL ES 2
https://bugs.webkit.org/show_bug.cgi?id=142498

Patch by Carlos Garcia Campos  cgar...@igalia.com and José Dapena Paz jdap...@igalia.com on 2015-03-10
Reviewed by Martin Robinson.

.:

Add ENABLE_GLES2 option. It's disabled by default, but if passed
GLES2 is required and OpenGL is not even searched. Otherwise we
search for OpenGL as usual, using it only if present.

* Source/cmake/OptionsGTK.cmake:

Source/WebCore:

Build GLES or GL specific files depending on the build options.

* PlatformGTK.cmake:

Modified Paths

releases/WebKitGTK/webkit-2.8/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake
releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake




Diff

Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181378 => 181379)

--- releases/WebKitGTK/webkit-2.8/ChangeLog	2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog	2015-03-11 10:20:31 UTC (rev 181379)
@@ -1,3 +1,16 @@
+2015-03-10  Carlos Garcia Campos  cgar...@igalia.com and José Dapena Paz  jdap...@igalia.com
+
+[GTK] Add a configure option to build with OpenGL ES 2
+https://bugs.webkit.org/show_bug.cgi?id=142498
+
+Reviewed by Martin Robinson.
+
+Add ENABLE_GLES2 option. It's disabled by default, but if passed
+GLES2 is required and OpenGL is not even searched. Otherwise we
+search for OpenGL as usual, using it only if present.
+
+* Source/cmake/OptionsGTK.cmake:
+
 2015-03-03  Carlos Garcia Campos  cgar...@igalia.com
 
 Unreviewed. Update OptionsGTK.cmake and NEWS for 2.7.91 release.


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181378 => 181379)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:20:31 UTC (rev 181379)
@@ -1,3 +1,14 @@
+2015-03-10  Carlos Garcia Campos  cgar...@igalia.com and José Dapena Paz  jdap...@igalia.com
+
+[GTK] Add a configure option to build with OpenGL ES 2
+https://bugs.webkit.org/show_bug.cgi?id=142498
+
+Reviewed by Martin Robinson.
+
+Build GLES or GL specific files depending on the build options.
+
+* PlatformGTK.cmake:
+
 2015-03-10  Zan Dobersek  zdober...@igalia.com
 
 Shrink the CSSPropertyID enum type


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake (181378 => 181379)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake	2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/PlatformGTK.cmake	2015-03-11 10:20:31 UTC (rev 181379)
@@ -65,7 +65,6 @@
 
 platform/graphics/GraphicsContext3DPrivate.cpp
 platform/graphics/ImageSource.cpp
-platform/graphics/OpenGLShims.cpp
 platform/graphics/WOFFFileFormat.cpp
 
 platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp
@@ -116,10 +115,7 @@
 platform/graphics/harfbuzz/HarfBuzzFaceCairo.cpp
 platform/graphics/harfbuzz/HarfBuzzShaper.cpp
 
-platform/graphics/opengl/Extensions3DOpenGL.cpp
 platform/graphics/opengl/Extensions3DOpenGLCommon.cpp
-platform/graphics/opengl/Extensions3DOpenGLES.cpp
-platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
 platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp
 platform/graphics/opengl/TemporaryOpenGLSetting.cpp
 
@@ -405,6 +401,22 @@
 )
 endif ()
 
+if (WTF_USE_OPENGL_ES_2)
+list(APPEND WebCore_SOURCES
+platform/graphics/opengl/Extensions3DOpenGLES.cpp
+platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
+)
+endif ()
+
+if (WTF_USE_OPENGL)
+list(APPEND WebCore_SOURCES
+platform/graphics/OpenGLShims.cpp
+
+platform/graphics/opengl/Extensions3DOpenGL.cpp
+platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+)
+endif ()
+
 if (ENABLE_PLUGIN_PROCESS_GTK2)
 # WebKitPluginProcess2 needs a version of WebCore compiled against GTK+2, so we've isolated all the GTK+
 # dependent files into a separate library which can be used to construct a GTK+2 WebCore


Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181378 => 181379)

--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake	2015-03-11 10:19:01 UTC (rev 181378)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake	2015-03-11 10:20:31 UTC (rev 181379)
@@ -16,6 +16,7 @@
 set(ENABLE_X11_TARGET ON CACHE BOOL Whether to enable support for the X11 windowing target.)
 set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL Whether to enable support for the Wayland windowing target.)
 set(ENABLE_INTROSPECTION ON CACHE BOOL Whether to enable GObject introspection.)
+set(ENABLE_GLES2 OFF 

[webkit-changes] [181380] releases/WebKitGTK/webkit-2.8/Source/WebCore

2015-03-11 Thread carlosgc
Title: [181380] releases/WebKitGTK/webkit-2.8/Source/WebCore








Revision 181380
Author carlo...@webkit.org
Date 2015-03-11 03:21:25 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181322 - Unreviewed. Fix GTK+ build with OpenGL ES 2 enabled.

Remove USE(OPENGL) ifdef from GLContext.cpp, since there's nothing
specific to OpenGL in that file, and everything depending on
configure options is already protected by USE(GLX) and USE(EGL)
ifdefs. This is causing linking issues when building with OpenGL
ES 2, because the header doesn't have the ifdef, and the cpp file
is not compiled leaving all the interface undefined.

Patch by José Dapena Paz jdap...@igalia.com on 2015-03-10
Rubber-stamped by Carlos Garcia Campos.

* platform/graphics/GLContext.cpp:

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/GLContext.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181379 => 181380)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:20:31 UTC (rev 181379)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:21:25 UTC (rev 181380)
@@ -1,3 +1,18 @@
+2015-03-10  José Dapena Paz  jdap...@igalia.com
+
+Unreviewed. Fix GTK+ build with OpenGL ES 2 enabled.
+
+Remove USE(OPENGL) ifdef from GLContext.cpp, since there's nothing
+specific to OpenGL in that file, and everything depending on
+configure options is already protected by USE(GLX) and USE(EGL)
+ifdefs. This is causing linking issues when building with OpenGL
+ES 2, because the header doesn't have the ifdef, and the cpp file
+is not compiled leaving all the interface undefined.
+
+Rubber-stamped by Carlos Garcia Campos.
+
+* platform/graphics/GLContext.cpp:
+
 2015-03-10  Carlos Garcia Campos  cgar...@igalia.com and José Dapena Paz  jdap...@igalia.com
 
 [GTK] Add a configure option to build with OpenGL ES 2


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/GLContext.cpp (181379 => 181380)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/GLContext.cpp	2015-03-11 10:20:31 UTC (rev 181379)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/GLContext.cpp	2015-03-11 10:21:25 UTC (rev 181380)
@@ -17,8 +17,6 @@
  */
 
 #include config.h
-
-#if USE(OPENGL)
 #include GLContext.h
 
 #if USE(EGL)
@@ -199,5 +197,4 @@
 
 } // namespace WebCore
 
-#endif // USE(OPENGL)
 






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


[webkit-changes] [181381] releases/WebKitGTK/webkit-2.8/Source/WebCore

2015-03-11 Thread carlosgc
Title: [181381] releases/WebKitGTK/webkit-2.8/Source/WebCore








Revision 181381
Author carlo...@webkit.org
Date 2015-03-11 03:22:13 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181323 - [GTK] GL_MAX_VARYING_FLOATS is not defined in OpenGL ES 2
https://bugs.webkit.org/show_bug.cgi?id=142529

Reviewed by Žan Doberšek.

Do not use GL_MAX_VARYING_FLOATS when platform is GTK+ and using
OpenGL ES 2.

* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
(WebCore::GraphicsContext3D::checkVaryingsPacking):

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181380 => 181381)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:21:25 UTC (rev 181380)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog	2015-03-11 10:22:13 UTC (rev 181381)
@@ -1,3 +1,16 @@
+2015-03-10  Carlos Garcia Campos  cgar...@igalia.com
+
+[GTK] GL_MAX_VARYING_FLOATS is not defined in OpenGL ES 2
+https://bugs.webkit.org/show_bug.cgi?id=142529
+
+Reviewed by Žan Doberšek.
+
+Do not use GL_MAX_VARYING_FLOATS when platform is GTK+ and using
+OpenGL ES 2.
+
+* platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp:
+(WebCore::GraphicsContext3D::checkVaryingsPacking):
+
 2015-03-10  José Dapena Paz  jdap...@igalia.com
 
 Unreviewed. Fix GTK+ build with OpenGL ES 2 enabled.


Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp (181380 => 181381)

--- releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp	2015-03-11 10:21:25 UTC (rev 181380)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGLCommon.cpp	2015-03-11 10:22:13 UTC (rev 181381)
@@ -376,7 +376,7 @@
 }
 
 GC3Dint maxVaryingVectors = 0;
-#if !PLATFORM(IOS)  !(PLATFORM(WIN)  USE(OPENGL_ES_2))
+#if !PLATFORM(IOS)  !((PLATFORM(WIN) || PLATFORM(GTK))  USE(OPENGL_ES_2))
 GC3Dint maxVaryingFloats = 0;
 ::glGetIntegerv(GL_MAX_VARYING_FLOATS, maxVaryingFloats);
 maxVaryingVectors = maxVaryingFloats / 4;






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


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

2015-03-11 Thread philn
Title: [181371] trunk/Source/WebCore








Revision 181371
Author ph...@webkit.org
Date 2015-03-11 01:10:07 -0700 (Wed, 11 Mar 2015)


Log Message
Rename MediaStreamCenter to RealtimeMediaSourceCenter
https://bugs.webkit.org/show_bug.cgi?id=142535

Reviewed by Eric Carlson.

As per bug title, rename MediaStreamCenter to
RealtimeMediaSourceCenter, this class manages
RealtimeMediaSources, not MediaStreams. Some un-needed includes of
the header were also removed.

Modified Paths

trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp
trunk/Source/WebCore/Modules/mediastream/MediaStream.h
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp
trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.cpp
trunk/Source/WebCore/platform/mediastream/gstreamer/MediaStreamCenterGStreamer.h
trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.h
trunk/Source/WebCore/testing/Internals.cpp


Added Paths

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.cpp
trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h
trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.cpp
trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.h
trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.cpp
trunk/Source/WebCore/platform/mock/MockRealtimeMediaSourceCenter.h


Removed Paths

trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.cpp
trunk/Source/WebCore/platform/mediastream/MediaStreamCenter.h
trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.cpp
trunk/Source/WebCore/platform/mediastream/mac/MediaStreamCenterMac.h
trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.cpp
trunk/Source/WebCore/platform/mock/MockMediaStreamCenter.h




Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (181370 => 181371)

--- trunk/Source/WebCore/CMakeLists.txt	2015-03-11 07:45:26 UTC (rev 181370)
+++ trunk/Source/WebCore/CMakeLists.txt	2015-03-11 08:10:07 UTC (rev 181371)
@@ -2166,10 +2166,10 @@
 platform/graphics/transforms/TransformationMatrix.cpp
 platform/graphics/transforms/TranslateTransformOperation.cpp
 
-platform/mediastream/MediaStreamCenter.cpp
 platform/mediastream/MediaStreamPrivate.cpp
 platform/mediastream/MediaStreamTrackPrivate.cpp
 platform/mediastream/RealtimeMediaSource.cpp
+platform/mediastream/RealtimeMediaSourceCenter.cpp
 platform/mediastream/RealtimeMediaSourceStates.cpp
 platform/mediastream/RTCIceCandidateDescriptor.cpp
 platform/mediastream/RTCPeerConnectionHandler.cpp
@@ -2179,7 +2179,7 @@
 platform/mock/DeviceOrientationClientMock.cpp
 platform/mock/GeolocationClientMock.cpp
 platform/mock/MediaConstraintsMock.cpp
-platform/mock/MockMediaStreamCenter.cpp
+platform/mock/MockRealtimeMediaSourceCenter.cpp
 platform/mock/RTCDataChannelHandlerMock.cpp
 platform/mock/RTCDTMFSenderHandlerMock.cpp
 platform/mock/RTCNotifiersMock.cpp


Modified: trunk/Source/WebCore/ChangeLog (181370 => 181371)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 07:45:26 UTC (rev 181370)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 08:10:07 UTC (rev 181371)
@@ -1,3 +1,15 @@
+2015-03-10  Philippe Normand  pnorm...@igalia.com
+
+Rename MediaStreamCenter to RealtimeMediaSourceCenter
+https://bugs.webkit.org/show_bug.cgi?id=142535
+
+Reviewed by Eric Carlson.
+
+As per bug title, rename MediaStreamCenter to
+RealtimeMediaSourceCenter, this class manages
+RealtimeMediaSources, not MediaStreams. Some un-needed includes of
+the header were also removed.
+
 2015-03-11  Gyuyoung Kim  gyuyoung@samsung.com
 
 Remove unnecessary create() factory functions


Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (181370 => 181371)

--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2015-03-11 07:45:26 UTC (rev 181370)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp	2015-03-11 08:10:07 UTC (rev 181371)
@@ -33,7 +33,6 @@
 #include AudioStreamTrack.h
 #include Event.h
 #include ExceptionCode.h
-#include MediaStreamCenter.h
 #include MediaStreamRegistry.h
 #include MediaStreamTrackEvent.h
 #include RealtimeMediaSource.h


Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (181370 => 181371)

--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h	2015-03-11 07:45:26 UTC (rev 181370)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h	2015-03-11 08:10:07 UTC (rev 181371)
@@ -43,8 +43,6 @@
 
 namespace WebCore {
 
-class MediaStreamCenter;
-
 class MediaStream final : public RefCountedMediaStream, public 

[webkit-changes] [181424] trunk/Source/WebKit2

2015-03-11 Thread antti
Title: [181424] trunk/Source/WebKit2








Revision 181424
Author an...@apple.com
Date 2015-03-11 19:01:42 -0700 (Wed, 11 Mar 2015)


Log Message
Cache traversal missing large entries
https://bugs.webkit.org/show_bug.cgi?id=142601

Reviewed by Andreas Kling.

When traversing cache entries we only read the header data from disk. This didn't work
correctly for entries larger than the read size.

* NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
(WebKit::NetworkCache::IOChannel::read):

Partial reads only receive one callback with 'done' set to true.
Ensure we actually return data in this case.

* NetworkProcess/cache/NetworkCacheStorage.cpp:
(WebKit::NetworkCache::decodeEntryHeader):

Add some logging.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm
trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (181423 => 181424)

--- trunk/Source/WebKit2/ChangeLog	2015-03-12 01:54:06 UTC (rev 181423)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-12 02:01:42 UTC (rev 181424)
@@ -1,3 +1,24 @@
+2015-03-11  Antti Koivisto  an...@apple.com
+
+Cache traversal missing large entries
+https://bugs.webkit.org/show_bug.cgi?id=142601
+
+Reviewed by Andreas Kling.
+
+When traversing cache entries we only read the header data from disk. This didn't work
+correctly for entries larger than the read size.
+
+* NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
+(WebKit::NetworkCache::IOChannel::read):
+
+Partial reads only receive one callback with 'done' set to true.
+Ensure we actually return data in this case.
+
+* NetworkProcess/cache/NetworkCacheStorage.cpp:
+(WebKit::NetworkCache::decodeEntryHeader):
+
+Add some logging.
+
 2015-03-11  Eric Carlson  eric.carl...@apple.com
 
 [Mac] Update AirPlay handling


Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm (181423 => 181424)

--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm	2015-03-12 01:54:06 UTC (rev 181423)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm	2015-03-12 02:01:42 UTC (rev 181424)
@@ -80,14 +80,9 @@
 RefPtrIOChannel channel(this);
 bool didCallCompletionHandler = false;
 dispatch_io_read(m_dispatchIO.get(), offset, size, dispatch_get_main_queue(), [channel, completionHandler, didCallCompletionHandler](bool done, dispatch_data_t fileData, int error) mutable {
-if (done) {
-if (!didCallCompletionHandler) {
-Data nullData;
-completionHandler(nullData, error);
-}
+ASSERT_UNUSED(done, done || !didCallCompletionHandler);
+if (didCallCompletionHandler)
 return;
-}
-ASSERT(!didCallCompletionHandler);
 DispatchPtrdispatch_data_t fileDataPtr(fileData);
 Data data(fileDataPtr);
 completionHandler(data, error);


Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (181423 => 181424)

--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp	2015-03-12 01:54:06 UTC (rev 181423)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp	2015-03-12 02:01:42 UTC (rev 181424)
@@ -179,12 +179,19 @@
 
 static bool decodeEntryHeader(const Data fileData, EntryMetaData metaData, Data data)
 {
-if (!decodeEntryMetaData(metaData, fileData))
+if (!decodeEntryMetaData(metaData, fileData)) {
+LOG(NetworkCacheStorage, (NetworkProcess) meta data decode failure);
 return false;
-if (metaData.cacheStorageVersion != Storage::version)
+}
+
+if (metaData.cacheStorageVersion != Storage::version) {
+LOG(NetworkCacheStorage, (NetworkProcess) version mismatch);
 return false;
-if (metaData.headerOffset + metaData.headerSize  metaData.bodyOffset)
+}
+if (metaData.headerOffset + metaData.headerSize  metaData.bodyOffset) {
+LOG(NetworkCacheStorage, (NetworkProcess) body offset mismatch);
 return false;
+}
 
 auto headerData = fileData.subrange(metaData.headerOffset, metaData.headerSize);
 if (metaData.headerChecksum != hashData(headerData)) {






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


[webkit-changes] [181422] trunk/LayoutTests

2015-03-11 Thread simon . fraser
Title: [181422] trunk/LayoutTests








Revision 181422
Author simon.fra...@apple.com
Date 2015-03-11 18:10:40 -0700 (Wed, 11 Mar 2015)


Log Message
Mark compositing/backgrounds/background-image-with-negative-zindex.html as
an image failure, since r179871 was rolled out.

* platform/mac/TestExpectations:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/TestExpectations




Diff

Modified: trunk/LayoutTests/ChangeLog (181421 => 181422)

--- trunk/LayoutTests/ChangeLog	2015-03-12 01:03:43 UTC (rev 181421)
+++ trunk/LayoutTests/ChangeLog	2015-03-12 01:10:40 UTC (rev 181422)
@@ -1,3 +1,10 @@
+2015-03-11  Simon Fraser  simon.fra...@apple.com
+
+Mark compositing/backgrounds/background-image-with-negative-zindex.html as
+an image failure, since r179871 was rolled out.
+
+* platform/mac/TestExpectations:
+
 2015-03-11  Timothy Horton  timothy_hor...@apple.com
 
 attachment shouldn't use user-select: all


Modified: trunk/LayoutTests/platform/mac/TestExpectations (181421 => 181422)

--- trunk/LayoutTests/platform/mac/TestExpectations	2015-03-12 01:03:43 UTC (rev 181421)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2015-03-12 01:10:40 UTC (rev 181422)
@@ -834,6 +834,8 @@
 webkit.org/b/128255 compositing/columns/composited-lr-paginated-repaint.html [ Pass Failure ]
 webkit.org/b/128255 compositing/columns/composited-rl-paginated-repaint.html [ Pass Failure ]
 
+webkit.org/b/140183 compositing/backgrounds/background-image-with-negative-zindex.html [ ImageOnlyFailure ]
+
 webkit.org/b/130972 transitions/3d/interrupted-transition.html [ Pass Failure Timeout ]
 
 webkit.org/b/118153 compositing/repaint/positioned-movement.html [ Pass Failure ]






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


[webkit-changes] [181423] trunk/Source

2015-03-11 Thread eric . carlson
Title: [181423] trunk/Source








Revision 181423
Author eric.carl...@apple.com
Date 2015-03-11 18:54:06 -0700 (Wed, 11 Mar 2015)


Log Message
[Mac] Update AirPlay handling
https://bugs.webkit.org/show_bug.cgi?id=142541

Reviewed by Sam Weinig.

Source/WebCore:

* WebCore.xcodeproj/project.pbxproj:
* dom/Document.cpp:
(WebCore::Document::showPlaybackTargetPicker):
(WebCore::Document::addPlaybackTargetPickerClient):
(WebCore::Document::removePlaybackTargetPickerClient):
(WebCore::Document::configurePlaybackTargetMonitoring):
(WebCore::Document::requiresPlaybackTargetRouteMonitoring):
(WebCore::Document::playbackTargetAvailabilityDidChange):
(WebCore::Document::didChoosePlaybackTarget):
* dom/Document.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::registerWithDocument):
(WebCore::HTMLMediaElement::unregisterWithDocument):
(WebCore::HTMLMediaElement::parseAttribute):
* html/HTMLMediaElement.h:
* html/HTMLMediaSession.cpp:
(WebCore::HTMLMediaSession::HTMLMediaSession):
(WebCore::HTMLMediaSession::registerWithDocument):
(WebCore::HTMLMediaSession::unregisterWithDocument):
(WebCore::HTMLMediaSession::showPlaybackTargetPicker):
(WebCore::HTMLMediaSession::hasWirelessPlaybackTargets):
(WebCore::HTMLMediaSession::setHasPlaybackTargetAvailabilityListeners):
(WebCore::HTMLMediaSession::didChoosePlaybackTarget):
(WebCore::HTMLMediaSession::externalOutputDeviceAvailableDidChange):
(WebCore::HTMLMediaSession::requiresPlaybackTargetRouteMonitoring):
* html/HTMLMediaSession.h:
* page/ChromeClient.h:
* page/Page.cpp:
(WebCore::Page::didChoosePlaybackTarget):
(WebCore::Page::playbackTargetAvailabilityDidChange):
(WebCore::Page::configurePlaybackTargetMonitoring):
* page/Page.h:
(WebCore::Page::hasWirelessPlaybackTarget):
(WebCore::Page::playbackTarget):
* platform/audio/MediaSession.cpp:
(WebCore::MediaSession::clientDataBufferingTimerFired):
(WebCore::MediaSession::wirelessRoutesAvailableDidChange): Deleted.
* platform/audio/MediaSession.h:
(WebCore::MediaSession::didChoosePlaybackTarget):
(WebCore::MediaSession::externalOutputDeviceAvailableDidChange):
(WebCore::MediaSession::requiresPlaybackTargetRouteMonitoring):
(WebCore::MediaSessionClient::setWirelessPlaybackTarget):
* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::wirelessRoutesAvailableChanged): Deleted.
* platform/audio/MediaSessionManager.h:
(WebCore::MediaSessionManager::configureWireLessTargetMonitoring):
* platform/audio/ios/MediaSessionManagerIOS.h:
* platform/audio/ios/MediaSessionManagerIOS.mm:
(WebCore::MediaSessionManageriOS::externalOutputDeviceAvailableDidChange):
(-[WebMediaSessionHelper wirelessRoutesAvailableDidChange:]):
* platform/graphics/AVPlaybackTarget.h: Added.
(WebCore::AVPlaybackTarget::~AVPlaybackTarget):
(WebCore::AVPlaybackTarget::AVPlaybackTarget):
(WebCore::AVPlaybackTarget::setDevicePickerContext):
(WebCore::AVPlaybackTarget::devicePickerContext):
* platform/graphics/AVPlaybackTargetPickerClient.h: Added.
(WebCore::AVPlaybackTargetPickerClient::~AVPlaybackTargetPickerClient):
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::setWirelessPlaybackTarget):
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
(WebCore::MediaPlayerPrivateInterface::setWirelessPlaybackTarget):
* platform/graphics/avfoundation/AVPlaybackTargetMac.mm: Added.
(WebCore::AVPlaybackTarget::encode):
(WebCore::AVPlaybackTarget::decode):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless):
(WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessPlaybackTargetType):
(WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessVideoPlaybackDisabled):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessVideoPlaybackDisabled):
(WebCore::MediaPlayerPrivateAVFoundationObjC::setWirelessPlaybackTarget):
(WebCore::MediaPlayerPrivateAVFoundationObjC::updateDisableExternalPlayback):
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):

Source/WebKit2:

* Shared/WebCoreArgumentCoders.h:
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoderAVPlaybackTarget::encode):
(IPC::ArgumentCoderAVPlaybackTarget::decode):
* UIProcess/PageClient.h:
* UIProcess/WebAVPlaybackTargetPickerProxy.cpp: Added.
(WebKit::WebAVPlaybackTargetPickerProxy::WebAVPlaybackTargetPickerProxy):
(WebKit::WebAVPlaybackTargetPickerProxy::~WebAVPlaybackTargetPickerProxy):
(WebKit::WebAVPlaybackTargetPickerProxy::showPlaybackTargetPicker):
(WebKit::WebAVPlaybackTargetPickerProxy::startingMonitoringPlaybackTargets):
(WebKit::WebAVPlaybackTargetPickerProxy::stopMonitoringPlaybackTargets):
* UIProcess/WebAVPlaybackTargetPickerProxy.h: Added.

[webkit-changes] [181387] trunk

2015-03-11 Thread mmaxfield
Title: [181387] trunk








Revision 181387
Author mmaxfi...@apple.com
Date 2015-03-11 07:41:01 -0700 (Wed, 11 Mar 2015)


Log Message
Inline block children do not have correct baselines if their children are also block elements
https://bugs.webkit.org/show_bug.cgi?id=142559

Patch by Myles C. Maxfield mmaxfi...@apple.com on 2015-03-11
Reviewed by Darin Adler.

Source/WebCore:

Perform the same computation on child block elements as child inline elements.

Test: fast/text/baseline-inline-block-block-children.html

* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::inlineBlockBaseline):

LayoutTests:

* fast/text/baseline-inline-block-block-children-expected.html: Added.
* fast/text/baseline-inline-block-block-children.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBlockFlow.cpp


Added Paths

trunk/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html
trunk/LayoutTests/fast/text/baseline-inline-block-block-children.html




Diff

Modified: trunk/LayoutTests/ChangeLog (181386 => 181387)

--- trunk/LayoutTests/ChangeLog	2015-03-11 14:09:29 UTC (rev 181386)
+++ trunk/LayoutTests/ChangeLog	2015-03-11 14:41:01 UTC (rev 181387)
@@ -1,3 +1,13 @@
+2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
+
+Inline block children do not have correct baselines if their children are also block elements
+https://bugs.webkit.org/show_bug.cgi?id=142559
+
+Reviewed by Darin Adler.
+
+* fast/text/baseline-inline-block-block-children-expected.html: Added.
+* fast/text/baseline-inline-block-block-children.html: Added.
+
 2015-03-10  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: CSS parser errors in the console should include column numbers


Added: trunk/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html (0 => 181387)

--- trunk/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html	(rev 0)
+++ trunk/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html	2015-03-11 14:41:01 UTC (rev 181387)
@@ -0,0 +1,7 @@
+This tests that block children of overflow: scroll have the correct baseline calculated.br
+div style=display: inline-block; background: green;
+div style=height: 150px; width: 200px; overflow: scroll;
+Overflow withbroverflow: scrollbrMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrM
+/div
+/div
+Baseline


Added: trunk/LayoutTests/fast/text/baseline-inline-block-block-children.html (0 => 181387)

--- trunk/LayoutTests/fast/text/baseline-inline-block-block-children.html	(rev 0)
+++ trunk/LayoutTests/fast/text/baseline-inline-block-block-children.html	2015-03-11 14:41:01 UTC (rev 181387)
@@ -0,0 +1,7 @@
+This tests that block children of overflow: scroll have the correct baseline calculated.br
+div style=display: inline-block; background: green;
+div style=height: 150px; width: 200px; overflow: scroll;
+divOverflow withbroverflow: scroll/divMbrMbrMbrMbrMbrMbrMbrMbrMbrMbrM
+/div
+/div
+Baseline


Modified: trunk/Source/WebCore/ChangeLog (181386 => 181387)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 14:09:29 UTC (rev 181386)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 14:41:01 UTC (rev 181387)
@@ -1,3 +1,17 @@
+2015-03-11  Myles C. Maxfield  mmaxfi...@apple.com
+
+Inline block children do not have correct baselines if their children are also block elements
+https://bugs.webkit.org/show_bug.cgi?id=142559
+
+Reviewed by Darin Adler.
+
+Perform the same computation on child block elements as child inline elements.
+
+Test: fast/text/baseline-inline-block-block-children.html
+
+* rendering/RenderBlockFlow.cpp:
+(WebCore::RenderBlockFlow::inlineBlockBaseline):
+
 2015-03-11  Carlos Alberto Lopez Perez  clo...@igalia.com
 
 [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.


Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (181386 => 181387)

--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2015-03-11 14:09:29 UTC (rev 181386)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp	2015-03-11 14:41:01 UTC (rev 181387)
@@ -3011,27 +3011,28 @@
 if (isWritingModeRoot()  !isRubyRun())
 return -1;
 
-if (!childrenInline())
-return RenderBlock::inlineBlockBaseline(lineDirection);
-
-if (!hasLines()) {
-if (!hasLineIfEmpty())
-return -1;
-const FontMetrics fontMetrics = firstLineStyle().fontMetrics();
-return fontMetrics.ascent()
- + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
- + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
-}
-
 // Note that here we only take the left and bottom into consideration. Our caller takes the right and top into 

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

2015-03-11 Thread commit-queue
Title: [181388] trunk/Source/WebInspectorUI








Revision 181388
Author commit-qu...@webkit.org
Date 2015-03-11 07:52:04 -0700 (Wed, 11 Mar 2015)


Log Message
Web Inspector: Reload after Global Search results in empty Resources Sidebar.
https://bugs.webkit.org/show_bug.cgi?id=142572

Patch by Joseph Pecoraro pecor...@apple.com on 2015-03-11
Reviewed by Timothy Hatcher.

If you reload when the search content tree outline is showing, break out
to show the resource tree outline.

* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype._showResourcesContentTreeOutline):
(WebInspector.ResourceSidebarPanel.prototype._showSearchContentTreeOutline):

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (181387 => 181388)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-03-11 14:41:01 UTC (rev 181387)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-03-11 14:52:04 UTC (rev 181388)
@@ -1,5 +1,19 @@
 2015-03-11  Joseph Pecoraro  pecor...@apple.com
 
+Web Inspector: Reload after Global Search results in empty Resources Sidebar.
+https://bugs.webkit.org/show_bug.cgi?id=142572
+
+Reviewed by Timothy Hatcher.
+
+If you reload when the search content tree outline is showing, break out
+to show the resource tree outline.
+
+* UserInterface/Views/ResourceSidebarPanel.js:
+(WebInspector.ResourceSidebarPanel.prototype._showResourcesContentTreeOutline):
+(WebInspector.ResourceSidebarPanel.prototype._showSearchContentTreeOutline):
+
+2015-03-11  Joseph Pecoraro  pecor...@apple.com
+
 Web Inspector: SearchResultTreeElement.representedObject is missing a saveIdentityToCookie implementation
 https://bugs.webkit.org/show_bug.cgi?id=134698
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (181387 => 181388)

--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js	2015-03-11 14:41:01 UTC (rev 181387)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js	2015-03-11 14:52:04 UTC (rev 181388)
@@ -320,13 +320,11 @@
 
 searchTerm = searchTerm.trim();
 if (!searchTerm.length) {
-this.filterBar.placeholder = WebInspector.UIString(Filter Resource List);
-this.contentTreeOutline = this._resourcesContentTreeOutline;
+this._showResourcesContentTreeOutline();
 return;
 }
 
-this.filterBar.placeholder = WebInspector.UIString(Filter Search Results);
-this.contentTreeOutline = this._searchContentTreeOutline;
+this._showSearchContentTreeOutline();
 
 // FIXME: Provide UI to toggle regex and case sensitive searches.
 var isCaseSensitive = false;
@@ -521,6 +519,18 @@
 
 // Private
 
+_showResourcesContentTreeOutline: function()
+{
+this.filterBar.placeholder = WebInspector.UIString(Filter Resource List);
+this.contentTreeOutline = this._resourcesContentTreeOutline;
+},
+
+_showSearchContentTreeOutline: function()
+{
+this.filterBar.placeholder = WebInspector.UIString(Filter Search Results);
+this.contentTreeOutline = this._searchContentTreeOutline;
+},
+
 _searchFieldChanged: function(event)
 {
 this.performSearch(event.target.value);
@@ -622,6 +632,9 @@
 WebInspector.contentBrowser.contentViewContainer.closeAllContentViewsOfPrototype(WebInspector.FrameContentView);
 WebInspector.contentBrowser.contentViewContainer.closeAllContentViewsOfPrototype(WebInspector.ScriptContentView);
 
+// Break out of search tree outline if there was an active search.
+this._showResourcesContentTreeOutline();
+
 function delayedWork()
 {
 // Show the main frame since there is no content view showing or we were showing a resource before.






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


[webkit-changes] [181369] releases/WebKitGTK/webkit-2.8/Source/WebKit2

2015-03-11 Thread carlosgc
Title: [181369] releases/WebKitGTK/webkit-2.8/Source/WebKit2








Revision 181369
Author carlo...@webkit.org
Date 2015-03-11 00:41:07 -0700 (Wed, 11 Mar 2015)


Log Message
Merge r181272 - bmalloc: tryFastMalloc shouldn't crash
https://bugs.webkit.org/show_bug.cgi?id=142443

Reviewed by Anders Carlsson.

Part 1: Stop using tryFastRealloc.

* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::resize): Deleted.
* Shared/ShareableBitmap.h: Removed the resize function because it has
no clients.

* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::updateBackingStore): Changed to allocate a new
backing store instead of resizing the old one. This has three advantages:

(1) Might be more memory-efficient, since you don't have to keep the old
one around while allocating the new one.

(2) Avoids the overhead of realloc() copying the contents of the old
backing store even though we only want uninitialized memory.

(3) Makes resize failure consistent with initial allocation failure.
Previously, while initial allocation failure would set the backing store
to null, resize failure would keep the old wrong backing store and then
tell it not to paint. Now, resize failure also sets the backing store to
null.

Modified Paths

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog
releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.cpp
releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.h
releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp




Diff

Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181368 => 181369)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-03-11 07:10:08 UTC (rev 181368)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog	2015-03-11 07:41:07 UTC (rev 181369)
@@ -1,3 +1,33 @@
+2015-03-09  Geoffrey Garen  gga...@apple.com
+
+bmalloc: tryFastMalloc shouldn't crash
+https://bugs.webkit.org/show_bug.cgi?id=142443
+
+Reviewed by Anders Carlsson.
+
+Part 1: Stop using tryFastRealloc.
+
+* Shared/ShareableBitmap.cpp:
+(WebKit::ShareableBitmap::resize): Deleted.
+* Shared/ShareableBitmap.h: Removed the resize function because it has
+no clients.
+
+* WebProcess/Plugins/PluginProxy.cpp:
+(WebKit::PluginProxy::updateBackingStore): Changed to allocate a new
+backing store instead of resizing the old one. This has three advantages:
+
+(1) Might be more memory-efficient, since you don't have to keep the old
+one around while allocating the new one.
+
+(2) Avoids the overhead of realloc() copying the contents of the old
+backing store even though we only want uninitialized memory.
+
+(3) Makes resize failure consistent with initial allocation failure.
+Previously, while initial allocation failure would set the backing store
+to null, resize failure would keep the old wrong backing store and then
+tell it not to paint. Now, resize failure also sets the backing store to
+null.
+
 2015-03-05  Carlos Garcia Campos  cgar...@igalia.com
 
 REGRESSION(r180924): ASSERTION FAILED: !from.isEmpty() in WebCore::TransformationMatrix::rectToRect


Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.cpp (181368 => 181369)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.cpp	2015-03-11 07:10:08 UTC (rev 181368)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.cpp	2015-03-11 07:41:07 UTC (rev 181369)
@@ -138,29 +138,6 @@
 fastFree(m_data);
 }
 
-bool ShareableBitmap::resize(const IntSize size)
-{
-// We can't resize backing stores that are backed by shared memory.
-ASSERT(!isBackedBySharedMemory());
-
-if (size == m_size)
-return true;
-
-size_t newNumBytes = numBytesForSize(size);
-
-// Try to resize.
-char* newData = 0;
-if (!tryFastRealloc(m_data, newNumBytes).getValue(newData)) {
-// We failed, but the backing store is still kept in a consistent state.
-return false;
-}
-
-m_size = size;
-m_data = newData;
-
-return true;
-}
-
 void* ShareableBitmap::data() const
 {
 if (isBackedBySharedMemory())


Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.h (181368 => 181369)

--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.h	2015-03-11 07:10:08 UTC (rev 181368)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/Shared/ShareableBitmap.h	2015-03-11 07:41:07 UTC (rev 181369)
@@ -95,8 +95,6 @@
 const WebCore::IntSize size() const { return m_size; }
 WebCore::IntRect bounds() const { return WebCore::IntRect(WebCore::IntPoint(), size()); }
 
-bool resize(const WebCore::IntSize size);
-
 // Create a graphics context that can be used to paint into the backing store.
 std::unique_ptrWebCore::GraphicsContext createGraphicsContext();
 


Modified: 

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

2015-03-11 Thread clopez
Title: [181385] trunk/Source/WebCore








Revision 181385
Author clo...@igalia.com
Date 2015-03-11 07:00:15 -0700 (Wed, 11 Mar 2015)


Log Message
[CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
https://bugs.webkit.org/show_bug.cgi?id=142577

Reviewed by Carlos Garcia Campos.

No new tests, this is a build fix.

* PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
* PlatformGTK.cmake: Idem.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/PlatformEfl.cmake
trunk/Source/WebCore/PlatformGTK.cmake




Diff

Modified: trunk/Source/WebCore/ChangeLog (181384 => 181385)

--- trunk/Source/WebCore/ChangeLog	2015-03-11 11:03:20 UTC (rev 181384)
+++ trunk/Source/WebCore/ChangeLog	2015-03-11 14:00:15 UTC (rev 181385)
@@ -1,3 +1,15 @@
+2015-03-11  Carlos Alberto Lopez Perez  clo...@igalia.com
+
+[CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
+https://bugs.webkit.org/show_bug.cgi?id=142577
+
+Reviewed by Carlos Garcia Campos.
+
+No new tests, this is a build fix.
+
+* PlatformEfl.cmake: Include GSTREAMER_AUDIO_LIBRARIES on the link step both for ENABLE_VIDEO and ENABLE_WEB_AUDIO.
+* PlatformGTK.cmake: Idem.
+
 2015-03-10  Philippe Normand  pnorm...@igalia.com
 
 Rename MediaStreamCenter to RealtimeMediaSourceCenter


Modified: trunk/Source/WebCore/PlatformEfl.cmake (181384 => 181385)

--- trunk/Source/WebCore/PlatformEfl.cmake	2015-03-11 11:03:20 UTC (rev 181384)
+++ trunk/Source/WebCore/PlatformEfl.cmake	2015-03-11 14:00:15 UTC (rev 181385)
@@ -347,6 +347,7 @@
 ${GSTREAMER_BASE_LIBRARIES}
 ${GSTREAMER_LIBRARIES}
 ${GSTREAMER_PBUTILS_LIBRARIES}
+${GSTREAMER_AUDIO_LIBRARIES}
 )
 # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
 set_source_files_properties(platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp PROPERTIES COMPILE_DEFINITIONS GLIB_DISABLE_DEPRECATION_WARNINGS=1)
@@ -428,7 +429,6 @@
 ${GSTREAMER_FFT_INCLUDE_DIRS}
 )
 list(APPEND WebCore_LIBRARIES
-${GSTREAMER_AUDIO_LIBRARIES}
 ${GSTREAMER_FFT_LIBRARIES}
 )
 set(WEB_AUDIO_DIR ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/webaudio/resources)


Modified: trunk/Source/WebCore/PlatformGTK.cmake (181384 => 181385)

--- trunk/Source/WebCore/PlatformGTK.cmake	2015-03-11 11:03:20 UTC (rev 181384)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2015-03-11 14:00:15 UTC (rev 181385)
@@ -321,6 +321,7 @@
 ${GSTREAMER_BASE_LIBRARIES}
 ${GSTREAMER_LIBRARIES}
 ${GSTREAMER_PBUTILS_LIBRARIES}
+${GSTREAMER_AUDIO_LIBRARIES}
 )
 # Avoiding a GLib deprecation warning due to GStreamer API using deprecated classes.
 set_source_files_properties(platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp PROPERTIES COMPILE_DEFINITIONS GLIB_DISABLE_DEPRECATION_WARNINGS=1)
@@ -354,7 +355,6 @@
 ${GSTREAMER_FFT_INCLUDE_DIRS}
 )
 list(APPEND WebCore_LIBRARIES
-${GSTREAMER_AUDIO_LIBRARIES}
 ${GSTREAMER_FFT_LIBRARIES}
 )
 endif ()






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


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

2015-03-11 Thread commit-queue
Title: [181386] trunk/Source/WebInspectorUI








Revision 181386
Author commit-qu...@webkit.org
Date 2015-03-11 07:09:29 -0700 (Wed, 11 Mar 2015)


Log Message
Web Inspector: SearchResultTreeElement.representedObject is missing a saveIdentityToCookie implementation
https://bugs.webkit.org/show_bug.cgi?id=134698

Patch by Joseph Pecoraro pecor...@apple.com on 2015-03-11
Reviewed by Timothy Hatcher.

This will restore selection of a global search tree element if you
close and reopen the inspector in such a case.

* UserInterface/Models/DOMSearchMatchObject.js:
(WebInspector.DOMSearchMatchObject.prototype.get resource):
(WebInspector.DOMSearchMatchObject.titleForDOMNode):
Cookie has the resource URL, DOM Node title, and text range.

* UserInterface/Models/SourceCodeSearchMatchObject.js:
(WebInspector.SourceCodeSearchMatchObject.prototype.get sourceCodeTextRange):
Cookie has the source code URL and text range.

Modified Paths

trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js
trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (181385 => 181386)

--- trunk/Source/WebInspectorUI/ChangeLog	2015-03-11 14:00:15 UTC (rev 181385)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-03-11 14:09:29 UTC (rev 181386)
@@ -1,3 +1,22 @@
+2015-03-11  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: SearchResultTreeElement.representedObject is missing a saveIdentityToCookie implementation
+https://bugs.webkit.org/show_bug.cgi?id=134698
+
+Reviewed by Timothy Hatcher.
+
+This will restore selection of a global search tree element if you
+close and reopen the inspector in such a case.
+
+* UserInterface/Models/DOMSearchMatchObject.js:
+(WebInspector.DOMSearchMatchObject.prototype.get resource):
+(WebInspector.DOMSearchMatchObject.titleForDOMNode):
+Cookie has the resource URL, DOM Node title, and text range.
+
+* UserInterface/Models/SourceCodeSearchMatchObject.js:
+(WebInspector.SourceCodeSearchMatchObject.prototype.get sourceCodeTextRange):
+Cookie has the source code URL and text range.
+
 2015-03-10  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: CSS parser errors in the console should include column numbers


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js (181385 => 181386)

--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js	2015-03-11 14:00:15 UTC (rev 181385)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMSearchMatchObject.js	2015-03-11 14:09:29 UTC (rev 181386)
@@ -44,11 +44,22 @@
 WebInspector.DOMSearchMatchObject.DOMMatchCharacterDataIconStyleClassName = dom-match-character-data-icon;
 WebInspector.DOMSearchMatchObject.DOMMatchNodeIconStyleClassName = dom-match-node-icon;
 
+WebInspector.DOMSearchMatchObject.TypeIdentifier = dom-search-match-object;
+WebInspector.DOMSearchMatchObject.URLCookieKey = resource-url;
+WebInspector.DOMSearchMatchObject.TitleKey = title;
+WebInspector.DOMSearchMatchObject.TextRangeKey = text-range;
+
 WebInspector.DOMSearchMatchObject.prototype = {
 constructor: WebInspector.DOMSearchMatchObject,
+__proto__: WebInspector.Object.prototype,
 
 // Public
 
+get resource()
+{
+return this._resource;
+},
+
 get domNode()
 {
 return this._domNode;
@@ -77,9 +88,17 @@
 return this._sourceCodeTextRange;
 },
 
+saveIdentityToCookie(cookie)
+{
+cookie[WebInspector.DOMSearchMatchObject.URLCookieKey] = this._resource.url.hash;
+cookie[WebInspector.DOMSearchMatchObject.TitleKey] = this._title;
+var textRange = this._sourceCodeTextRange.textRange;
+cookie[WebInspector.DOMSearchMatchObject.TextRangeKey] = [textRange.startLine, textRange.startColumn, textRange.endLine, textRange.endColumn].join();
+},
+
 // Private
 
-_generateClassName: function()
+_generateClassName()
 {
 switch (this._domNode.nodeType()) {
 case Node.ELEMENT_NODE:
@@ -154,5 +173,3 @@
 return domNode.nodeNameInCorrectCase();
 }
 };
-
-WebInspector.DOMSearchMatchObject.prototype.__proto__ = WebInspector.Object.prototype;


Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js (181385 => 181386)

--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js	2015-03-11 14:00:15 UTC (rev 181385)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeSearchMatchObject.js	2015-03-11 14:09:29 UTC (rev 181386)
@@ -37,8 +37,13 @@
 
 WebInspector.SourceCodeSearchMatchObject.SourceCodeMatchIconStyleClassName = source-code-match-icon;
 
+WebInspector.SourceCodeSearchMatchObject.TypeIdentifier = source-code-search-match-object;
+WebInspector.SourceCodeSearchMatchObject.URLCookieKey = source-code-url;

[webkit-changes] [181426] trunk

2015-03-11 Thread joepeck
Title: [181426] trunk








Revision 181426
Author joep...@webkit.org
Date 2015-03-11 21:49:05 -0700 (Wed, 11 Mar 2015)


Log Message
Web Inspector: CSS parser errors in the console should include column numbers
https://bugs.webkit.org/show_bug.cgi?id=114313

Reviewed by Darin Adler.

Source/WebCore:

Test: inspector-protocol/console/warnings-errors.html

* css/CSSParser.h:
(WebCore::CSSParser::currentCharacterOffset):
Get the current character offset depending on the source type.
Add instance variables to track column position and start
line / column for inline stylesheets.

* css/CSSParser.cpp:
(WebCore::CSSParser::CSSParser):
(WebCore::CSSParser::parseSheet):
Initialize new instance variables.

(WebCore::CSSParser::currentLocation):
Update to include column information for the token. Also, if we are on the
first line we may need to take into account a start column offset as well.

(WebCore::CSSParser::realLex):
Set the token's start column.
When bumping the line number, reset the column offset for the next
line with the next character.

(WebCore::CSSParser::syntaxError):
(WebCore::CSSParser::logError):
Include column information.

* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::parseAuthorStyleSheet):
(WebCore::StyleSheetContents::parseString):
(WebCore::StyleSheetContents::parseStringAtPosition):
Include column information.

* css/StyleSheetContents.h:
* dom/InlineStyleSheetOwner.cpp:
(WebCore::InlineStyleSheetOwner::InlineStyleSheetOwner):
(WebCore::InlineStyleSheetOwner::createSheet):
Save and use column information later on.

* dom/InlineStyleSheetOwner.h:
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyleSheet::ensureSourceData):
Updated parser signature needs starting column and no longer has optional parameters.

Source/WebInspectorUI:

* UserInterface/Views/ConsoleMessageImpl.js:
(WebInspector.ConsoleMessageImpl.prototype._linkifyLocation):
Column numbers in console messages are also 1 based and should be adjusted.

LayoutTests:

Test errors in both external and inline CSS and Scripts to ensure they have
expected line:column information.

* inspector-protocol/console/warnings-errors-expected.txt: Added.
* inspector-protocol/console/warnings-errors.html: Added.
* inspector-protocol/resources/errors.css: Added.
* inspector-protocol/resources/errors.js: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSParser.h
trunk/Source/WebCore/css/StyleSheetContents.cpp
trunk/Source/WebCore/css/StyleSheetContents.h
trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp
trunk/Source/WebCore/dom/InlineStyleSheetOwner.h
trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/ConsoleMessageImpl.js


Added Paths

trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt
trunk/LayoutTests/inspector-protocol/console/warnings-errors.html
trunk/LayoutTests/inspector-protocol/resources/errors.css
trunk/LayoutTests/inspector-protocol/resources/errors.js




Diff

Modified: trunk/LayoutTests/ChangeLog (181425 => 181426)

--- trunk/LayoutTests/ChangeLog	2015-03-12 03:27:23 UTC (rev 181425)
+++ trunk/LayoutTests/ChangeLog	2015-03-12 04:49:05 UTC (rev 181426)
@@ -1,3 +1,18 @@
+2015-03-11  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: CSS parser errors in the console should include column numbers
+https://bugs.webkit.org/show_bug.cgi?id=114313
+
+Reviewed by Darin Adler.
+
+Test errors in both external and inline CSS and Scripts to ensure they have
+expected line:column information.
+
+* inspector-protocol/console/warnings-errors-expected.txt: Added.
+* inspector-protocol/console/warnings-errors.html: Added.
+* inspector-protocol/resources/errors.css: Added.
+* inspector-protocol/resources/errors.js: Added.
+
 2015-03-11  Simon Fraser  simon.fra...@apple.com
 
 Rename the Mavericks result for input-auto-fill-button.html to use the


Added: trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt (0 => 181426)

--- trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	(rev 0)
+++ trunk/LayoutTests/inspector-protocol/console/warnings-errors-expected.txt	2015-03-12 04:49:05 UTC (rev 181426)
@@ -0,0 +1,25 @@
+CONSOLE MESSAGE: line 1: error script
+CONSOLE MESSAGE: line 1: warn script
+CONSOLE MESSAGE: line 5: error script
+CONSOLE MESSAGE: line 6: warn script
+CONSOLE MESSAGE: line 15: TypeError: undefined is not an object (evaluating '[].x.x')
+CONSOLE MESSAGE: line 17: warn 1
+CONSOLE MESSAGE: line 17: error 1
+CONSOLE MESSAGE: line 18: error 2
+Tests that CSS/_javascript_ errors and warnings are sent to the console with line and column information.
+{source:css,level:warning,text:Invalid CSS property declaration at: *,location:warnings-errors.html:5:20}

[webkit-changes] [181427] trunk/LayoutTests

2015-03-11 Thread bfulgham
Title: [181427] trunk/LayoutTests








Revision 181427
Author bfulg...@apple.com
Date 2015-03-11 21:53:11 -0700 (Wed, 11 Mar 2015)


Log Message
[Win] Update test expectations after r181408.

Also update with more debug assertions.

* platform/win/TestExpectations:
* platform/win/fast/forms/input-auto-fill-button-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations


Added Paths

trunk/LayoutTests/platform/win/fast/forms/input-auto-fill-button-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (181426 => 181427)

--- trunk/LayoutTests/ChangeLog	2015-03-12 04:49:05 UTC (rev 181426)
+++ trunk/LayoutTests/ChangeLog	2015-03-12 04:53:11 UTC (rev 181427)
@@ -1,3 +1,12 @@
+2015-03-11  Brent Fulgham  bfulg...@apple.com
+
+[Win] Update test expectations after r181408.
+
+Also update with more debug assertions.
+
+* platform/win/TestExpectations:
+* platform/win/fast/forms/input-auto-fill-button-expected.txt: Added.
+
 2015-03-11  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: CSS parser errors in the console should include column numbers


Modified: trunk/LayoutTests/platform/win/TestExpectations (181426 => 181427)

--- trunk/LayoutTests/platform/win/TestExpectations	2015-03-12 04:49:05 UTC (rev 181426)
+++ trunk/LayoutTests/platform/win/TestExpectations	2015-03-12 04:53:11 UTC (rev 181427)
@@ -2490,6 +2490,7 @@
 [ Debug ] editing/pasteboard/copy-paste-converts-fixed.html [ Skip ] # Debug Assertion
 [ Debug ] editing/pasteboard/copy-paste-converts-sticky.html [ Skip ] # Debug Assertion
 [ Debug ] editing/pasteboard/copy-paste-doesnt-convert-sticky-and-fixed-during-partial-copy.html [ Skip ] # Debug Assertion
+[ Debug ] editing/pasteboard/copy-paste-first-line-in-textarea.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/14971.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/3690703.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/3690703-2.html [ Skip ] # Debug Assertion
@@ -2497,6 +2498,7 @@
 [ Debug ] editing/selection/4397952.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/4402375.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/4776665.html [ Skip ] # Debug Assertion
+[ Debug ] editing/selection/4818145.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/5007143-2.html [ Skip ] # Crashing
 [ Debug ] editing/selection/5007143.html [ Skip ] # Crashing
 [ Debug ] editing/selection/5076323-1.html [ Skip ] # Debug Assertion
@@ -2509,6 +2511,7 @@
 [ Debug ] editing/selection/5131716-1.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/5131716-2.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/5131716-3.html [ Skip ] # Debug Assertion
+[ Debug ] editing/selection/5131716-4.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/6476.html [ Skip ] # Crashing
 [ Debug ] editing/selection/7152-1.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/7152-2.html [ Skip ] # Debug Assertion
@@ -2523,6 +2526,7 @@
 [ Debug ] editing/selection/inactive-selection.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/inline-closest-leaf-child.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/inline-table.html [ Skip ] # Debug Assertion
+[ Debug ] editing/selection/internal-caret-rect.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/select-all-textarea.html [ Skip ] # Crashing
 [ Debug ] editing/selection/select-all-user-select-none.html [ Skip ] # Debug Assertion
 [ Debug ] editing/selection/select-bidi-run.html [ Skip ] # Debug Assertion
@@ -2547,6 +2551,7 @@
 [ Debug ] fast/dom/attr-style-too-lazy.html [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/attribute-case-sensitivity2.xhtml [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/attr_dead_doc.html [ Skip ] # Debug Assertion
+[ Debug ] fast/dom/attribute-case-sensitivity.html [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/htmlallcollection-detached-node-children.html [ Skip ] # Crashing
 [ Debug ] fast/dom/htmlallcollection-reachable.html [ Skip ] # Crashing
 [ Debug ] fast/dom/htmlcollection-children-mutation.html [ Skip ] # Debug Assertion
@@ -2566,6 +2571,7 @@
 [ Debug ] fast/dom/HTMLAnchorElement/set-href-attribute-search.html [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/HTMLAnchorElement/set-href-attribute-whitespace.html [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/HTMLAreaElement/area-islink-focus-null-ptr-crash.html [ Skip ] # Debug Assertion
+[ Debug ] fast/dom/HTMLBaseElement/href-attribute-resolves-with-respect-to-document.html [ Skip ] # Debug Assertion
 [ Debug ] fast/dom/HTMLDocument/document-all.html [ Skip ] # Crashing
 [ Debug ] fast/dom/HTMLDocument/document-open-return-value.html [ Skip ] # Crashing
 [ Debug ] fast/dom/HTMLDocument/document-plugins.html [ Skip ] # Crashing
@@ -2578,12 +2584,14 @@
 [ Debug ] fast/dom/HTMLDocument/object-by-name-or-id.html [ Skip ] # Debug Assertion
 [ Debug ] 

[webkit-changes] [181429] branches/safari-600.5-branch/Source

2015-03-11 Thread bshafiei
Title: [181429] branches/safari-600.5-branch/Source








Revision 181429
Author bshaf...@apple.com
Date 2015-03-11 22:57:40 -0700 (Wed, 11 Mar 2015)


Log Message
Versioning.

Modified Paths

branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig (181428 => 181429)

--- branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-12 05:00:59 UTC (rev 181428)
+++ branches/safari-600.5-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 5;
-TINY_VERSION = 12;
+TINY_VERSION = 13;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig (181428 => 181429)

--- branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig	2015-03-12 05:00:59 UTC (rev 181428)
+++ branches/safari-600.5-branch/Source/WebCore/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 5;
-TINY_VERSION = 12;
+TINY_VERSION = 13;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (181428 => 181429)

--- branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-12 05:00:59 UTC (rev 181428)
+++ branches/safari-600.5-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 600;
 MINOR_VERSION = 5;
-TINY_VERSION = 12;
+TINY_VERSION = 13;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig (181428 => 181429)

--- branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-12 05:00:59 UTC (rev 181428)
+++ branches/safari-600.5-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 5;
-TINY_VERSION = 12;
+TINY_VERSION = 13;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);


Modified: branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig (181428 => 181429)

--- branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-03-12 05:00:59 UTC (rev 181428)
+++ branches/safari-600.5-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
@@ -23,7 +23,7 @@
 
 MAJOR_VERSION = 600;
 MINOR_VERSION = 5;
-TINY_VERSION = 12;
+TINY_VERSION = 13;
 MICRO_VERSION = 0;
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);






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


[webkit-changes] [181430] branches/safari-600.1.4.15-branch/Source

2015-03-11 Thread bshafiei
Title: [181430] branches/safari-600.1.4.15-branch/Source








Revision 181430
Author bshaf...@apple.com
Date 2015-03-11 22:57:46 -0700 (Wed, 11 Mar 2015)


Log Message
Versioning.

Modified Paths

branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig
branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig
branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig
branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig
branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig (181429 => 181430)

--- branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
+++ branches/safari-600.1.4.15-branch/Source/_javascript_Core/Configurations/Version.xcconfig	2015-03-12 05:57:46 UTC (rev 181430)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 15;
-NANO_VERSION = 14;
+NANO_VERSION = 15;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig (181429 => 181430)

--- branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Configurations/Version.xcconfig	2015-03-12 05:57:46 UTC (rev 181430)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 15;
-NANO_VERSION = 14;
+NANO_VERSION = 15;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig (181429 => 181430)

--- branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
+++ branches/safari-600.1.4.15-branch/Source/WebInspectorUI/Configurations/Version.xcconfig	2015-03-12 05:57:46 UTC (rev 181430)
@@ -2,7 +2,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 15;
-NANO_VERSION = 14;
+NANO_VERSION = 15;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The system version prefix is based on the current system version.


Modified: branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig (181429 => 181430)

--- branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
+++ branches/safari-600.1.4.15-branch/Source/WebKit/mac/Configurations/Version.xcconfig	2015-03-12 05:57:46 UTC (rev 181430)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 15;
-NANO_VERSION = 14;
+NANO_VERSION = 15;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.


Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig (181429 => 181430)

--- branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-03-12 05:57:40 UTC (rev 181429)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/Configurations/Version.xcconfig	2015-03-12 05:57:46 UTC (rev 181430)
@@ -25,7 +25,7 @@
 MINOR_VERSION = 1;
 TINY_VERSION = 4;
 MICRO_VERSION = 15;
-NANO_VERSION = 14;
+NANO_VERSION = 15;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.






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


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

2015-03-11 Thread roger_fong
Title: [181428] trunk/Source/WebCore








Revision 181428
Author roger_f...@apple.com
Date 2015-03-11 22:00:59 -0700 (Wed, 11 Mar 2015)


Log Message
Media element time no longer updates while scrubbing following r181279.
https://bugs.webkit.org/show_bug.cgi?id=142606.
rdar://problem/20131014

Reviewed by Eric Carlson.

* Modules/mediacontrols/mediaControlsApple.js:
(Controller.prototype.handleWrapperMouseMove):
Update time as a result of a mouse move if we are scrubbing.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js




Diff

Modified: trunk/Source/WebCore/ChangeLog (181427 => 181428)

--- trunk/Source/WebCore/ChangeLog	2015-03-12 04:53:11 UTC (rev 181427)
+++ trunk/Source/WebCore/ChangeLog	2015-03-12 05:00:59 UTC (rev 181428)
@@ -1,3 +1,15 @@
+2015-03-11  Roger Fong  roger_f...@apple.com
+
+Media element time no longer updates while scrubbing following r181279.
+https://bugs.webkit.org/show_bug.cgi?id=142606.
+rdar://problem/20131014
+
+Reviewed by Eric Carlson.
+
+* Modules/mediacontrols/mediaControlsApple.js:
+(Controller.prototype.handleWrapperMouseMove):
+Update time as a result of a mouse move if we are scrubbing.
+
 2015-03-11  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: CSS parser errors in the console should include column numbers


Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (181427 => 181428)

--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-03-12 04:53:11 UTC (rev 181427)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js	2015-03-12 05:00:59 UTC (rev 181428)
@@ -710,6 +710,9 @@
 if (this.controlsAreHidden())
 this.showControls();
 this.resetHideControlsTimer();
+
+if (this.scrubbing)
+this.updateTime();
 
 if (!this.isDragging)
 return;






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


[webkit-changes] [181425] trunk/LayoutTests

2015-03-11 Thread simon . fraser
Title: [181425] trunk/LayoutTests








Revision 181425
Author simon.fra...@apple.com
Date 2015-03-11 20:27:23 -0700 (Wed, 11 Mar 2015)


Log Message
Rename the Mavericks result for input-auto-fill-button.html to use the
correct name.

* platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt: Renamed from LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt


Removed Paths

trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (181424 => 181425)

--- trunk/LayoutTests/ChangeLog	2015-03-12 02:01:42 UTC (rev 181424)
+++ trunk/LayoutTests/ChangeLog	2015-03-12 03:27:23 UTC (rev 181425)
@@ -1,5 +1,12 @@
 2015-03-11  Simon Fraser  simon.fra...@apple.com
 
+Rename the Mavericks result for input-auto-fill-button.html to use the
+correct name.
+
+* platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt: Renamed from LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt.
+
+2015-03-11  Simon Fraser  simon.fra...@apple.com
+
 Mark compositing/backgrounds/background-image-with-negative-zindex.html as
 an image failure, since r179871 was rolled out.
 


Copied: trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt (from rev 181424, trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt) (0 => 181425)

--- trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt	2015-03-12 03:27:23 UTC (rev 181425)
@@ -0,0 +1,41 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+RenderBody {BODY} at (8,8) size 784x584
+  RenderBlock {P} at (0,0) size 784x18
+RenderText {#text} at (0,0) size 503x18
+  text run at (0,0) width 503: This tests that the AutoFill button renders. It can only be tested in the test tool.
+  RenderBlock {DIV} at (0,34) size 784x23
+RenderTextControl {INPUT} at (2,2) size 146x19 [bgcolor=#FF] [border: (2px inset #00)]
+  RenderFlexibleBox {DIV} at (3,3) size 140x13
+RenderBlock {DIV} at (0,0) size 124x13
+RenderText {#text} at (149,2) size 5x18
+  text run at (149,2) width 5:  
+RenderTextControl {INPUT} at (155,2) size 146x19 [bgcolor=#FF] [border: (2px inset #00)]
+  RenderFlexibleBox {DIV} at (3,3) size 140x13
+RenderBlock {DIV} at (0,0) size 124x13
+RenderText {#text} at (302,2) size 5x18
+  text run at (302,2) width 5:  
+RenderTextControl {INPUT} at (308,2) size 146x19 [bgcolor=#FF] [border: (2px inset #00)]
+  RenderFlexibleBox {DIV} at (3,3) size 140x13
+RenderBlock {DIV} at (0,0) size 124x13
+RenderTextControl {INPUT} at (457,2) size 146x19 [bgcolor=#FF] [border: (2px inset #00)]
+  RenderFlexibleBox {DIV} at (3,3) size 140x13
+RenderBlock {DIV} at (0,0) size 124x13
+layer at (13,47) size 123x13
+  RenderBlock {DIV} at (0,0) size 124x13
+layer at (166,47) size 123x13
+  RenderBlock {DIV} at (0,0) size 124x13
+layer at (319,47) size 123x13
+  RenderBlock {DIV} at (0,0) size 124x13
+layer at (468,47) size 123x13
+  RenderBlock {DIV} at (0,0) size 124x13
+layer at (136,47) size 16x13
+  RenderImage {DIV} at (123,0) size 17x13
+layer at (289,47) size 16x13
+  RenderImage {DIV} at (123,0) size 17x13
+layer at (442,47) size 16x13
+  RenderImage {DIV} at (123,0) size 17x13
+layer at (592,47) size 16x13
+  RenderImage {DIV} at (123,0) size 17x13


Property changes: trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button-expected.txt



Added: svn:mime-type

Added: svn:keywords

Added: svn:eol-style

Deleted: trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt (181424 => 181425)

--- trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt	2015-03-12 02:01:42 UTC (rev 181424)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/forms/input-auto-fill-button.txt	2015-03-12 03:27:23 UTC (rev 181425)
@@ -1,41 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-RenderBody {BODY} at (8,8) size 784x584
-  RenderBlock {P} at (0,0) size 784x18
-RenderText {#text} at (0,0) size 503x18
-  text run at (0,0) width 503: This tests that the AutoFill button renders. It can only be tested in the test tool.
-  RenderBlock {DIV} at (0,34) size 784x23
-RenderTextControl {INPUT} at (2,2) size 146x19 [bgcolor=#FF]