date:20140624

[webkit-changes] [170349] trunk/Tools

2014-06-24 Thread commit-queue

Title: [170349] trunk/Tools








Revision 170349
Author commit-qu...@webkit.org
Date 2014-06-23 23:34:21 -0700 (Mon, 23 Jun 2014)


Log Message
[EFL][WK2] Search field is not shown properly on doing ctrl+f on Minibrowser.
https://bugs.webkit.org/show_bug.cgi?id=134025

Patch by Shivakumar JM shiva...@samsung.com on 2014-06-23
Reviewed by Gyuyoung Kim.

Use EVAS_HINT_FILL in evas_object_size_hint_align_set() api.

* MiniBrowser/efl/main.c:
(window_create):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/efl/main.c




Diff

Modified: trunk/Tools/ChangeLog (170348 => 170349)

--- trunk/Tools/ChangeLog	2014-06-24 06:15:25 UTC (rev 170348)
+++ trunk/Tools/ChangeLog	2014-06-24 06:34:21 UTC (rev 170349)
@@ -1,3 +1,15 @@
+2014-06-23  Shivakumar JM  shiva...@samsung.com
+
+[EFL][WK2] Search field is not shown properly on doing ctrl+f on Minibrowser.
+https://bugs.webkit.org/show_bug.cgi?id=134025
+
+Reviewed by Gyuyoung Kim.
+
+Use EVAS_HINT_FILL in evas_object_size_hint_align_set() api.
+
+* MiniBrowser/efl/main.c:
+(window_create):
+
 2014-06-23  Ryuan Choi  ryuan.c...@samsung.com
 
 [EFL] Replace RefPtrEvas_Object with UniquePtrEfl


Modified: trunk/Tools/MiniBrowser/efl/main.c (170348 => 170349)

--- trunk/Tools/MiniBrowser/efl/main.c	2014-06-24 06:15:25 UTC (rev 170348)
+++ trunk/Tools/MiniBrowser/efl/main.c	2014-06-24 06:34:21 UTC (rev 170349)
@@ -1801,7 +1801,7 @@
 window-search.search_bar = elm_box_add(window-elm_window);
 elm_box_horizontal_set(window-search.search_bar, EINA_TRUE);
 evas_object_size_hint_min_set(window-search.search_bar, SEARCH_FIELD_SIZE + 2 * SEARCH_BUTTON_SIZE, 0);
-evas_object_size_hint_align_set(window-search.search_bar, 0.0, EVAS_HINT_FILL);
+evas_object_size_hint_align_set(window-search.search_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
 elm_box_pack_end(vertical_layout, window-search.search_bar);
 
 /* Create Search field */






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

[webkit-changes] [170350] trunk/Websites/webkit.org

2014-06-24 Thread rniwa

Title: [170350] trunk/Websites/webkit.org








Revision 170350
Author rn...@webkit.org
Date 2014-06-23 23:55:21 -0700 (Mon, 23 Jun 2014)


Log Message
Drop the cross organizational support requirement from reviewer nomination policy
https://bugs.webkit.org/show_bug.cgi?id=134240

Reviewed by Gyuyoung Kim.

Removed.

* coding/commit-review-policy.html:

Modified Paths

trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/coding/commit-review-policy.html




Diff

Modified: trunk/Websites/webkit.org/ChangeLog (170349 => 170350)

--- trunk/Websites/webkit.org/ChangeLog	2014-06-24 06:34:21 UTC (rev 170349)
+++ trunk/Websites/webkit.org/ChangeLog	2014-06-24 06:55:21 UTC (rev 170350)
@@ -1,3 +1,14 @@
+2014-06-23  Ryosuke Niwa  rn...@webkit.org
+
+Drop the cross organizational support requirement from reviewer nomination policy
+https://bugs.webkit.org/show_bug.cgi?id=134240
+
+Reviewed by Gyuyoung Kim.
+
+Removed.
+
+* coding/commit-review-policy.html:
+
 2014-05-13  Filip Pizlo  fpi...@apple.com
 
 Updated the files to have the right width.


Modified: trunk/Websites/webkit.org/coding/commit-review-policy.html (170349 => 170350)

--- trunk/Websites/webkit.org/coding/commit-review-policy.html	2014-06-24 06:34:21 UTC (rev 170349)
+++ trunk/Websites/webkit.org/coding/commit-review-policy.html	2014-06-24 06:55:21 UTC (rev 170350)
@@ -99,11 +99,7 @@
 pFor Reviewer status, there is no supervision exception./p
 
 pAll reviewer nominations require the support of four reviewers. One reviewer
-nominates, three reviewers second. Reviewers should be known in the WebKit
-community as a whole, and not just within their own place of employment or
-just within a specific organized project. Therefore, at least one of the
-four supporting reviewers must not share any company or project affiliations
-with the nominee (other than WebKit itself)./p
+nominates, three reviewers second./p
 
 h3Suspension and Revocation of Committer or Reviewer Status/h3
 






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

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

2014-06-24 Thread carlosgc

Title: [170351] trunk/Source/WebCore








Revision 170351
Author carlo...@webkit.org
Date 2014-06-24 00:14:43 -0700 (Tue, 24 Jun 2014)


Log Message
Unreviewed. Fix GTK+ build after r170309.

Skip functions returning arrays in GObject DOM bindings.

* bindings/scripts/CodeGeneratorGObject.pm:
(SkipFunction):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170350 => 170351)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 06:55:21 UTC (rev 170350)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 07:14:43 UTC (rev 170351)
@@ -1,3 +1,12 @@
+2014-06-24  Carlos Garcia Campos  cgar...@igalia.com
+
+Unreviewed. Fix GTK+ build after r170309.
+
+Skip functions returning arrays in GObject DOM bindings.
+
+* bindings/scripts/CodeGeneratorGObject.pm:
+(SkipFunction):
+
 2014-06-23  Ryuan Choi  ryuan.c...@samsung.com
 
 [EFL] Replace RefPtrEvas_Object with UniquePtrEfl


Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (170350 => 170351)

--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2014-06-24 06:55:21 UTC (rev 170350)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm	2014-06-24 07:14:43 UTC (rev 170351)
@@ -305,6 +305,10 @@
 return 1;
 }
 
+if ($codeGenerator-IsTypedArrayType($function-signature-type) || $codeGenerator-GetArrayType($function-signature-type)) {
+return 1;
+}
+
 if ($function-signature-name eq set and $parentNode-extendedAttributes-{TypedArray}) {
 return 1;
 }






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

[webkit-changes] [170352] trunk/Tools

2014-06-24 Thread k . czech

Title: [170352] trunk/Tools








Revision 170352
Author k.cz...@samsung.com
Date 2014-06-24 01:09:21 -0700 (Tue, 24 Jun 2014)


Log Message
[ATK] Remove some unused code from DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=134191

Reviewed by Chris Fleizach.

DumpRenderTree's accessibility code could be removed since GTK and EFL has stopped supporting WK1.

* DumpRenderTree/atk/AccessibilityCallbacks.h: Removed.
* DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp: Removed.
* DumpRenderTree/atk/AccessibilityControllerAtk.cpp: Removed.
* DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp: Removed.
* DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h: Removed.
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp: Removed.

Modified Paths

trunk/Tools/ChangeLog


Removed Paths

trunk/Tools/DumpRenderTree/atk/




Diff

Modified: trunk/Tools/ChangeLog (170351 => 170352)

--- trunk/Tools/ChangeLog	2014-06-24 07:14:43 UTC (rev 170351)
+++ trunk/Tools/ChangeLog	2014-06-24 08:09:21 UTC (rev 170352)
@@ -1,3 +1,19 @@
+2014-06-24  Krzysztof Czech  k.cz...@samsung.com
+
+[ATK] Remove some unused code from DumpRenderTree
+https://bugs.webkit.org/show_bug.cgi?id=134191
+
+Reviewed by Chris Fleizach.
+
+DumpRenderTree's accessibility code could be removed since GTK and EFL has stopped supporting WK1.
+
+* DumpRenderTree/atk/AccessibilityCallbacks.h: Removed.
+* DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp: Removed.
+* DumpRenderTree/atk/AccessibilityControllerAtk.cpp: Removed.
+* DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp: Removed.
+* DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.h: Removed.
+* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp: Removed.
+
 2014-06-23  Shivakumar JM  shiva...@samsung.com
 
 [EFL][WK2] Search field is not shown properly on doing ctrl+f on Minibrowser.






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

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

2014-06-24 Thread carlosgc

Title: [170355] trunk/Source/WebCore








Revision 170355
Author carlo...@webkit.org
Date 2014-06-24 02:15:21 -0700 (Tue, 24 Jun 2014)


Log Message
Unreviewed. Update GObject DOM bindings test results after r170351.

* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (170354 => 170355)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 09:02:18 UTC (rev 170354)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 09:15:21 UTC (rev 170355)
@@ -1,5 +1,12 @@
 2014-06-24  Carlos Garcia Campos  cgar...@igalia.com
 
+Unreviewed. Update GObject DOM bindings test results after r170351.
+
+* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp:
+* bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h:
+
+2014-06-24  Carlos Garcia Campos  cgar...@igalia.com
+
 Unreviewed. Fix GTK+ build after r170309.
 
 Skip functions returning arrays in GObject DOM bindings.


Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp (170354 => 170355)

--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp	2014-06-24 09:02:18 UTC (rev 170354)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.cpp	2014-06-24 09:15:21 UTC (rev 170355)
@@ -292,40 +292,6 @@
 return WebKit::kit(gobjectResult.get());
 }
 
-WebKitDOMDOMString[]* webkit_dom_test_typedefs_string_array_function(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* values, GError** error)
-{
-WebCore::JSMainThreadNullState state;
-g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
-g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING[](values), 0);
-g_return_val_if_fail(!error || !*error, 0);
-WebCore::TestTypedefs* item = WebKit::core(self);
-WebCore::DOMString[]* convertedValues = WebKit::core(values);
-WebCore::ExceptionCode ec = 0;
-RefPtrWebCore::DOMString[] gobjectResult = WTF::getPtr(item-stringArrayFunction(convertedValues, ec));
-if (ec) {
-WebCore::ExceptionCodeDescription ecdesc(ec);
-g_set_error_literal(error, g_quark_from_string(WEBKIT_DOM), ecdesc.code, ecdesc.name);
-}
-return WebKit::kit(gobjectResult.get());
-}
-
-WebKitDOMDOMString[]* webkit_dom_test_typedefs_string_array_function2(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* values, GError** error)
-{
-WebCore::JSMainThreadNullState state;
-g_return_val_if_fail(WEBKIT_DOM_IS_TEST_TYPEDEFS(self), 0);
-g_return_val_if_fail(WEBKIT_DOM_IS_DOM_STRING[](values), 0);
-g_return_val_if_fail(!error || !*error, 0);
-WebCore::TestTypedefs* item = WebKit::core(self);
-WebCore::DOMString[]* convertedValues = WebKit::core(values);
-WebCore::ExceptionCode ec = 0;
-RefPtrWebCore::DOMString[] gobjectResult = WTF::getPtr(item-stringArrayFunction2(convertedValues, ec));
-if (ec) {
-WebCore::ExceptionCodeDescription ecdesc(ec);
-g_set_error_literal(error, g_quark_from_string(WEBKIT_DOM), ecdesc.code, ecdesc.name);
-}
-return WebKit::kit(gobjectResult.get());
-}
-
 void webkit_dom_test_typedefs_method_with_exception(WebKitDOMTestTypedefs* self, GError** error)
 {
 WebCore::JSMainThreadNullState state;


Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h (170354 => 170355)

--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h	2014-06-24 09:02:18 UTC (rev 170354)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestTypedefs.h	2014-06-24 09:15:21 UTC (rev 170355)
@@ -93,32 +93,6 @@
 webkit_dom_test_typedefs_immutable_point_function(WebKitDOMTestTypedefs* self);
 
 /**
- * webkit_dom_test_typedefs_string_array_function:
- * @self: A #WebKitDOMTestTypedefs
- * @values: A #WebKitDOMDOMString[]
- * @error: #GError
- *
- * Returns: (transfer none): A #WebKitDOMDOMString[]
- *
- * Stability: Unstable
-**/
-WEBKIT_API WebKitDOMDOMString[]*
-webkit_dom_test_typedefs_string_array_function(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* values, GError** error);
-
-/**
- * webkit_dom_test_typedefs_string_array_function2:
- * @self: A #WebKitDOMTestTypedefs
- * @values: A #WebKitDOMDOMString[]
- * @error: #GError
- *
- * Returns: (transfer none): A #WebKitDOMDOMString[]
- *
- * Stability: Unstable
-**/
-WEBKIT_API WebKitDOMDOMString[]*
-webkit_dom_test_typedefs_string_array_function2(WebKitDOMTestTypedefs* self, WebKitDOMDOMString[]* values, GError** error);
-
-/**
  * webkit_dom_test_typedefs_method_with_exception:
  * @self: A #WebKitDOMTestTypedefs
  * @error: #GError






___
webkit-changes mailing list
webkit-changes@lists.webkit.org

[webkit-changes] [170357] trunk/Tools

2014-06-24 Thread jfernandez

Title: [170357] trunk/Tools








Revision 170357
Author jfernan...@igalia.com
Date 2014-06-24 03:09:22 -0700 (Tue, 24 Jun 2014)


Log Message
Name moving. Unreviewed.

* Scripts/webkitpy/common/config/contributors.json:

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json




Diff

Modified: trunk/Tools/ChangeLog (170356 => 170357)

--- trunk/Tools/ChangeLog	2014-06-24 09:22:00 UTC (rev 170356)
+++ trunk/Tools/ChangeLog	2014-06-24 10:09:22 UTC (rev 170357)
@@ -1,3 +1,9 @@
+2014-06-24  Javier Fernandez  jfernan...@igalia.com
+
+Name moving. Unreviewed.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
 2014-06-24  Gyuyoung Kim  gyuyoung@samsung.com
 
 Remove EFL WK1 watch category


Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (170356 => 170357)

--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-06-24 09:22:00 UTC (rev 170356)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-06-24 10:09:22 UTC (rev 170357)
@@ -1200,6 +1200,14 @@
 jasonliu
  ]
   },
+  Javier Fernandez : {
+ emails : [
+jfernan...@igalia.com
+ ],
+ nicks : [
+lajava
+ ]
+  },
   Jay Civelli : {
  emails : [
 jcive...@chromium.org
@@ -2790,14 +2798,6 @@
  nicks : [
 zdobersek
  ]
-  },
-  Javier Fernandez : {
- emails : [
-jfernan...@igalia.com
- ],
- nicks : [
-lajava
- ]
   }
},
Contributors : {






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

[webkit-changes] [170358] trunk/Source/WebKit/mac

2014-06-24 Thread commit-queue

Title: [170358] trunk/Source/WebKit/mac








Revision 170358
Author commit-qu...@webkit.org
Date 2014-06-24 04:02:42 -0700 (Tue, 24 Jun 2014)


Log Message
REGRESSION(r170235): Remove incorrect ifdef guard
https://bugs.webkit.org/show_bug.cgi?id=134246

Patch by Eva Balazsfalvi evab.u-sze...@partner.samsung.com on 2014-06-24
Reviewed by Csaba Osztrogonác.

* WebView/WebView.mm:
(-[WebView _visibilityState]):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (170357 => 170358)

--- trunk/Source/WebKit/mac/ChangeLog	2014-06-24 10:09:22 UTC (rev 170357)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-06-24 11:02:42 UTC (rev 170358)
@@ -1,3 +1,13 @@
+2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
+
+REGRESSION(r170235): Remove incorrect ifdef guard
+https://bugs.webkit.org/show_bug.cgi?id=134246
+
+Reviewed by Csaba Osztrogonác.
+
+* WebView/WebView.mm:
+(-[WebView _visibilityState]):
+
 2014-06-23  Anders Carlsson  ander...@apple.com
 
 Fix build.


Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (170357 => 170358)

--- trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-24 10:09:22 UTC (rev 170357)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-24 11:02:42 UTC (rev 170358)
@@ -4325,10 +4325,8 @@
 
 - (WebPageVisibilityState)_visibilityState
 {
-#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 if (_private-page)
 return kit(_private-page-visibilityState());
-#endif
 return WebPageVisibilityStateVisible;
 }
 






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

[webkit-changes] [170359] trunk

2014-06-24 Thread commit-queue

Title: [170359] trunk








Revision 170359
Author commit-qu...@webkit.org
Date 2014-06-24 04:09:22 -0700 (Tue, 24 Jun 2014)


Log Message
Source/WebCore: [ATK] Don't ignore links rendered as blocks.
https://bugs.webkit.org/show_bug.cgi?id=130941

Patch by Jarek Czekalski jarekc...@poczta.onet.pl on 2014-06-24
Reviewed by Mario Sanchez Prada.

* /m/usr/src/webkit-trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(WebCore::AccessibilityObject::objectFocusedAndCaretOffsetUnignored): Don't ignore links
when they are renderered with display:block.

LayoutTests: [ATK] Extended the test for accessibility of text inside span block in a block
with the tests for caret movements in these cases.
https://bugs.webkit.org/show_bug.cgi?id=130941

Patch by Jarek Czekalski jarekc...@poczta.onet.pl on 2014-06-24
Reviewed by Mario Sanchez Prada.

* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt:
* platform/gtk/accessibility/text-in-span-block-in-a-block.html:
Added testing for text-caret-moved signal. Added one more a element to the set.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt
trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (170358 => 170359)

--- trunk/LayoutTests/ChangeLog	2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/ChangeLog	2014-06-24 11:09:22 UTC (rev 170359)
@@ -1,3 +1,15 @@
+2014-06-24  Jarek Czekalski  jarekc...@poczta.onet.pl
+
+[ATK] Extended the test for accessibility of text inside span block in a block
+with the tests for caret movements in these cases.
+https://bugs.webkit.org/show_bug.cgi?id=130941
+
+Reviewed by Mario Sanchez Prada.
+
+* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt: 
+* platform/gtk/accessibility/text-in-span-block-in-a-block.html:
+Added testing for text-caret-moved signal. Added one more a element to the set.
+
 2014-06-24  Michał Pakuła vel Rutka  m.pak...@samsung.com
 
 [EFL] Merge efl-wk2 and efl test expectations files


Modified: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (170358 => 170359)

--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt	2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt	2014-06-24 11:09:22 UTC (rev 170359)
@@ -10,6 +10,7 @@
 ,after
 before,
 six
+no span here
 This tests that text inside a block inside span block is accessible.
 
 On success, you will see a series of PASS messages, followed by TEST COMPLETE.
@@ -17,16 +18,25 @@
 
 PASS accText is AXValue:one
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS accText is AXValue:two
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS accText is AXValue:three
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS accText is AXValue:before,four,after
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS accText is AXValue:five,after
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS accText is AXValue:before,six
 PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
+PASS accText is AXValue:nospanhere
+PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is Link|1
 PASS successfullyParsed is true
 
 TEST COMPLETE


Modified: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (170358 => 170359)

--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html	2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html	2014-06-24 11:09:22 UTC (rev 170359)
@@ -41,6 +41,8 @@
 
 a id=id6 href="" style=display:block;before,span style=display:block;six/span/a
 
+a id=id7 href="" style=display:block;no span here/a
+
 div id=console/div
 
 script
@@ -72,7 +74,7 @@
 if (window.accessibilityController) {
 var i, linkText, accText, id;
 accessibilityController.addNotificationListener(globalListener)
-for (i = 1; i = 6; i++) {
+for (i = 1; i = 7; i++) {
 id = 'id' + i;
 elem = accessibilityController.accessibleElementById(id);
 linkText = stripNonWhite(document.links[id].textContent);
@@ -80,8 +82,7 @@
 shouldBeEqualToString(accText, AXValue: + linkText);
 caretMovedData = '';
 shouldBe(setCaretOffset(elem, 1), true);
-// FIXME: This line will be added after fixing bug #130941.
-//shouldBeEqualToString(caretMovedData, Link|1);
+shouldBeEqualToString(caretMovedData, Link|1);
 }
 }
 


Modified: trunk/Source/WebCore/ChangeLog

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

2014-06-24 Thread andersca

Title: [170361] trunk/Source/WebKit2








Revision 170361
Author ander...@apple.com
Date 2014-06-24 07:38:17 -0700 (Tue, 24 Jun 2014)


Log Message
WKWebView doesn't respect -[UIScrollView contentInset]
https://bugs.webkit.org/show_bug.cgi?id=134230
rdar://problem/17429107

Reviewed by Tim Horton.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
Call initWithFrame and pass the WKWebView along.

(-[WKWebView _adjustedContentOffset:]):
New helper method that takes a content offset as a CGPoint and offsets it by the computed content inset.

(-[WKWebView _computedContentInset]):
New helper method that returns the _obscuredInsets, or if it's zero, the scroll view's content inset.

(-[WKWebView _processDidExit]):
Use _computedContentInset.

(-[WKWebView _didCommitLayerTree:WebKit::]):
use _computedContentInset.

(-[WKWebView _dynamicViewportUpdateChangedTargetToScale:position:]):
Use _computedContentInset.

(-[WKWebView _scrollToContentOffset:WebCore::]):
Use _computedContentInset.

(-[WKWebView _updateVisibleContentRects]):
If we have a custom content view, call web_computedContentInsetDidChange.

(-[WKWebView _setObscuredInsets:]):
Don't call web_setObscuredInsets: if we have a custom content view.

* UIProcess/API/Cocoa/WKWebViewInternal.h:
Add new methods.

* UIProcess/Cocoa/WKWebViewContentProvider.h:
Add new methods.

* UIProcess/ios/WKPDFView.mm:
(-[WKPDFView web_initWithFrame:webView:]):
Set the _webView and _scrollView ivars.

(-[WKPDFView _offsetForPageNumberIndicator]):
Get the computed content offset from the WKWebView.

(-[WKPDFView web_computedContentInsetDidChange]):
Update the page indicator.

(-[WKPDFView initWithFrame:]): Deleted.
(-[WKPDFView web_setObscuredInsets:]): Deleted.

* UIProcess/ios/WKScrollView.mm:
(-[WKScrollView setContentInset:]):
Call _updateVisibleContentRects.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h
trunk/Source/WebKit2/UIProcess/Cocoa/WKWebViewContentProvider.h
trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm
trunk/Source/WebKit2/UIProcess/ios/WKScrollView.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170360 => 170361)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 14:24:05 UTC (rev 170360)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 14:38:17 UTC (rev 170361)
@@ -1,3 +1,62 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+WKWebView doesn't respect -[UIScrollView contentInset]
+https://bugs.webkit.org/show_bug.cgi?id=134230
+rdar://problem/17429107
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _setHasCustomContentView:loadedMIMEType:WTF::]):
+Call initWithFrame and pass the WKWebView along.
+
+(-[WKWebView _adjustedContentOffset:]):
+New helper method that takes a content offset as a CGPoint and offsets it by the computed content inset.
+
+(-[WKWebView _computedContentInset]):
+New helper method that returns the _obscuredInsets, or if it's zero, the scroll view's content inset.
+
+(-[WKWebView _processDidExit]):
+Use _computedContentInset.
+
+(-[WKWebView _didCommitLayerTree:WebKit::]):
+use _computedContentInset.
+
+(-[WKWebView _dynamicViewportUpdateChangedTargetToScale:position:]):
+Use _computedContentInset.
+
+(-[WKWebView _scrollToContentOffset:WebCore::]):
+Use _computedContentInset.
+
+(-[WKWebView _updateVisibleContentRects]):
+If we have a custom content view, call web_computedContentInsetDidChange.
+
+(-[WKWebView _setObscuredInsets:]):
+Don't call web_setObscuredInsets: if we have a custom content view.
+
+* UIProcess/API/Cocoa/WKWebViewInternal.h:
+Add new methods.
+
+* UIProcess/Cocoa/WKWebViewContentProvider.h:
+Add new methods.
+
+* UIProcess/ios/WKPDFView.mm:
+(-[WKPDFView web_initWithFrame:webView:]):
+Set the _webView and _scrollView ivars.
+
+(-[WKPDFView _offsetForPageNumberIndicator]):
+Get the computed content offset from the WKWebView.
+
+(-[WKPDFView web_computedContentInsetDidChange]):
+Update the page indicator.
+
+(-[WKPDFView initWithFrame:]): Deleted.
+(-[WKPDFView web_setObscuredInsets:]): Deleted.
+
+* UIProcess/ios/WKScrollView.mm:
+(-[WKScrollView setContentInset:]):
+Call _updateVisibleContentRects.
+
 2014-06-23  Jaehun Lim  ljaehun@samsung.com
 
 Unreviewed, fix build warning.


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170360 => 170361)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-06-24 14:24:05 UTC (rev 170360)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-06-24 14:38:17 UTC (rev 170361)
@@ -589,7 +589,7 @@
 
 Class

[webkit-changes] [170362] trunk/Tools

2014-06-24 Thread mmaxfield

Title: [170362] trunk/Tools








Revision 170362
Author mmaxfi...@apple.com
Date 2014-06-24 09:05:11 -0700 (Tue, 24 Jun 2014)


Log Message
[iOS] getsectdata() is deprecated and we use it in DRT
https://bugs.webkit.org/show_bug.cgi?id=134122

Reviewed by Alexey Proskuryakov.

Migrate to using magic linker symbols.

No tests because there should be no behavior change

* DumpRenderTree/mac/DumpRenderTree.mm:
(activateFontsIOS):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm




Diff

Modified: trunk/Tools/ChangeLog (170361 => 170362)

--- trunk/Tools/ChangeLog	2014-06-24 14:38:17 UTC (rev 170361)
+++ trunk/Tools/ChangeLog	2014-06-24 16:05:11 UTC (rev 170362)
@@ -1,3 +1,17 @@
+2014-06-20  Myles C. Maxfield  mmaxfi...@apple.com
+
+[iOS] getsectdata() is deprecated and we use it in DRT
+https://bugs.webkit.org/show_bug.cgi?id=134122
+
+Reviewed by Alexey Proskuryakov.
+
+Migrate to using magic linker symbols.
+
+No tests because there should be no behavior change
+
+* DumpRenderTree/mac/DumpRenderTree.mm:
+(activateFontsIOS):
+
 2014-06-24  Javier Fernandez  jfernan...@igalia.com
 
 Name moving. Unreviewed.


Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (170361 => 170362)

--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2014-06-24 14:38:17 UTC (rev 170361)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2014-06-24 16:05:11 UTC (rev 170362)
@@ -514,50 +514,48 @@
 activateTestingFonts();
 }
 #else
-static void activateFontsIOS()
+static void activateFontIOS(const uint8_t* fontData, unsigned long length, std::string sectionName)
 {
-static const char* fontSectionNames[] = {
-Ahem,
-WeightWatcher100,
-WeightWatcher200,
-WeightWatcher300,
-WeightWatcher400,
-WeightWatcher500,
-WeightWatcher600,
-WeightWatcher700,
-WeightWatcher800,
-WeightWatcher900,
-0
-};
+CGDataProviderRef data = "" fontData, length, nullptr);
+if (!data) {
+fprintf(stderr, Failed to create CGDataProviderRef for the %s font.\n, sectionName.c_str());
+exit(1);
+}
 
-for (unsigned i = 0; fontSectionNames[i]; ++i) {
-unsigned long fontDataLength;
-char* fontData = getsectdata(__DATA, fontSectionNames[i], fontDataLength);
-if (!fontData) {
-fprintf(stderr, Failed to locate the %s font.\n, fontSectionNames[i]);
-exit(1);
-}
+CGFontRef cgFont = CGFontCreateWithDataProvider(data);
+CGDataProviderRelease(data);
+if (!cgFont) {
+fprintf(stderr, Failed to create CGFontRef for the %s font.\n, sectionName.c_str());
+exit(1);
+}
 
-CGDataProviderRef data = "" fontData, fontDataLength, NULL);
-if (!data) {
-fprintf(stderr, Failed to create CGDataProviderRef for the %s font.\n, fontSectionNames[i]);
-exit(1);
-}
-
-CGFontRef cgFont = CGFontCreateWithDataProvider(data);
-CGDataProviderRelease(data);
-if (!cgFont) {
-fprintf(stderr, Failed to create CGFontRef for the %s font.\n, fontSectionNames[i]);
-exit(1);
-}
-
-if (!GSFontAddCGFont(cgFont)) {
-fprintf(stderr, Failed to add CGFont to GraphicsServices for the %s font.\n, fontSectionNames[i]);
-exit(1);
-}
-CGFontRelease(cgFont);
+if (!GSFontAddCGFont(cgFont)) {
+fprintf(stderr, Failed to add CGFont to GraphicsServices for the %s font.\n, sectionName.c_str());
+exit(1);
 }
+CGFontRelease(cgFont);
 }
+
+static void activateFontsIOS()
+{
+// __asm() requires a string literal, so we can't do this as either local variables or template parameters.
+#define fontData(sectionName) \
+{ \
+extern const uint8_t start __asm(section$start$__DATA$ sectionName); \
+extern const uint8_t end __asm(section$end$__DATA$ sectionName); \
+activateFontIOS(start, end - start, sectionName); \
+}
+fontData(Ahem);
+fontData(WeightWatcher100);
+fontData(WeightWatcher200);
+fontData(WeightWatcher300);
+fontData(WeightWatcher400);
+fontData(WeightWatcher500);
+fontData(WeightWatcher600);
+fontData(WeightWatcher700);
+fontData(WeightWatcher800);
+fontData(WeightWatcher900);
+}
 #endif // !PLATFORM(IOS)
 
 
@@ -1028,11 +1026,11 @@
 {accelerated-drawing, no_argument, useAcceleratedDrawing, YES},
 {gc-between-tests, no_argument, gcBetweenTests, YES},
 {no-timeout, no_argument, useTimeoutWatchdog, NO},
-{NULL, 0, NULL, 0}
+{nullptr, 0, nullptr, 0}
 };
 
 int option;
-while ((option = getopt_long(argc, (char * const *)argv, , options, NULL)) != -1) {
+while ((option = getopt_long(argc, (char * const *)argv, , options, nullptr)) != -1) {
 switch (option) {
 case '?':   // unknown or

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

2014-06-24 Thread jer . noble

Title: [170363] trunk/Source/WebCore








Revision 170363
Author jer.no...@apple.com
Date 2014-06-24 09:14:34 -0700 (Tue, 24 Jun 2014)


Log Message
[MSE] Add null-check in sourceBufferPrivateAppendComplete().
https://bugs.webkit.org/show_bug.cgi?id=133230

Reviewed by Eric Carlson.

* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::sourceBufferPrivateAppendComplete): Bail early if the
SourceBuffer has been removed from the MediaSource.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170362 => 170363)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 16:05:11 UTC (rev 170362)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 16:14:34 UTC (rev 170363)
@@ -1,3 +1,14 @@
+2014-06-24  Jer Noble  jer.no...@apple.com
+
+[MSE] Add null-check in sourceBufferPrivateAppendComplete().
+https://bugs.webkit.org/show_bug.cgi?id=133230
+
+Reviewed by Eric Carlson.
+
+* Modules/mediasource/SourceBuffer.cpp:
+(WebCore::SourceBuffer::sourceBufferPrivateAppendComplete): Bail early if the 
+SourceBuffer has been removed from the MediaSource.
+
 2014-06-24  Commit Queue  commit-qu...@webkit.org
 
 Unreviewed, rolling out r170337.


Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (170362 => 170363)

--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2014-06-24 16:05:11 UTC (rev 170362)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp	2014-06-24 16:14:34 UTC (rev 170363)
@@ -498,6 +498,9 @@
 
 void SourceBuffer::sourceBufferPrivateAppendComplete(SourceBufferPrivate*, AppendResult result)
 {
+if (isRemoved())
+return;
+
 // Section 3.5.5 Buffer Append Algorithm, ctd.
 // https://dvcs.w3.org/hg/html-media/raw-file/default/media-source/media-source.html#sourcebuffer-buffer-append
 






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

[webkit-changes] [170364] trunk/Source

2014-06-24 Thread commit-queue

Title: [170364] trunk/Source








Revision 170364
Author commit-qu...@webkit.org
Date 2014-06-24 09:18:52 -0700 (Tue, 24 Jun 2014)


Log Message
Fix unused parameter warnings if inspector is disabled
https://bugs.webkit.org/show_bug.cgi?id=134244

Patch by Eva Balazsfalvi evab.u-sze...@partner.samsung.com on 2014-06-24
Reviewed by Zalan Bujtas.

Source/WebCore:
No new tests, no behavior change.

* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::startProfiling):
(WebCore::InspectorInstrumentation::stopProfiling):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didFinishXHRLoading):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):

Source/WebKit2:
* WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
(WKBundleInspectorShow):
(WKBundleInspectorClose):
(WKBundleInspectorEvaluateScriptForTest):
(WKBundleInspectorSetPageProfilingEnabled):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h
trunk/Source/WebCore/inspector/InspectorInstrumentation.h
trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170363 => 170364)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 16:18:52 UTC (rev 170364)
@@ -1,3 +1,20 @@
+2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
+
+Fix unused parameter warnings if inspector is disabled
+https://bugs.webkit.org/show_bug.cgi?id=134244
+
+Reviewed by Zalan Bujtas.
+
+No new tests, no behavior change.
+
+* inspector/InspectorConsoleInstrumentation.h:
+(WebCore::InspectorInstrumentation::startProfiling):
+(WebCore::InspectorInstrumentation::stopProfiling):
+* inspector/InspectorInstrumentation.h:
+(WebCore::InspectorInstrumentation::didFinishXHRLoading):
+* loader/cache/CachedResourceLoader.cpp:
+(WebCore::CachedResourceLoader::shouldContinueAfterNotifyingLoadedFromMemoryCache):
+
 2014-06-24  Jer Noble  jer.no...@apple.com
 
 [MSE] Add null-check in sourceBufferPrivateAppendComplete().


Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (170363 => 170364)

--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h	2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h	2014-06-24 16:18:52 UTC (rev 170364)
@@ -180,6 +180,7 @@
 startProfilingImpl(instrumentingAgents, exec, title);
 #else
 UNUSED_PARAM(page);
+UNUSED_PARAM(exec);
 UNUSED_PARAM(title);
 #endif
 }
@@ -191,6 +192,7 @@
 return stopProfilingImpl(instrumentingAgents, exec, title);
 #else
 UNUSED_PARAM(page);
+UNUSED_PARAM(exec);
 UNUSED_PARAM(title);
 #endif
 return nullptr;


Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (170363 => 170364)

--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2014-06-24 16:18:52 UTC (rev 170364)
@@ -1439,6 +1439,7 @@
 UNUSED_PARAM(url);
 UNUSED_PARAM(sendURL);
 UNUSED_PARAM(sendLineNumber);
+UNUSED_PARAM(sendColumnNumber);
 #endif
 }
 


Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (170363 => 170364)

--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp	2014-06-24 16:18:52 UTC (rev 170364)
@@ -401,6 +401,8 @@
 #if ENABLE(INSPECTOR)
 if (request.resourceRequest().hiddenFromInspector())
 newRequest.setHiddenFromInspector(true);
+#else
+UNUSED_PARAM(request);
 #endif
 frame()-loader().loadedResourceFromMemoryCache(resource, newRequest);
 


Modified: trunk/Source/WebKit2/ChangeLog (170363 => 170364)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 16:14:34 UTC (rev 170363)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 16:18:52 UTC (rev 170364)
@@ -1,3 +1,16 @@
+2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
+
+Fix unused parameter warnings if inspector is disabled
+https://bugs.webkit.org/show_bug.cgi?id=134244
+
+Reviewed by Zalan Bujtas.
+
+* WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
+(WKBundleInspectorShow):
+(WKBundleInspectorClose):
+(WKBundleInspectorEvaluateScriptForTest):
+(WKBundleInspectorSetPageProfilingEnabled):
+
 2014-06-24  Anders Carlsson  ander...@apple.com
 
 WKWebView doesn't respect -[UIScrollView contentInset]


Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp (170363 => 170364)

---

[webkit-changes] [170366] trunk/Tools/Scripts/webkitpy/common/config/contributors.json

2014-06-24 Thread mahesh . kulkarni

Title: [170366] trunk/Tools/Scripts/webkitpy/common/config/contributors.json








Revision 170366
Author mahesh.kulka...@nokia.com
Date 2014-06-24 09:47:33 -0700 (Tue, 24 Jun 2014)


Log Message
Unreviewed, update my list of email addresses.

Modified Paths

trunk/Tools/Scripts/webkitpy/common/config/contributors.json




Diff

Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (170365 => 170366)

--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-06-24 16:18:53 UTC (rev 170365)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json	2014-06-24 16:47:33 UTC (rev 170366)
@@ -1709,12 +1709,12 @@
   },
   Mahesh Kulkarni : {
  emails : [
-mahesh.kulka...@nokia.com,
-mahe...@webkit.org
+mahe...@webkit.org,
+mahesh...@samsung.com
  ],
  expertise : The Qt port, Geolocation,
  nicks : [
-maheshk
+maheshkk
  ]
   },
   Manuel Rego Casasnovas : {






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

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

2014-06-24 Thread jer . noble

Title: [170367] trunk/Source/WebCore








Revision 170367
Author jer.no...@apple.com
Date 2014-06-24 10:05:09 -0700 (Tue, 24 Jun 2014)


Log Message
REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()
https://bugs.webkit.org/show_bug.cgi?id=134253

Rubber-stamped by Eric Carlson.

Now that seekWithTolerance() has been split up into an asyncronous section, the null-checks in seekWithTolerance()
need to be re-performed in seekTimerFired(), in case the m_player has been cleared between when the seek was initiated
and when the asynchronous section is performed.

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::seekTimerFired):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170366 => 170367)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 16:47:33 UTC (rev 170366)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 17:05:09 UTC (rev 170367)
@@ -1,3 +1,17 @@
+2014-06-24  Jer Noble  jer.no...@apple.com
+
+REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()
+https://bugs.webkit.org/show_bug.cgi?id=134253
+
+Rubber-stamped by Eric Carlson.
+
+Now that seekWithTolerance() has been split up into an asyncronous section, the null-checks in seekWithTolerance()
+need to be re-performed in seekTimerFired(), in case the m_player has been cleared between when the seek was initiated
+and when the asynchronous section is performed.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::seekTimerFired):
+
 2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
 
 Fix unused parameter warnings if inspector is disabled


Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (170366 => 170367)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-06-24 16:47:33 UTC (rev 170366)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-06-24 17:05:09 UTC (rev 170367)
@@ -2379,6 +2379,11 @@
 
 void HTMLMediaElement::seekTimerFired(TimerHTMLMediaElement)
 {
+if (!m_player) {
+m_seeking = false;
+return;
+}
+
 ASSERT(m_pendingSeek);
 double now = m_pendingSeek-now;
 double time = m_pendingSeek-targetTime;






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

[webkit-changes] [170368] trunk/Source/WebKit/mac

2014-06-24 Thread andersca

Title: [170368] trunk/Source/WebKit/mac








Revision 170368
Author ander...@apple.com
Date 2014-06-24 10:17:27 -0700 (Tue, 24 Jun 2014)


Log Message
Remove unused history visit code from WebHistoryItem
https://bugs.webkit.org/show_bug.cgi?id=134201

Reviewed by Sam Weinig.

* History/HistoryPropertyList.h:
* History/HistoryPropertyList.mm:
(HistoryPropertyListWriter::HistoryPropertyListWriter):
(HistoryPropertyListWriter::writeHistoryItem):
* History/WebHistory.mm:
(-[WebHistoryPrivate visitedURL:withTitle:]):
(-[WebHistoryPrivate addItem:discardDuplicate:]):
(-[WebHistory _visitedURL:withTitle:method:wasFailure:]):
(-[WebHistoryPrivate visitedURL:withTitle:increaseVisitCount:]): Deleted.
(-[WebHistory _visitedURL:withTitle:method:wasFailure:increaseVisitCount:]): Deleted.
* History/WebHistoryInternal.h:
* History/WebHistoryItem.mm:
(-[WebHistoryItem copyWithZone:]):
(-[WebHistoryItem initFromDictionaryRepresentation:]):
(-[WebHistoryItem _visitedWithTitle:]):
(-[WebHistoryItem setVisitCount:]): Deleted.
(-[WebHistoryItem _mergeAutoCompleteHints:]): Deleted.
(-[WebHistoryItem _visitedWithTitle:increaseVisitCount:]): Deleted.
(-[WebHistoryItem _recordInitialVisit]): Deleted.
(timeToDay): Deleted.
(-[WebHistoryItem _padDailyCountsForNewVisit:]): Deleted.
(-[WebHistoryItem _collapseDailyVisitsToWeekly]): Deleted.
(-[WebHistoryItem _recordVisitAtTime:increaseVisitCount:]): Deleted.
(-[WebHistoryItem _setLastVisitedTimeInterval:]): Deleted.
* History/WebHistoryItemInternal.h:
* History/WebHistoryItemPrivate.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::updateGlobalHistory):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/History/HistoryPropertyList.h
trunk/Source/WebKit/mac/History/HistoryPropertyList.mm
trunk/Source/WebKit/mac/History/WebHistory.mm
trunk/Source/WebKit/mac/History/WebHistoryInternal.h
trunk/Source/WebKit/mac/History/WebHistoryItem.mm
trunk/Source/WebKit/mac/History/WebHistoryItemInternal.h
trunk/Source/WebKit/mac/History/WebHistoryItemPrivate.h
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (170367 => 170368)

--- trunk/Source/WebKit/mac/ChangeLog	2014-06-24 17:05:09 UTC (rev 170367)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-06-24 17:17:27 UTC (rev 170368)
@@ -1,3 +1,39 @@
+2014-06-23  Anders Carlsson  ander...@apple.com
+
+Remove unused history visit code from WebHistoryItem
+https://bugs.webkit.org/show_bug.cgi?id=134201
+
+Reviewed by Sam Weinig.
+
+* History/HistoryPropertyList.h:
+* History/HistoryPropertyList.mm:
+(HistoryPropertyListWriter::HistoryPropertyListWriter):
+(HistoryPropertyListWriter::writeHistoryItem):
+* History/WebHistory.mm:
+(-[WebHistoryPrivate visitedURL:withTitle:]):
+(-[WebHistoryPrivate addItem:discardDuplicate:]):
+(-[WebHistory _visitedURL:withTitle:method:wasFailure:]):
+(-[WebHistoryPrivate visitedURL:withTitle:increaseVisitCount:]): Deleted.
+(-[WebHistory _visitedURL:withTitle:method:wasFailure:increaseVisitCount:]): Deleted.
+* History/WebHistoryInternal.h:
+* History/WebHistoryItem.mm:
+(-[WebHistoryItem copyWithZone:]):
+(-[WebHistoryItem initFromDictionaryRepresentation:]):
+(-[WebHistoryItem _visitedWithTitle:]):
+(-[WebHistoryItem setVisitCount:]): Deleted.
+(-[WebHistoryItem _mergeAutoCompleteHints:]): Deleted.
+(-[WebHistoryItem _visitedWithTitle:increaseVisitCount:]): Deleted.
+(-[WebHistoryItem _recordInitialVisit]): Deleted.
+(timeToDay): Deleted.
+(-[WebHistoryItem _padDailyCountsForNewVisit:]): Deleted.
+(-[WebHistoryItem _collapseDailyVisitsToWeekly]): Deleted.
+(-[WebHistoryItem _recordVisitAtTime:increaseVisitCount:]): Deleted.
+(-[WebHistoryItem _setLastVisitedTimeInterval:]): Deleted.
+* History/WebHistoryItemInternal.h:
+* History/WebHistoryItemPrivate.h:
+* WebCoreSupport/WebFrameLoaderClient.mm:
+(WebFrameLoaderClient::updateGlobalHistory):
+
 2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
 
 REGRESSION(r170235): Remove incorrect ifdef guard


Modified: trunk/Source/WebKit/mac/History/HistoryPropertyList.h (170367 => 170368)

--- trunk/Source/WebKit/mac/History/HistoryPropertyList.h	2014-06-24 17:05:09 UTC (rev 170367)
+++ trunk/Source/WebKit/mac/History/HistoryPropertyList.h	2014-06-24 17:17:27 UTC (rev 170368)
@@ -47,16 +47,12 @@
 virtual void writeObjects(BinaryPropertyListObjectStream);
 virtual UInt8* buffer(size_t);
 
-const String m_dailyVisitCountsKey;
 const String m_displayTitleKey;
 const String m_lastVisitWasFailureKey;
-const String m_lastVisitWasHTTPNonGetKey;
 const String m_lastVisitedDateKey;
 const String m_redirectURLsKey;
 const String m_titleKey;
 const String m_urlKey;
-const String

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

2014-06-24 Thread andersca

Title: [170369] trunk/Source/WebKit2








Revision 170369
Author ander...@apple.com
Date 2014-06-24 10:18:26 -0700 (Tue, 24 Jun 2014)


Log Message
Add missing semicolon.

* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _updateVisibleContentRects]):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170368 => 170369)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 17:17:27 UTC (rev 170368)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 17:18:26 UTC (rev 170369)
@@ -1,3 +1,10 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Add missing semicolon.
+
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _updateVisibleContentRects]):
+
 2014-06-24  Eva Balazsfalvi  evab.u-sze...@partner.samsung.com
 
 Fix unused parameter warnings if inspector is disabled


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170368 => 170369)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-06-24 17:17:27 UTC (rev 170368)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm	2014-06-24 17:18:26 UTC (rev 170369)
@@ -1283,7 +1283,7 @@
 {
 if (![self usesStandardContentView]) {
 [_customContentView web_computedContentInsetDidChange];
-return
+return;
 }
 
 if (_delayUpdateVisibleContentRects) {






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

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

2014-06-24 Thread commit-queue

Title: [170370] trunk/Source/WebCore








Revision 170370
Author commit-qu...@webkit.org
Date 2014-06-24 10:20:36 -0700 (Tue, 24 Jun 2014)


Log Message
Don't set AudioSession active while interrupted.
https://bugs.webkit.org/show_bug.cgi?id=134239

Patch by Jeremy Jones jere...@apple.com on 2014-06-24
Reviewed by Eric Carlson.

To activate the AudioSession there must be a session with audio or video
and being playing or paused.

* platform/audio/MediaSessionManager.cpp:
(WebCore::MediaSessionManager::hasActive): added
(WebCore::MediaSessionManager::beginInterruption): updateSessionState
(WebCore::MediaSessionManager::sessionWillBeginPlayback): updateSessionState
* platform/audio/MediaSessionManager.h: declare hasActive()
* platform/audio/mac/MediaSessionManagerMac.cpp:
(MediaSessionManager::updateSessionState): use hasActive()

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp
trunk/Source/WebCore/platform/audio/MediaSessionManager.h
trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170369 => 170370)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 17:20:36 UTC (rev 170370)
@@ -1,3 +1,21 @@
+2014-06-24  Jeremy Jones  jere...@apple.com
+
+Don't set AudioSession active while interrupted.
+https://bugs.webkit.org/show_bug.cgi?id=134239
+
+Reviewed by Eric Carlson.
+
+To activate the AudioSession there must be a session with audio or video
+and being playing or paused.
+
+* platform/audio/MediaSessionManager.cpp:
+(WebCore::MediaSessionManager::hasActive): added
+(WebCore::MediaSessionManager::beginInterruption): updateSessionState
+(WebCore::MediaSessionManager::sessionWillBeginPlayback): updateSessionState
+* platform/audio/MediaSessionManager.h: declare hasActive()
+* platform/audio/mac/MediaSessionManagerMac.cpp:
+(MediaSessionManager::updateSessionState): use hasActive()
+
 2014-06-24  Jer Noble  jer.no...@apple.com
 
 REGRESSION(r170336): Crash in HTMLMediaElement::seekTimerFired()


Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp (170369 => 170370)

--- trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp	2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp	2014-06-24 17:20:36 UTC (rev 170370)
@@ -68,6 +68,16 @@
 return false;
 }
 
+bool MediaSessionManager::hasActive() const
+{
+for (auto* session : m_sessions) {
+if (session-mediaType() != MediaSession::None  (session-state() == MediaSession::State::Playing || session-state() == MediaSession::State::Paused))
+return true;
+}
+
+return false;
+}
+
 int MediaSessionManager::count(MediaSession::MediaType type) const
 {
 ASSERT(type = MediaSession::None  type = MediaSession::WebAudio);
@@ -89,6 +99,7 @@
 VectorMediaSession* sessions = m_sessions;
 for (auto* session : sessions)
 session-beginInterruption(type);
+updateSessionState();
 }
 
 void MediaSessionManager::endInterruption(MediaSession::EndInterruptionFlags flags)
@@ -185,6 +196,8 @@
 if (restrictions  ConcurrentPlaybackNotPermitted)
 oneSession-pauseSession();
 }
+
+updateSessionState();
 }
 
 void MediaSessionManager::sessionWillEndPlayback(MediaSession session)


Modified: trunk/Source/WebCore/platform/audio/MediaSessionManager.h (170369 => 170370)

--- trunk/Source/WebCore/platform/audio/MediaSessionManager.h	2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/MediaSessionManager.h	2014-06-24 17:20:36 UTC (rev 170370)
@@ -58,6 +58,7 @@
 virtual ~MediaSessionManager() { }
 
 bool has(MediaSession::MediaType) const;
+bool hasActive() const;
 int count(MediaSession::MediaType) const;
 
 void beginInterruption(MediaSession::InterruptionType);


Modified: trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp (170369 => 170370)

--- trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp	2014-06-24 17:18:26 UTC (rev 170369)
+++ trunk/Source/WebCore/platform/audio/mac/MediaSessionManagerMac.cpp	2014-06-24 17:20:36 UTC (rev 170370)
@@ -55,10 +55,7 @@
 #endif
 
 #if PLATFORM(IOS)
-if (has(MediaSession::WebAudio) || has(MediaSession::Video) || has(MediaSession::Audio))
-AudioSession::sharedSession().setActive(true);
-else
-AudioSession::sharedSession().setActive(false);
+AudioSession::sharedSession().setActive(hasActive());
 
 if (!Settings::shouldManageAudioSessionCategory())
 return;






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

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

2014-06-24 Thread commit-queue

Title: [170371] trunk/Source/WebKit2








Revision 170371
Author commit-qu...@webkit.org
Date 2014-06-24 10:24:17 -0700 (Tue, 24 Jun 2014)


Log Message
Initialize WKWebViewConfiguration properties to their default values.
https://bugs.webkit.org/show_bug.cgi?id=134216

Patch by Jeremy Jones jere...@apple.com on 2014-06-24
Reviewed by Anders Carlsson.

* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
add -init method to initialize _mediaPlaybackRequiresUserAction and _mediaPlaybackAllowsAirPlay.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170370 => 170371)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 17:20:36 UTC (rev 170370)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 17:24:17 UTC (rev 170371)
@@ -1,3 +1,14 @@
+2014-06-24  Jeremy Jones  jere...@apple.com
+
+Initialize WKWebViewConfiguration properties to their default values.
+https://bugs.webkit.org/show_bug.cgi?id=134216
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+(-[WKWebViewConfiguration init]):
+add -init method to initialize _mediaPlaybackRequiresUserAction and _mediaPlaybackAllowsAirPlay.
+
 2014-06-24  Anders Carlsson  ander...@apple.com
 
 Add missing semicolon.


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (170370 => 170371)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2014-06-24 17:20:36 UTC (rev 170370)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm	2014-06-24 17:24:17 UTC (rev 170371)
@@ -79,6 +79,19 @@
 #endif
 }
 
+- (instancetype)init
+{
+if (!(self = [super init]))
+return nil;
+
+#if PLATFORM(IOS)
+_mediaPlaybackRequiresUserAction = YES;
+_mediaPlaybackAllowsAirPlay = YES;
+#endif
+
+return self;
+}
+
 - (NSString *)description
 {
 return [NSString stringWithFormat:@%@: %p; processPool = %@; preferences = %@, NSStringFromClass(self.class), self, self.processPool, self.preferences];






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

[webkit-changes] [170372] trunk/Source/WebKit/mac

2014-06-24 Thread mitz

Title: [170372] trunk/Source/WebKit/mac








Revision 170372
Author m...@apple.com
Date 2014-06-24 10:29:11 -0700 (Tue, 24 Jun 2014)


Log Message
Fixed the iOS build after r170358.

* WebView/WebView.mm:
(kit):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebView.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (170371 => 170372)

--- trunk/Source/WebKit/mac/ChangeLog	2014-06-24 17:24:17 UTC (rev 170371)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-06-24 17:29:11 UTC (rev 170372)
@@ -1,3 +1,10 @@
+2014-06-24  Dan Bernstein  m...@apple.com
+
+Fixed the iOS build after r170358.
+
+* WebView/WebView.mm:
+(kit):
+
 2014-06-23  Anders Carlsson  ander...@apple.com
 
 Remove unused history visit code from WebHistoryItem


Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (170371 => 170372)

--- trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-24 17:24:17 UTC (rev 170371)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm	2014-06-24 17:29:11 UTC (rev 170372)
@@ -518,7 +518,6 @@
 | (milestones  DidHitRelevantRepaintedObjectsAreaThreshold ? WebDidHitRelevantRepaintedObjectsAreaThreshold : 0);
 }
 
-#if ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING)
 static WebPageVisibilityState kit(PageVisibilityState visibilityState)
 {
 switch (visibilityState) {
@@ -533,7 +532,6 @@
 ASSERT_NOT_REACHED();
 return WebPageVisibilityStateVisible;
 }
-#endif
 
 @interface WebView (WebFileInternal)
 #if !PLATFORM(IOS)






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

[webkit-changes] [170373] trunk/Source

2014-06-24 Thread mhock

Title: [170373] trunk/Source








Revision 170373
Author mh...@apple.com
Date 2014-06-24 10:44:48 -0700 (Tue, 24 Jun 2014)


Log Message
[iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
Also, revert r169281.
https://bugs.webkit.org/show_bug.cgi?id=134233
rdar://problem/17060183

Reviewed by Benjamin Poulain.

Source/WebCore:
* page/DOMWindow.cpp:
(WebCore::DOMWindow::outerHeight):
(WebCore::DOMWindow::outerWidth):

Source/WebKit2:
* UIProcess/Cocoa/UIDelegate.h:
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::windowFrame): Deleted.
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::convertToUserSpace):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/DOMWindow.cpp
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h
trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm
trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170372 => 170373)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1,3 +1,16 @@
+2014-06-24  Martin Hock  mh...@apple.com
+
+[iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+Also, revert r169281.
+https://bugs.webkit.org/show_bug.cgi?id=134233
+rdar://problem/17060183
+
+Reviewed by Benjamin Poulain.
+
+* page/DOMWindow.cpp:
+(WebCore::DOMWindow::outerHeight):
+(WebCore::DOMWindow::outerWidth):
+
 2014-06-24  Jeremy Jones  jere...@apple.com
 
 Don't set AudioSession active while interrupted.


Modified: trunk/Source/WebCore/page/DOMWindow.cpp (170372 => 170373)

--- trunk/Source/WebCore/page/DOMWindow.cpp	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebCore/page/DOMWindow.cpp	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1156,6 +1156,9 @@
 
 int DOMWindow::outerHeight() const
 {
+#if PLATFORM(IOS)
+return 0;
+#else
 if (!m_frame)
 return 0;
 
@@ -1164,10 +1167,14 @@
 return 0;
 
 return static_castint(page-chrome().windowRect().height());
+#endif
 }
 
 int DOMWindow::outerWidth() const
 {
+#if PLATFORM(IOS)
+return 0;
+#else
 if (!m_frame)
 return 0;
 
@@ -1176,6 +1183,7 @@
 return 0;
 
 return static_castint(page-chrome().windowRect().width());
+#endif
 }
 
 int DOMWindow::innerHeight() const


Modified: trunk/Source/WebKit2/ChangeLog (170372 => 170373)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 17:44:48 UTC (rev 170373)
@@ -1,3 +1,18 @@
+2014-06-24  Martin Hock  mh...@apple.com
+
+[iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.
+Also, revert r169281.
+https://bugs.webkit.org/show_bug.cgi?id=134233
+rdar://problem/17060183
+
+Reviewed by Benjamin Poulain.
+
+* UIProcess/Cocoa/UIDelegate.h:
+* UIProcess/Cocoa/UIDelegate.mm:
+(WebKit::UIDelegate::UIClient::windowFrame): Deleted.
+* UIProcess/ios/PageClientImplIOS.mm:
+(WebKit::PageClientImpl::convertToUserSpace):
+
 2014-06-24  Jeremy Jones  jere...@apple.com
 
 Initialize WKWebViewConfiguration properties to their default values.


Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (170372 => 170373)

--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h	2014-06-24 17:44:48 UTC (rev 170373)
@@ -68,7 +68,6 @@
 #if PLATFORM(IOS)
 virtual RetainPtrNSArray actionsForElement(_WKActivatedElementInfo *, RetainPtrNSArray defaultActions) override;
 virtual void didNotHandleTapAsClick(const WebCore::IntPoint) override;
-virtual WebCore::FloatRect windowFrame(WebKit::WebPageProxy*) override;
 #endif
 
 UIDelegate m_uiDelegate;


Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (170372 => 170373)

--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm	2014-06-24 17:29:11 UTC (rev 170372)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm	2014-06-24 17:44:48 UTC (rev 170373)
@@ -252,17 +252,6 @@
 
 [static_castid WKUIDelegatePrivate(delegate) _webView:m_uiDelegate.m_webView didNotHandleTapAsClickAtPoint:point];
 }
-
-WebCore::FloatRect UIDelegate::UIClient::windowFrame(WebKit::WebPageProxy*)
-{
-if (!m_uiDelegate.m_webView)
-return WebCore::FloatRect();
-
-if (UIWindow* window = m_uiDelegate.m_webView.window)
-return WebCore::enclosingIntRect(window.frame);
-
-return WebCore::enclosingIntRect(m_uiDelegate.m_webView.bounds);
-}
 #endif
 
 } // namespace WebKit


Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (170372 => 170373)

--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm	2014-06-24 17:29:11 UTC (rev

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

2014-06-24 Thread beidson

Title: [170374] trunk/Source/WebCore








Revision 170374
Author beid...@apple.com
Date 2014-06-24 11:23:10 -0700 (Tue, 24 Jun 2014)


Log Message
Remove references to Shader.h which doesn't currently exist in the project.

Rubberstamped by Andreas Kling.

* WebCore.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/WebCore/ChangeLog (170373 => 170374)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 17:44:48 UTC (rev 170373)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 18:23:10 UTC (rev 170374)
@@ -1,3 +1,11 @@
+2014-06-24  Brady Eidson  beid...@apple.com
+
+Remove references to Shader.h which doesn't currently exist in the project.
+
+Rubberstamped by Andreas Kling.
+
+* WebCore.xcodeproj/project.pbxproj:
+
 2014-06-24  Martin Hock  mh...@apple.com
 
 [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.


Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (170373 => 170374)

--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-06-24 17:44:48 UTC (rev 170373)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj	2014-06-24 18:23:10 UTC (rev 170374)
@@ -1608,7 +1608,6 @@
 		498391590F1E776900C23782 /* WebKitCSSMatrix.h in Headers */ = {isa = PBXBuildFile; fileRef = 498391560F1E776900C23782 /* WebKitCSSMatrix.h */; };
 		498770DB1242C535002226BA /* DrawingBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 498770C21242C535002226BA /* DrawingBuffer.cpp */; };
 		498770DC1242C535002226BA /* DrawingBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770C31242C535002226BA /* DrawingBuffer.h */; };
-		498770E91242C535002226BA /* Shader.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770D01242C535002226BA /* Shader.h */; };
 		498770F01242C535002226BA /* Texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 498770D71242C535002226BA /* Texture.cpp */; };
 		498770F11242C535002226BA /* Texture.h in Headers */ = {isa = PBXBuildFile; fileRef = 498770D81242C535002226BA /* Texture.h */; };
 		498770F21242C535002226BA /* TilingData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 498770D91242C535002226BA /* TilingData.cpp */; };
@@ -25813,7 +25812,6 @@
 B8DBDB4C130B0F8A00F5CDB1 /* SetSelectionCommand.h in Headers */,
 93F1994F08245E59001E9ABC /* Settings.h in Headers */,
 53EF766B16530A61004CBE49 /* SettingsMacros.h in Headers */,
-498770E91242C535002226BA /* Shader.h in Headers */,
 0F3DD45012F5EA1B000D9190 /* ShadowBlur.h in Headers */,
 BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */,
 A6D169641346B4C1000EB770 /* ShadowRoot.h in Headers */,






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

[webkit-changes] [170375] branches/ftlopt/Source/JavaScriptCore

2014-06-24 Thread fpizlo

Title: [170375] branches/ftlopt/Source/_javascript_Core








Revision 170375
Author fpi...@apple.com
Date 2014-06-24 12:04:05 -0700 (Tue, 24 Jun 2014)


Log Message
[ftlopt][REGRESSION] PutById AI is introducing watchable structures without watching them
https://bugs.webkit.org/show_bug.cgi?id=134260

Reviewed by Geoffrey Garen.

This was causing loads of assertion failures in debug builds.

* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreterAbstractStateType::executeEffects):

Modified Paths

branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h




Diff

Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170374 => 170375)

--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 18:23:10 UTC (rev 170374)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:04:05 UTC (rev 170375)
@@ -1,3 +1,15 @@
+2014-06-24  Filip Pizlo  fpi...@apple.com
+
+[ftlopt][REGRESSION] PutById AI is introducing watchable structures without watching them
+https://bugs.webkit.org/show_bug.cgi?id=134260
+
+Reviewed by Geoffrey Garen.
+
+This was causing loads of assertion failures in debug builds.
+
+* dfg/DFGAbstractInterpreterInlines.h:
+(JSC::DFG::AbstractInterpreterAbstractStateType::executeEffects):
+
 2014-06-21  Filip Pizlo  fpi...@apple.com
 
 [ftlopt] Fold GetById/PutById to MultiGetByOffset/GetByOffset or MultiPutByOffset/PutByOffset, which implies handling non-singleton sets


Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h (170374 => 170375)

--- branches/ftlopt/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h	2014-06-24 18:23:10 UTC (rev 170374)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGAbstractInterpreterInlines.h	2014-06-24 19:04:05 UTC (rev 170375)
@@ -1704,6 +1704,7 @@
 transitions.append(
 Transition(
 variant.oldStructureForTransition(), variant.newStructure()));
+m_graph.watchpoints().consider(variant.newStructure());
 newSet.add(variant.newStructure());
 } else {
 ASSERT(variant.kind() == PutByIdVariant::Replace);






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

[webkit-changes] [170376] branches/ftlopt/Source/JavaScriptCore

2014-06-24 Thread fpizlo

Title: [170376] branches/ftlopt/Source/_javascript_Core








Revision 170376
Author fpi...@apple.com
Date 2014-06-24 12:06:36 -0700 (Tue, 24 Jun 2014)


Log Message
[ftlopt] StructureAbstractValue::onlyStructure() should return nullptr if isClobbered()
https://bugs.webkit.org/show_bug.cgi?id=134256

Reviewed by Michael Saboff.

This isn't testable right now (i.e. it's benign) but we should get it right anyway. The
point is to be able to precisely model what goes on in the snippets of code between a
side-effect and an InvalidationPoint.

This patch also cleans up onlyStructure() by delegating more work to
StructureSet::onlyStructure().

* dfg/DFGStructureAbstractValue.h:
(JSC::DFG::StructureAbstractValue::onlyStructure):

Modified Paths

branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/dfg/DFGStructureAbstractValue.h




Diff

Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170375 => 170376)

--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:04:05 UTC (rev 170375)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:06:36 UTC (rev 170376)
@@ -1,5 +1,22 @@
 2014-06-24  Filip Pizlo  fpi...@apple.com
 
+[ftlopt] StructureAbstractValue::onlyStructure() should return nullptr if isClobbered()
+https://bugs.webkit.org/show_bug.cgi?id=134256
+
+Reviewed by Michael Saboff.
+
+This isn't testable right now (i.e. it's benign) but we should get it right anyway. The
+point is to be able to precisely model what goes on in the snippets of code between a
+side-effect and an InvalidationPoint.
+
+This patch also cleans up onlyStructure() by delegating more work to
+StructureSet::onlyStructure().
+
+* dfg/DFGStructureAbstractValue.h:
+(JSC::DFG::StructureAbstractValue::onlyStructure):
+
+2014-06-24  Filip Pizlo  fpi...@apple.com
+
 [ftlopt][REGRESSION] PutById AI is introducing watchable structures without watching them
 https://bugs.webkit.org/show_bug.cgi?id=134260
 


Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGStructureAbstractValue.h (170375 => 170376)

--- branches/ftlopt/Source/_javascript_Core/dfg/DFGStructureAbstractValue.h	2014-06-24 19:04:05 UTC (rev 170375)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGStructureAbstractValue.h	2014-06-24 19:06:36 UTC (rev 170376)
@@ -181,14 +181,14 @@
 
 Structure* operator[](size_t i) const { return at(i); }
 
-// FIXME: Eliminate all uses of this method. There shouldn't be any
-// special-casing for the one-structure case.
-// https://bugs.webkit.org/show_bug.cgi?id=133229
+// In most cases, what you really want to do is verify whether the set is top or clobbered, and
+// if not, enumerate the set of structures. Use this only in cases where the singleton case is
+// meaningfully special, like for transitions.
 Structure* onlyStructure() const
 {
-if (isTop() || size() != 1)
+if (isTop() || isClobbered())
 return nullptr;
-return at(0);
+return m_set.onlyStructure();
 }
 
 void dumpInContext(PrintStream, DumpContext*) const;






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

[webkit-changes] [170377] trunk/Source

2014-06-24 Thread antti

Title: [170377] trunk/Source








Revision 170377
Author an...@apple.com
Date 2014-06-24 12:09:11 -0700 (Tue, 24 Jun 2014)


Log Message
Only flush layers when the exposed rect actually changes
https://bugs.webkit.org/show_bug.cgi?id=134248

Reviewed by Anders Carlsson.


Source/WebCore: 
* WebCore.exp.in:

Source/WebKit2: 
* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::setExposedContentRect):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170376 => 170377)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 19:06:36 UTC (rev 170376)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 19:09:11 UTC (rev 170377)
@@ -1,3 +1,12 @@
+2014-06-24  Antti Koivisto  an...@apple.com
+
+Only flush layers when the exposed rect actually changes
+https://bugs.webkit.org/show_bug.cgi?id=134248
+
+Reviewed by Anders Carlsson.
+
+* WebCore.exp.in:
+
 2014-06-24  Brady Eidson  beid...@apple.com
 
 Remove references to Shader.h which doesn't currently exist in the project.


Modified: trunk/Source/WebCore/WebCore.exp.in (170376 => 170377)

--- trunk/Source/WebCore/WebCore.exp.in	2014-06-24 19:06:36 UTC (rev 170376)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-06-24 19:09:11 UTC (rev 170377)
@@ -1546,6 +1546,7 @@
 __ZNK7WebCore10ScrollView16windowToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_7IntRectE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_8IntPointE
+__ZNK7WebCore10ScrollView18exposedContentRectEv
 __ZNK7WebCore10ScrollView18rootViewToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView23rootViewToTotalContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView40documentScrollOffsetRelativeToViewOriginEv


Modified: trunk/Source/WebKit2/ChangeLog (170376 => 170377)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 19:06:36 UTC (rev 170376)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 19:09:11 UTC (rev 170377)
@@ -1,3 +1,13 @@
+2014-06-24  Antti Koivisto  an...@apple.com
+
+Only flush layers when the exposed rect actually changes
+https://bugs.webkit.org/show_bug.cgi?id=134248
+
+Reviewed by Anders Carlsson.
+
+* WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+(WebKit::RemoteLayerTreeDrawingArea::setExposedContentRect):
+
 2014-06-24  Martin Hock  mh...@apple.com
 
 [iOS] DOMWindow::outerWidth and outerHeight don't return useful values, so return 0.


Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (170376 => 170377)

--- trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2014-06-24 19:06:36 UTC (rev 170376)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm	2014-06-24 19:09:11 UTC (rev 170377)
@@ -202,6 +202,8 @@
 FrameView* frameView = m_webPage.mainFrameView();
 if (!frameView)
 return;
+if (frameView-exposedContentRect() == exposedContentRect)
+return;
 
 frameView-setExposedContentRect(exposedContentRect);
 scheduleCompositingLayerFlush();






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

[webkit-changes] [170378] trunk/Source

2014-06-24 Thread andersca

Title: [170378] trunk/Source








Revision 170378
Author ander...@apple.com
Date 2014-06-24 12:18:49 -0700 (Tue, 24 Jun 2014)


Log Message
Add PageState to HistoryItem conversion code
https://bugs.webkit.org/show_bug.cgi?id=134259

Reviewed by Andreas Kling.

Source/WebKit2:
* Shared/SessionState.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeBackForwardTreeNode):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebCoreSupport/SessionStateConversion.cpp: Added.
(WebKit::toFormData):
(WebKit::applyFrameState):
(WebKit::toHistoryItem):
* WebProcess/WebCoreSupport/SessionStateConversion.h: Added.

Source/WTF:
* wtf/Optional.h:
(WTF::Optional::valueOr):

Modified Paths

trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Optional.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/SessionState.h
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj


Added Paths

trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h




Diff

Modified: trunk/Source/WTF/ChangeLog (170377 => 170378)

--- trunk/Source/WTF/ChangeLog	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WTF/ChangeLog	2014-06-24 19:18:49 UTC (rev 170378)
@@ -1,3 +1,13 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Add PageState to HistoryItem conversion code
+https://bugs.webkit.org/show_bug.cgi?id=134259
+
+Reviewed by Andreas Kling.
+
+* wtf/Optional.h:
+(WTF::Optional::valueOr):
+
 2014-06-24  László Langó  llango.u-sze...@partner.samsung.com
 
 [_javascript_Core] Enable concurrent JIT on EFL.


Modified: trunk/Source/WTF/wtf/Optional.h (170377 => 170378)

--- trunk/Source/WTF/wtf/Optional.h	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WTF/wtf/Optional.h	2014-06-24 19:18:49 UTC (rev 170378)
@@ -161,6 +161,15 @@
 return m_value;
 }
 
+templatetypename U
+T valueOr(U value) const
+{
+if (m_isEngaged)
+return m_value;
+
+return std::forwardU(value);
+}
+
 private:
 bool m_isEngaged;
 union {


Modified: trunk/Source/WebKit2/ChangeLog (170377 => 170378)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 19:18:49 UTC (rev 170378)
@@ -1,3 +1,20 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Add PageState to HistoryItem conversion code
+https://bugs.webkit.org/show_bug.cgi?id=134259
+
+Reviewed by Andreas Kling.
+
+* Shared/SessionState.h:
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::decodeBackForwardTreeNode):
+* WebKit2.xcodeproj/project.pbxproj:
+* WebProcess/WebCoreSupport/SessionStateConversion.cpp: Added.
+(WebKit::toFormData):
+(WebKit::applyFrameState):
+(WebKit::toHistoryItem):
+* WebProcess/WebCoreSupport/SessionStateConversion.h: Added.
+
 2014-06-24  Antti Koivisto  an...@apple.com
 
 Only flush layers when the exposed rect actually changes


Modified: trunk/Source/WebKit2/Shared/SessionState.h (170377 => 170378)

--- trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 19:18:49 UTC (rev 170378)
@@ -82,7 +82,7 @@
 String target;
 
 VectorString documentState;
-Vectoruint8_t stateObjectData;
+OptionalVectoruint8_t stateObjectData;
 
 int64_t documentSequenceNumber;
 int64_t itemSequenceNumber;


Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170377 => 170378)

--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 19:18:49 UTC (rev 170378)
@@ -552,9 +552,13 @@
 bool hasStateObject;
 decoder  hasStateObject;
 
-if (hasStateObject)
-decoder  frameState.stateObjectData;
+if (hasStateObject) {
+Vectoruint8_t stateObjectData;
+decoder  stateObjectData;
 
+frameState.stateObjectData = std::move(stateObjectData);
+}
+
 decoder  frameState.target;
 }
 


Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170377 => 170378)

--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-06-24 19:09:11 UTC (rev 170377)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2014-06-24 19:18:49 UTC (rev 170378)
@@ -263,6 +263,8 @@
 		1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBA2911E6862700DB1371 /* NetscapeBrowserFuncs.cpp */; };
 		1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */; };
 		1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile;

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

2014-06-24 Thread antti

Title: [170380] trunk/Source/WebCore








Revision 170380
Author an...@apple.com
Date 2014-06-24 12:38:01 -0700 (Tue, 24 Jun 2014)


Log Message
Try to fix build.

* WebCore.exp.in: Remove duplicate export, this should be in the iOS section only.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in




Diff

Modified: trunk/Source/WebCore/ChangeLog (170379 => 170380)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 19:35:47 UTC (rev 170379)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 19:38:01 UTC (rev 170380)
@@ -1,3 +1,9 @@
+2014-06-24  Antti Koivisto  an...@apple.com
+
+Try to fix build.
+
+* WebCore.exp.in: Remove duplicate export, this should be in the iOS section only.
+
 2014-06-24  Eric Carlson  eric.carl...@apple.com
 
 [Mac] process raw VTT in-band captions


Modified: trunk/Source/WebCore/WebCore.exp.in (170379 => 170380)

--- trunk/Source/WebCore/WebCore.exp.in	2014-06-24 19:35:47 UTC (rev 170379)
+++ trunk/Source/WebCore/WebCore.exp.in	2014-06-24 19:38:01 UTC (rev 170380)
@@ -1546,7 +1546,6 @@
 __ZNK7WebCore10ScrollView16windowToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_7IntRectE
 __ZNK7WebCore10ScrollView18contentsToRootViewERKNS_8IntPointE
-__ZNK7WebCore10ScrollView18exposedContentRectEv
 __ZNK7WebCore10ScrollView18rootViewToContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView23rootViewToTotalContentsERKNS_8IntPointE
 __ZNK7WebCore10ScrollView40documentScrollOffsetRelativeToViewOriginEv






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

[webkit-changes] [170382] branches/ftlopt/Source/JavaScriptCore

2014-06-24 Thread fpizlo

Title: [170382] branches/ftlopt/Source/_javascript_Core








Revision 170382
Author fpi...@apple.com
Date 2014-06-24 12:51:11 -0700 (Tue, 24 Jun 2014)


Log Message
[ftlopt] GC should notify us if it resets to_this
https://bugs.webkit.org/show_bug.cgi?id=128231

Reviewed by Geoffrey Garen.

* CMakeLists.txt:
* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
* _javascript_Core.xcodeproj/project.pbxproj:
* bytecode/BytecodeList.json:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::finalizeUnconditionally):
* bytecode/Instruction.h:
* bytecode/ToThisStatus.cpp: Added.
(JSC::merge):
(WTF::printInternal):
* bytecode/ToThisStatus.h: Added.
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):

Modified Paths

branches/ftlopt/Source/_javascript_Core/CMakeLists.txt
branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj
branches/ftlopt/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
branches/ftlopt/Source/_javascript_Core/bytecode/BytecodeList.json
branches/ftlopt/Source/_javascript_Core/bytecode/CodeBlock.cpp
branches/ftlopt/Source/_javascript_Core/bytecode/Instruction.h
branches/ftlopt/Source/_javascript_Core/bytecompiler/BytecodeGenerator.cpp
branches/ftlopt/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp
branches/ftlopt/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm
branches/ftlopt/Source/_javascript_Core/llint/LowLevelInterpreter64.asm
branches/ftlopt/Source/_javascript_Core/runtime/CommonSlowPaths.cpp


Added Paths

branches/ftlopt/Source/_javascript_Core/bytecode/ToThisStatus.cpp
branches/ftlopt/Source/_javascript_Core/bytecode/ToThisStatus.h




Diff

Modified: branches/ftlopt/Source/_javascript_Core/CMakeLists.txt (170381 => 170382)

--- branches/ftlopt/Source/_javascript_Core/CMakeLists.txt	2014-06-24 19:49:25 UTC (rev 170381)
+++ branches/ftlopt/Source/_javascript_Core/CMakeLists.txt	2014-06-24 19:51:11 UTC (rev 170382)
@@ -93,6 +93,7 @@
 bytecode/StructureSet.cpp
 bytecode/StructureStubClearingWatchpoint.cpp
 bytecode/StructureStubInfo.cpp
+bytecode/ToThisStatus.cpp
 bytecode/UnlinkedCodeBlock.cpp
 bytecode/UnlinkedInstructionStream.cpp
 bytecode/ValueRecovery.cpp


Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170381 => 170382)

--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:49:25 UTC (rev 170381)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:51:11 UTC (rev 170382)
@@ -1,5 +1,33 @@
 2014-06-24  Filip Pizlo  fpi...@apple.com
 
+[ftlopt] GC should notify us if it resets to_this
+https://bugs.webkit.org/show_bug.cgi?id=128231
+
+Reviewed by Geoffrey Garen.
+
+* CMakeLists.txt:
+* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+* _javascript_Core.xcodeproj/project.pbxproj:
+* bytecode/BytecodeList.json:
+* bytecode/CodeBlock.cpp:
+(JSC::CodeBlock::dumpBytecode):
+(JSC::CodeBlock::finalizeUnconditionally):
+* bytecode/Instruction.h:
+* bytecode/ToThisStatus.cpp: Added.
+(JSC::merge):
+(WTF::printInternal):
+* bytecode/ToThisStatus.h: Added.
+* bytecompiler/BytecodeGenerator.cpp:
+(JSC::BytecodeGenerator::BytecodeGenerator):
+* dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::ByteCodeParser::parseBlock):
+* llint/LowLevelInterpreter32_64.asm:
+* llint/LowLevelInterpreter64.asm:
+* runtime/CommonSlowPaths.cpp:
+(JSC::SLOW_PATH_DECL):
+
+2014-06-24  Filip Pizlo  fpi...@apple.com
+
 [ftlopt] StructureAbstractValue::onlyStructure() should return nullptr if isClobbered()
 https://bugs.webkit.org/show_bug.cgi?id=134256
 


Modified: branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (170381 => 170382)

--- branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2014-06-24 19:49:25 UTC (rev 170381)
+++ branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj	2014-06-24 19:51:11 UTC (rev 170382)
@@ -347,6 +347,7 @@
 ClCompile Include=..\bytecode\StructureSet.cpp /
 ClCompile Include=..\bytecode\StructureStubClearingWatchpoint.cpp /
 ClCompile Include=..\bytecode\StructureStubInfo.cpp /
+ClCompile Include=..\bytecode\ToThisStatus.cpp /
 ClCompile Include=..\bytecode\UnlinkedCodeBlock.cpp /
 ClCompile Include=..\bytecode\UnlinkedInstructionStream.cpp /
 ClCompile Include=..\bytecode\ValueRecovery.cpp /
@@ -890,6 +891,7 @@
 ClInclude Include=..\bytecode\StructureSet.h /
 ClInclude Include=..\bytecode\StructureStubClearingWatchpoint.h /

[webkit-changes] [170383] branches/ftlopt/Source/JavaScriptCore

2014-06-24 Thread fpizlo

Title: [170383] branches/ftlopt/Source/_javascript_Core








Revision 170383
Author fpi...@apple.com
Date 2014-06-24 12:52:46 -0700 (Tue, 24 Jun 2014)


Log Message
[ftlopt] PutByIdFlush can also be converted to a PutByOffset so don't assert otherwise
https://bugs.webkit.org/show_bug.cgi?id=134265

Reviewed by Geoffrey Garen.

More assertion fallout from the PutById folding work.

* dfg/DFGNode.h:
(JSC::DFG::Node::convertToPutByOffset):

Modified Paths

branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h




Diff

Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170382 => 170383)

--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:51:11 UTC (rev 170382)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 19:52:46 UTC (rev 170383)
@@ -1,5 +1,17 @@
 2014-06-24  Filip Pizlo  fpi...@apple.com
 
+[ftlopt] PutByIdFlush can also be converted to a PutByOffset so don't assert otherwise
+https://bugs.webkit.org/show_bug.cgi?id=134265
+
+Reviewed by Geoffrey Garen.
+
+More assertion fallout from the PutById folding work.
+
+* dfg/DFGNode.h:
+(JSC::DFG::Node::convertToPutByOffset):
+
+2014-06-24  Filip Pizlo  fpi...@apple.com
+
 [ftlopt] GC should notify us if it resets to_this
 https://bugs.webkit.org/show_bug.cgi?id=128231
 


Modified: branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h (170382 => 170383)

--- branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h	2014-06-24 19:51:11 UTC (rev 170382)
+++ branches/ftlopt/Source/_javascript_Core/dfg/DFGNode.h	2014-06-24 19:52:46 UTC (rev 170383)
@@ -469,7 +469,7 @@
 
 void convertToPutByOffset(unsigned storageAccessDataIndex, Edge storage)
 {
-ASSERT(m_op == PutById || m_op == PutByIdDirect || m_op == MultiPutByOffset);
+ASSERT(m_op == PutById || m_op == PutByIdDirect || m_op == PutByIdFlush || m_op == MultiPutByOffset);
 m_opInfo = storageAccessDataIndex;
 children.setChild3(children.child2());
 children.setChild2(children.child1());






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

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

2014-06-24 Thread eric . carlson

Title: [170384] trunk/Source/WebCore








Revision 170384
Author eric.carl...@apple.com
Date 2014-06-24 12:59:58 -0700 (Tue, 24 Jun 2014)


Log Message
Unreviewed build fix.

* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
(WebCore::InbandTextTrackPrivateAVF::processNativeSamples): Cast variadic argument to int.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170383 => 170384)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 19:52:46 UTC (rev 170383)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 19:59:58 UTC (rev 170384)
@@ -1,3 +1,10 @@
+2014-06-24  Eric Carlson  eric.carl...@apple.com
+
+Unreviewed build fix.
+
+* platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+(WebCore::InbandTextTrackPrivateAVF::processNativeSamples): Cast variadic argument to int.
+
 2014-06-24  Brent Fulgham  bfulg...@apple.com
 
 [Win] MSVC mishandles enums in bitfields


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (170383 => 170384)

--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp	2014-06-24 19:52:46 UTC (rev 170383)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp	2014-06-24 19:59:58 UTC (rev 170384)
@@ -571,7 +571,7 @@
 CMSampleTimingInfo timingInfo;
 OSStatus status = CMSampleBufferGetSampleTimingInfo(sampleBuffer, i, timingInfo);
 if (status) {
-LOG(Media, InbandTextTrackPrivateAVF::processNativeSamples(%p) - CMSampleBufferGetSampleTimingInfo returned error %x for sample %li, this, static_castSInt32(status), i);
+LOG(Media, InbandTextTrackPrivateAVF::processNativeSamples(%p) - CMSampleBufferGetSampleTimingInfo returned error %x for sample %li, this, static_castint(status), i);
 continue;
 }
 






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

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

2014-06-24 Thread akling

Title: [170385] trunk/Source/WebKit2








Revision 170385
Author akl...@apple.com
Date 2014-06-24 13:18:15 -0700 (Tue, 24 Jun 2014)


Log Message
[iOS WebKit2] Disable screen font substitution by default.
https://webkit.org/b/134266
rdar://problem/17427740

Just like OS X = 10.9, screen font substitution should be disabled
by default in WebKit2 for iOS.

Reviewed by Anders Carlsson.

* Shared/WebPreferencesDefinitions.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170384 => 170385)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 19:59:58 UTC (rev 170384)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 20:18:15 UTC (rev 170385)
@@ -1,3 +1,16 @@
+2014-06-24  Andreas Kling  akl...@apple.com
+
+[iOS WebKit2] Disable screen font substitution by default.
+https://webkit.org/b/134266
+rdar://problem/17427740
+
+Just like OS X = 10.9, screen font substitution should be disabled
+by default in WebKit2 for iOS.
+
+Reviewed by Anders Carlsson.
+
+* Shared/WebPreferencesDefinitions.h:
+
 2014-06-24  Anders Carlsson  ander...@apple.com
 
 Add PageState to HistoryItem conversion code


Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170384 => 170385)

--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2014-06-24 19:59:58 UTC (rev 170384)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2014-06-24 20:18:15 UTC (rev 170385)
@@ -40,7 +40,7 @@
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
 #endif
 
-#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(IOS) || (PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090)
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
 #else
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true






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

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

2014-06-24 Thread mhahnenberg

Title: [170386] trunk/Source/_javascript_Core








Revision 170386
Author mhahnenb...@apple.com
Date 2014-06-24 13:29:27 -0700 (Tue, 24 Jun 2014)


Log Message
REGRESSION (r169703): Invalid cast in JSC::asGetterSetter / JSC::JSObject::defineOwnNonIndexProperty
https://bugs.webkit.org/show_bug.cgi?id=134046

Reviewed by Filip Pizlo.

* runtime/GetterSetter.h:
(JSC::asGetterSetter):
* runtime/JSObject.cpp:
(JSC::JSObject::defineOwnNonIndexProperty): We need to check for a CustomGetterSetter here as well as
a normal GetterSetter. If we encounter a CustomGetterSetter, we delete it, create a new normal GetterSetter,
and insert it like normal. We also need to check for CustomAccessors when checking for unconfigurable properties.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/GetterSetter.h
trunk/Source/_javascript_Core/runtime/JSObject.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (170385 => 170386)

--- trunk/Source/_javascript_Core/ChangeLog	2014-06-24 20:18:15 UTC (rev 170385)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-06-24 20:29:27 UTC (rev 170386)
@@ -1,3 +1,17 @@
+2014-06-24  Mark Hahnenberg  mhahnenb...@apple.com
+
+REGRESSION (r169703): Invalid cast in JSC::asGetterSetter / JSC::JSObject::defineOwnNonIndexProperty
+https://bugs.webkit.org/show_bug.cgi?id=134046
+
+Reviewed by Filip Pizlo.
+
+* runtime/GetterSetter.h:
+(JSC::asGetterSetter):
+* runtime/JSObject.cpp:
+(JSC::JSObject::defineOwnNonIndexProperty): We need to check for a CustomGetterSetter here as well as
+a normal GetterSetter. If we encounter a CustomGetterSetter, we delete it, create a new normal GetterSetter,
+and insert it like normal. We also need to check for CustomAccessors when checking for unconfigurable properties.
+
 2014-06-24  Brent Fulgham  bfulg...@apple.com
 
 [Win] MSVC mishandles enums in bitfields


Modified: trunk/Source/_javascript_Core/runtime/GetterSetter.h (170385 => 170386)

--- trunk/Source/_javascript_Core/runtime/GetterSetter.h	2014-06-24 20:18:15 UTC (rev 170385)
+++ trunk/Source/_javascript_Core/runtime/GetterSetter.h	2014-06-24 20:29:27 UTC (rev 170386)
@@ -85,7 +85,7 @@
 
 inline GetterSetter* asGetterSetter(JSValue value)
 {
-ASSERT(value.asCell()-isGetterSetter());
+ASSERT_WITH_SECURITY_IMPLICATION(value.asCell()-isGetterSetter());
 return static_castGetterSetter*(value.asCell());
 }
 


Modified: trunk/Source/_javascript_Core/runtime/JSObject.cpp (170385 => 170386)

--- trunk/Source/_javascript_Core/runtime/JSObject.cpp	2014-06-24 20:18:15 UTC (rev 170385)
+++ trunk/Source/_javascript_Core/runtime/JSObject.cpp	2014-06-24 20:29:27 UTC (rev 170386)
@@ -2646,11 +2646,22 @@
 exec-vm().throwException(exec, createTypeError(exec, ASCIILiteral(Attempting to change the getter of an unconfigurable property.)));
 return false;
 }
+if (current.attributes()  CustomAccessor) {
+if (throwException)
+exec-vm().throwException(exec, createTypeError(exec, ASCIILiteral(Attempting to change access mechanism for an unconfigurable property.)));
+return false;
+}
 }
 JSValue accessor = getDirect(exec-vm(), propertyName);
 if (!accessor)
 return false;
-GetterSetter* getterSetter = asGetterSetter(accessor);
+GetterSetter* getterSetter;
+if (accessor.isCustomGetterSetter())
+getterSetter = GetterSetter::create(exec-vm());
+else {
+ASSERT(accessor.isGetterSetter());
+getterSetter = asGetterSetter(accessor);
+}
 if (descriptor.setterPresent())
 getterSetter-setSetter(exec-vm(), descriptor.setterObject());
 if (descriptor.getterPresent())






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

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

2014-06-24 Thread andersca

Title: [170387] trunk/Source/WebKit2








Revision 170387
Author ander...@apple.com
Date 2014-06-24 13:40:59 -0700 (Tue, 24 Jun 2014)


Log Message
Add code to convert HistoryItem to PageState
https://bugs.webkit.org/show_bug.cgi?id=134263

Reviewed by Andreas Kling.

* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toHTTPBody):
(WebKit::toFrameState):
(WebKit::toPageState):
* WebProcess/WebCoreSupport/SessionStateConversion.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170386 => 170387)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 20:40:59 UTC (rev 170387)
@@ -1,3 +1,16 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Add code to convert HistoryItem to PageState
+https://bugs.webkit.org/show_bug.cgi?id=134263
+
+Reviewed by Andreas Kling.
+
+* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+(WebKit::toHTTPBody):
+(WebKit::toFrameState):
+(WebKit::toPageState):
+* WebProcess/WebCoreSupport/SessionStateConversion.h:
+
 2014-06-24  Andreas Kling  akl...@apple.com
 
 [iOS WebKit2] Disable screen font substitution by default.


Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp (170386 => 170387)

--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp	2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp	2014-06-24 20:40:59 UTC (rev 170387)
@@ -35,6 +35,83 @@
 
 namespace WebKit {
 
+static HTTPBody toHTTPBody(const FormData formData)
+{
+HTTPBody httpBody;
+
+for (const auto formDataElement : formData.elements()) {
+HTTPBody::Element element;
+
+switch (formDataElement.m_type) {
+case FormDataElement::Type::Data:
+element.type = HTTPBody::Element::Type::Data;
+element.data = ""
+break;
+
+case FormDataElement::Type::EncodedFile:
+element.filePath = formDataElement.m_filename;
+element.fileStart = formDataElement.m_fileStart;
+if (formDataElement.m_fileLength != BlobDataItem::toEndOfFile)
+element.fileLength = formDataElement.m_fileLength;
+if (formDataElement.m_expectedFileModificationTime != invalidFileTime())
+element.expectedFileModificationTime = formDataElement.m_expectedFileModificationTime;
+break;
+
+case FormDataElement::Type::EncodedBlob:
+element.blobURLString = formDataElement.m_url.string();
+break;
+}
+
+httpBody.elements.append(std::move(element));
+}
+
+return httpBody;
+}
+
+static FrameState toFrameState(const HistoryItem historyItem)
+{
+FrameState frameState;
+
+frameState.urlString = historyItem.urlString();
+frameState.originalURLString = historyItem.originalURLString();
+frameState.referrer = historyItem.referrer();
+frameState.target = historyItem.target();
+
+frameState.documentState = historyItem.documentState();
+if (RefPtrSerializedScriptValue stateObject = historyItem.stateObject())
+frameState.stateObjectData = stateObject-data();
+
+frameState.documentSequenceNumber = historyItem.documentSequenceNumber();
+frameState.itemSequenceNumber = historyItem.itemSequenceNumber();
+
+frameState.scrollPoint = historyItem.scrollPoint();
+frameState.pageScaleFactor = historyItem.pageScaleFactor();
+
+if (FormData* formData = const_castHistoryItem(historyItem).formData()) {
+HTTPBody httpBody = toHTTPBody(*formData);
+httpBody.contentType = historyItem.formContentType();
+
+frameState.httpBody = std::move(httpBody);
+}
+
+for (auto childHistoryItem : historyItem.children()) {
+FrameState childFrameState = toFrameState(*childHistoryItem);
+frameState.children.append(std::move(childFrameState));
+}
+
+return frameState;
+}
+
+PageState toPageState(const WebCore::HistoryItem historyItem)
+{
+PageState pageState;
+
+pageState.title = historyItem.title();
+pageState.mainFrameState = toFrameState(historyItem);
+
+return pageState;
+}
+
 static PassRefPtrFormData toFormData(const HTTPBody httpBody)
 {
 RefPtrFormData formData = FormData::create();


Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h (170386 => 170387)

--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h	2014-06-24 20:29:27 UTC (rev 170386)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.h	2014-06-24 20:40:59 UTC (rev 170387)
@@ -36,6 +36,7 @@
 
 struct PageState;
 
+PageState toPageState(const

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

2014-06-24 Thread enrica

Title: [170388] trunk/Source/WebKit2








Revision 170388
Author enr...@apple.com
Date 2014-06-24 13:45:00 -0700 (Tue, 24 Jun 2014)


Log Message
iOS WebKit2: block selection tends to prefer block to single words even when the page is zoomed.
https://bugs.webkit.org/show_bug.cgi?id=134267
rdar://problem/17138059

Reviewed by Benjamin Poulain.

When trying to find the best selection match for the position where the tap occurs,
we need to take into account the page scale. This patch applies the scale factor
to the selection rect before comparing it with the desired size.

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::rangeForWebSelectionAtPosition):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170387 => 170388)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 20:40:59 UTC (rev 170387)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 20:45:00 UTC (rev 170388)
@@ -1,3 +1,18 @@
+2014-06-24  Enrica Casucci  enr...@apple.com
+
+iOS WebKit2: block selection tends to prefer block to single words even when the page is zoomed.
+https://bugs.webkit.org/show_bug.cgi?id=134267
+rdar://problem/17138059
+
+Reviewed by Benjamin Poulain.
+
+When trying to find the best selection match for the position where the tap occurs,
+we need to take into account the page scale. This patch applies the scale factor
+to the selection rect before comparing it with the desired size.
+
+* WebProcess/WebPage/ios/WebPageIOS.mm:
+(WebKit::WebPage::rangeForWebSelectionAtPosition):
+
 2014-06-24  Anders Carlsson  ander...@apple.com
 
 Add code to convert HistoryItem to PageState


Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (170387 => 170388)

--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2014-06-24 20:40:59 UTC (rev 170387)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2014-06-24 20:45:00 UTC (rev 170388)
@@ -676,6 +676,7 @@
 Node* currentNode = result.innerNode();
 RefPtrRange range;
 IntRect boundingRect;
+FloatRect boundingRectInScrollViewCoordinates;
 
 if (currentNode-isTextNode()) {
 range = enclosingTextUnitOfGranularity(position, ParagraphGranularity, DirectionForward);
@@ -695,7 +696,9 @@
 else
 boundingRect.unite(coreRect);
 }
-if (boundingRect.width()  m_blockSelectionDesiredSize.width()  boundingRect.height()  m_blockSelectionDesiredSize.height())
+boundingRectInScrollViewCoordinates = boundingRect;
+boundingRectInScrollViewCoordinates.scale(m_page-pageScaleFactor());
+if (boundingRectInScrollViewCoordinates.width()  m_blockSelectionDesiredSize.width()  boundingRectInScrollViewCoordinates.height()  m_blockSelectionDesiredSize.height())
 return wordRangeFromPosition(position);
 
 currentNode = range-commonAncestorContainer(ASSERT_NO_EXCEPTION);
@@ -707,7 +710,9 @@
 Node* bestChoice = currentNode;
 while (currentNode) {
 boundingRect = currentNode-renderer()-absoluteBoundingBoxRect(true);
-if (boundingRect.width()  m_blockSelectionDesiredSize.width()  boundingRect.height()  m_blockSelectionDesiredSize.height())
+boundingRectInScrollViewCoordinates = boundingRect;
+boundingRectInScrollViewCoordinates.scale(m_page-pageScaleFactor());
+if (boundingRectInScrollViewCoordinates.width()  m_blockSelectionDesiredSize.width()  boundingRectInScrollViewCoordinates.height()  m_blockSelectionDesiredSize.height())
 break;
 bestChoice = currentNode;
 currentNode = currentNode-parentElement();






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

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

2014-06-24 Thread jonowells

Title: [170389] trunk/Source/WebInspectorUI








Revision 170389
Author jonowe...@apple.com
Date 2014-06-24 13:59:51 -0700 (Tue, 24 Jun 2014)


Log Message
Web Inspector: TypeError when hovering over Show All Nodes button in the Dom Tree inspector
https://bugs.webkit.org/show_bug.cgi?id=133699

Reviewed by Geoffrey Garen.

The call to element._createTooltipForNode() was failing because element was sometimes not a
DOMTreeOutline but rather only a TreeElement (in the case of the Show All Nodes button specifically).
A check for type fixes this issue.

* UserInterface/Views/DOMTreeOutline.js:
(WebInspector.DOMTreeOutline.prototype._onmousemove): Check for presence of _createTooltipForNode.

Modified Paths

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




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (170388 => 170389)

--- trunk/Source/WebInspectorUI/ChangeLog	2014-06-24 20:45:00 UTC (rev 170388)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-06-24 20:59:51 UTC (rev 170389)
@@ -1,3 +1,17 @@
+2014-06-24  Jono Wells  jonowe...@apple.com
+
+Web Inspector: TypeError when hovering over Show All Nodes button in the Dom Tree inspector
+https://bugs.webkit.org/show_bug.cgi?id=133699
+
+Reviewed by Geoffrey Garen.
+
+The call to element._createTooltipForNode() was failing because element was sometimes not a 
+DOMTreeOutline but rather only a TreeElement (in the case of the Show All Nodes button specifically).
+A check for type fixes this issue.
+
+* UserInterface/Views/DOMTreeOutline.js:
+(WebInspector.DOMTreeOutline.prototype._onmousemove): Check for presence of _createTooltipForNode.
+
 2014-06-21  Jono Wells  jonowe...@apple.com
 
 Web Inspector: UI fonts should pull from system fonts automatically to whatever degree possible


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (170388 => 170389)

--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js	2014-06-24 20:45:00 UTC (rev 170388)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js	2014-06-24 20:59:51 UTC (rev 170389)
@@ -309,7 +309,7 @@
 this._previousHoveredElement = element;
 
 // Lazily compute tag-specific tooltips.
-if (element.representedObject  !element.tooltip)
+if (element.representedObject  !element.tooltip  element._createTooltipForNode)
 element._createTooltipForNode();
 }
 






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

[webkit-changes] [170391] tags/Safari-538.42.1/

2014-06-24 Thread bshafiei

Title: [170391] tags/Safari-538.42.1/








Revision 170391
Author bshaf...@apple.com
Date 2014-06-24 14:16:58 -0700 (Tue, 24 Jun 2014)


Log Message
New tag.

Added Paths

tags/Safari-538.42.1/




Diff

Property changes: tags/Safari-538.42.1



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

Added: svn:mergeinfo




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

[webkit-changes] [170392] tags/Safari-538.42.1/Source

2014-06-24 Thread bshafiei

Title: [170392] tags/Safari-538.42.1/Source








Revision 170392
Author bshaf...@apple.com
Date 2014-06-24 14:18:36 -0700 (Tue, 24 Jun 2014)


Log Message
Versioning.

Modified Paths

tags/Safari-538.42.1/Source/_javascript_Core/Configurations/Version.xcconfig
tags/Safari-538.42.1/Source/WebCore/Configurations/Version.xcconfig
tags/Safari-538.42.1/Source/WebInspectorUI/Configurations/Version.xcconfig
tags/Safari-538.42.1/Source/WebKit/mac/Configurations/Version.xcconfig
tags/Safari-538.42.1/Source/WebKit2/Configurations/Version.xcconfig




Diff

Modified: tags/Safari-538.42.1/Source/_javascript_Core/Configurations/Version.xcconfig (170391 => 170392)

--- tags/Safari-538.42.1/Source/_javascript_Core/Configurations/Version.xcconfig	2014-06-24 21:16:58 UTC (rev 170391)
+++ tags/Safari-538.42.1/Source/_javascript_Core/Configurations/Version.xcconfig	2014-06-24 21:18:36 UTC (rev 170392)
@@ -23,8 +23,8 @@
 
 MAJOR_VERSION = 538;
 MINOR_VERSION = 42;
-TINY_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+TINY_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-538.42.1/Source/WebCore/Configurations/Version.xcconfig (170391 => 170392)

--- tags/Safari-538.42.1/Source/WebCore/Configurations/Version.xcconfig	2014-06-24 21:16:58 UTC (rev 170391)
+++ tags/Safari-538.42.1/Source/WebCore/Configurations/Version.xcconfig	2014-06-24 21:18:36 UTC (rev 170392)
@@ -23,8 +23,8 @@
 
 MAJOR_VERSION = 538;
 MINOR_VERSION = 42;
-TINY_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+TINY_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-538.42.1/Source/WebInspectorUI/Configurations/Version.xcconfig (170391 => 170392)

--- tags/Safari-538.42.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2014-06-24 21:16:58 UTC (rev 170391)
+++ tags/Safari-538.42.1/Source/WebInspectorUI/Configurations/Version.xcconfig	2014-06-24 21:18:36 UTC (rev 170392)
@@ -1,7 +1,7 @@
 MAJOR_VERSION = 538;
 MINOR_VERSION = 42;
-TINY_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+TINY_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));


Modified: tags/Safari-538.42.1/Source/WebKit/mac/Configurations/Version.xcconfig (170391 => 170392)

--- tags/Safari-538.42.1/Source/WebKit/mac/Configurations/Version.xcconfig	2014-06-24 21:16:58 UTC (rev 170391)
+++ tags/Safari-538.42.1/Source/WebKit/mac/Configurations/Version.xcconfig	2014-06-24 21:18:36 UTC (rev 170392)
@@ -23,8 +23,8 @@
 
 MAJOR_VERSION = 538;
 MINOR_VERSION = 42;
-TINY_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+TINY_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));


Modified: tags/Safari-538.42.1/Source/WebKit2/Configurations/Version.xcconfig (170391 => 170392)

--- tags/Safari-538.42.1/Source/WebKit2/Configurations/Version.xcconfig	2014-06-24 21:16:58 UTC (rev 170391)
+++ tags/Safari-538.42.1/Source/WebKit2/Configurations/Version.xcconfig	2014-06-24 21:18:36 UTC (rev 170392)
@@ -23,8 +23,8 @@
 
 MAJOR_VERSION = 538;
 MINOR_VERSION = 42;
-TINY_VERSION = 0;
-FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION);
+TINY_VERSION = 1;
+FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 
 // The bundle version and short version string are set based on the current build configuration, see below.
 BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));






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

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

2014-06-24 Thread andersca

Title: [170393] trunk/Source/WebKit2








Revision 170393
Author ander...@apple.com
Date 2014-06-24 15:02:54 -0700 (Tue, 24 Jun 2014)


Log Message
Add iOS specific frame state member variables
https://bugs.webkit.org/show_bug.cgi?id=134268

Reviewed by Andreas Kling.

* Shared/SessionState.cpp:
(WebKit::FrameState::encode):
(WebKit::FrameState::decode):
* Shared/SessionState.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::HistoryEntryDataDecoder::operator):
(WebKit::decodeBackForwardTreeNode):
* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
(WebKit::toFrameState):
(WebKit::applyFrameState):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/SessionState.cpp
trunk/Source/WebKit2/Shared/SessionState.h
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/SessionStateConversion.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170392 => 170393)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 21:18:36 UTC (rev 170392)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 22:02:54 UTC (rev 170393)
@@ -1,3 +1,21 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Add iOS specific frame state member variables
+https://bugs.webkit.org/show_bug.cgi?id=134268
+
+Reviewed by Andreas Kling.
+
+* Shared/SessionState.cpp:
+(WebKit::FrameState::encode):
+(WebKit::FrameState::decode):
+* Shared/SessionState.h:
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::HistoryEntryDataDecoder::operator):
+(WebKit::decodeBackForwardTreeNode):
+* WebProcess/WebCoreSupport/SessionStateConversion.cpp:
+(WebKit::toFrameState):
+(WebKit::applyFrameState):
+
 2014-06-24  Enrica Casucci  enr...@apple.com
 
 iOS WebKit2: block selection tends to prefer block to single words even when the page is zoomed.


Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (170392 => 170393)

--- trunk/Source/WebKit2/Shared/SessionState.cpp	2014-06-24 21:18:36 UTC (rev 170392)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp	2014-06-24 22:02:54 UTC (rev 170393)
@@ -107,6 +107,14 @@
 
 encoder  httpBody;
 
+#if PLATFORM(IOS)
+encoder  exposedContentRect;
+encoder  unobscuredContentRect;
+encoder  minimumLayoutSizeInScrollViewCoordinates;
+encoder  contentSize;
+encoder  scaleIsInitial;
+#endif
+
 encoder  children;
 }
 
@@ -139,6 +147,19 @@
 if (!decoder.decode(result.httpBody))
 return false;
 
+#if PLATFORM(IOS)
+if (!decoder.decode(result.exposedContentRect))
+return false;
+if (!decoder.decode(result.unobscuredContentRect))
+return false;
+if (!decoder.decode(result.minimumLayoutSizeInScrollViewCoordinates))
+return false;
+if (!decoder.decode(result.contentSize))
+return false;
+if (!decoder.decode(result.scaleIsInitial))
+return false;
+#endif
+
 if (!decoder.decode(result.children))
 return false;
 


Modified: trunk/Source/WebKit2/Shared/SessionState.h (170392 => 170393)

--- trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 21:18:36 UTC (rev 170392)
+++ trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 22:02:54 UTC (rev 170393)
@@ -26,7 +26,8 @@
 #ifndef SessionState_h
 #define SessionState_h
 
-#include WebCore/IntPoint.h
+#include WebCore/FloatRect.h
+#include WebCore/IntRect.h
 #include WebCore/URL.h
 #include wtf/Optional.h
 #include wtf/Vector.h
@@ -92,6 +93,15 @@
 
 OptionalHTTPBody httpBody;
 
+// FIXME: These should not be per frame.
+#if PLATFORM(IOS)
+WebCore::FloatRect exposedContentRect;
+WebCore::IntRect unobscuredContentRect;
+WebCore::FloatSize minimumLayoutSizeInScrollViewCoordinates;
+WebCore::IntSize contentSize;
+bool scaleIsInitial = false;
+#endif
+
 VectorFrameState children;
 };
 


Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170392 => 170393)

--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 21:18:36 UTC (rev 170392)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 22:02:54 UTC (rev 170393)
@@ -314,6 +314,76 @@
 return *this;
 }
 
+#if PLATFORM(IOS)
+HistoryEntryDataDecoder operator(WebCore::FloatRect value)
+{
+value = WebCore::FloatRect();
+
+float x;
+*this  x;
+
+float y;
+*this  y;
+
+float width;
+*this  width;
+
+float height;
+*this  height;
+
+value = WebCore::FloatRect(x, y, width, height);
+return *this;
+}
+
+HistoryEntryDataDecoder operator(WebCore::IntRect value)
+{
+value = WebCore::IntRect();
+
+int32_t x;
+*this  x;
+
+int32_t y;
+*this  y;
+
+int32_t width;
+*this  width;
+
+int32_t height;
+*this  height;
+
+value = WebCore::IntRect(x, y, width,

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

2014-06-24 Thread andersca

Title: [170394] trunk/Source/WebKit2








Revision 170394
Author ander...@apple.com
Date 2014-06-24 15:24:23 -0700 (Tue, 24 Jun 2014)


Log Message
Add SPI for clearing an entire back-forward list
https://bugs.webkit.org/show_bug.cgi?id=134274

Reviewed by Dan Bernstein.

Add -[WKBackForwardList _clear] which only clears the back-forward items, and
change -[WKBackForwardList _removeAllItems] to remove all items including the current one.

* UIProcess/API/Cocoa/WKBackForwardList.mm:
(-[WKBackForwardList _removeAllItems]):
(-[WKBackForwardList _clear]):
* UIProcess/API/Cocoa/WKBackForwardListPrivate.h:
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::removeAllItems):
* UIProcess/WebBackForwardList.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h
trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp
trunk/Source/WebKit2/UIProcess/WebBackForwardList.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170393 => 170394)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 22:02:54 UTC (rev 170393)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 22:24:23 UTC (rev 170394)
@@ -1,5 +1,23 @@
 2014-06-24  Anders Carlsson  ander...@apple.com
 
+Add SPI for clearing an entire back-forward list
+https://bugs.webkit.org/show_bug.cgi?id=134274
+
+Reviewed by Dan Bernstein.
+
+Add -[WKBackForwardList _clear] which only clears the back-forward items, and
+change -[WKBackForwardList _removeAllItems] to remove all items including the current one.
+
+* UIProcess/API/Cocoa/WKBackForwardList.mm:
+(-[WKBackForwardList _removeAllItems]):
+(-[WKBackForwardList _clear]):
+* UIProcess/API/Cocoa/WKBackForwardListPrivate.h:
+* UIProcess/WebBackForwardList.cpp:
+(WebKit::WebBackForwardList::removeAllItems):
+* UIProcess/WebBackForwardList.h:
+
+2014-06-24  Anders Carlsson  ander...@apple.com
+
 Add iOS specific frame state member variables
 https://bugs.webkit.org/show_bug.cgi?id=134268
 


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm (170393 => 170394)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm	2014-06-24 22:02:54 UTC (rev 170393)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm	2014-06-24 22:24:23 UTC (rev 170394)
@@ -110,6 +110,11 @@
 
 - (void)_removeAllItems
 {
+_list-removeAllItems();
+}
+
+- (void)_clear
+{
 _list-clear();
 }
 


Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h (170393 => 170394)

--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h	2014-06-24 22:02:54 UTC (rev 170393)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListPrivate.h	2014-06-24 22:24:23 UTC (rev 170394)
@@ -31,6 +31,9 @@
 
 - (void)_removeAllItems;
 
+// Removes all items except the current one.
+- (void)_clear;
+
 @end
 
 #endif


Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170393 => 170394)

--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp	2014-06-24 22:02:54 UTC (rev 170393)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp	2014-06-24 22:24:23 UTC (rev 170394)
@@ -289,6 +289,26 @@
 return API::Array::create(std::move(vector));
 }
 
+void WebBackForwardList::removeAllItems()
+{
+ASSERT(!m_hasCurrentIndex || m_currentIndex  m_entries.size());
+
+VectorRefPtrWebBackForwardListItem removedItems;
+
+for (auto entry : m_entries) {
+ASSERT(entry);
+if (!entry)
+continue;
+
+m_page-backForwardRemovedItem(entry-itemID());
+removedItems.append(std::move(entry));
+}
+
+m_entries.clear();
+m_hasCurrentIndex = false;
+m_page-didChangeBackForwardList(nullptr, std::move(removedItems));
+}
+
 void WebBackForwardList::clear()
 {
 ASSERT(!m_hasCurrentIndex || m_currentIndex  m_entries.size());


Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170393 => 170394)

--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h	2014-06-24 22:02:54 UTC (rev 170393)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h	2014-06-24 22:24:23 UTC (rev 170394)
@@ -56,6 +56,7 @@
 
 void addItem(WebBackForwardListItem*);
 void goToItem(WebBackForwardListItem*);
+void removeAllItems();
 void clear();
 
 WebBackForwardListItem* currentItem() const;






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

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

2014-06-24 Thread andersca

Title: [170395] trunk/Source/WebKit2








Revision 170395
Author ander...@apple.com
Date 2014-06-24 15:32:33 -0700 (Tue, 24 Jun 2014)


Log Message
Add support for v0 legacy decoding
https://bugs.webkit.org/show_bug.cgi?id=134275

Reviewed by Andreas Kling.

* Shared/SessionState.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::LegacySessionStateDecoder::decodeV0SessionHistory):
(WebKit::LegacySessionStateDecoder::decodeV1SessionHistory):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/SessionState.h
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170394 => 170395)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 22:24:23 UTC (rev 170394)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 22:32:33 UTC (rev 170395)
@@ -1,5 +1,17 @@
 2014-06-24  Anders Carlsson  ander...@apple.com
 
+Add support for v0 legacy decoding
+https://bugs.webkit.org/show_bug.cgi?id=134275
+
+Reviewed by Andreas Kling.
+
+* Shared/SessionState.h:
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::LegacySessionStateDecoder::decodeV0SessionHistory):
+(WebKit::LegacySessionStateDecoder::decodeV1SessionHistory):
+
+2014-06-24  Anders Carlsson  ander...@apple.com
+
 Add SPI for clearing an entire back-forward list
 https://bugs.webkit.org/show_bug.cgi?id=134274
 


Modified: trunk/Source/WebKit2/Shared/SessionState.h (170394 => 170395)

--- trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 22:24:23 UTC (rev 170394)
+++ trunk/Source/WebKit2/Shared/SessionState.h	2014-06-24 22:32:33 UTC (rev 170395)
@@ -118,7 +118,7 @@
 static bool decode(IPC::ArgumentDecoder, BackForwardListState);
 
 VectorPageState items;
-uint32_t currentIndex;
+Optionaluint32_t currentIndex;
 };
 
 struct SessionState {


Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170394 => 170395)

--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 22:24:23 UTC (rev 170394)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 22:32:33 UTC (rev 170395)
@@ -118,8 +118,38 @@
 
 bool LegacySessionStateDecoder::decodeV0SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState backForwardListState) const
 {
-// FIXME: Implement.
-return false;
+auto currentIndexNumber = dynamic_cf_castCFNumberRef(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryCurrentIndexKey));
+if (!currentIndexNumber)
+return false;
+
+CFIndex currentIndex;
+if (!CFNumberGetValue(currentIndexNumber, kCFNumberCFIndexType, currentIndex))
+return false;
+
+if (currentIndex  -1)
+return false;
+
+auto historyEntries = dynamic_cf_castCFArrayRef(CFDictionaryGetValue(sessionHistoryDictionary, sessionHistoryEntriesKey));
+if (!historyEntries)
+return false;
+
+// Version 0 session history relied on currentIndex == -1 to represent the same thing as not having a current index.
+bool hasCurrentIndex = currentIndex != -1;
+
+if (!decodeSessionHistoryEntries(historyEntries, backForwardListState.items))
+return false;
+
+if (!hasCurrentIndex  CFArrayGetCount(historyEntries))
+return false;
+
+if (hasCurrentIndex) {
+if (static_castuint32_t(currentIndex) = backForwardListState.items.size())
+return false;
+
+backForwardListState.currentIndex = static_castuint32_t(currentIndex);
+}
+
+return true;
 }
 
 bool LegacySessionStateDecoder::decodeV1SessionHistory(CFDictionaryRef sessionHistoryDictionary, BackForwardListState backForwardListState) const
@@ -147,7 +177,7 @@
 return false;
 
 backForwardListState.currentIndex = static_castuint32_t(currentIndex);
-if (backForwardListState.currentIndex = backForwardListState.items.size())
+if (static_castuint32_t(currentIndex) = backForwardListState.items.size())
 return false;
 
 return true;






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

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

2014-06-24 Thread jer . noble

Title: [170396] trunk/Source/WebCore








Revision 170396
Author jer.no...@apple.com
Date 2014-06-24 15:33:38 -0700 (Tue, 24 Jun 2014)


Log Message
[MSE][Mac] Pass AVSampleBufferDisplayLayer HDCP status through to EME
https://bugs.webkit.org/show_bug.cgi?id=134221

Reviewed by Eric Carlson.

Pass the outputObscuredDueToInsufficientExternalProtection property of AVSampleBufferDisplayLayer
as an error to the associated MediaKeySession object.

* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(-[WebAVSampleBufferErrorListener invalidate]):
(-[WebAVSampleBufferErrorListener beginObservingLayer:]):
(-[WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170395 => 170396)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 22:32:33 UTC (rev 170395)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 22:33:38 UTC (rev 170396)
@@ -1,3 +1,18 @@
+2014-06-24  Jer Noble  jer.no...@apple.com
+
+[MSE][Mac] Pass AVSampleBufferDisplayLayer HDCP status through to EME
+https://bugs.webkit.org/show_bug.cgi?id=134221
+
+Reviewed by Eric Carlson.
+
+Pass the outputObscuredDueToInsufficientExternalProtection property of AVSampleBufferDisplayLayer
+as an error to the associated MediaKeySession object.
+
+* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+(-[WebAVSampleBufferErrorListener invalidate]):
+(-[WebAVSampleBufferErrorListener beginObservingLayer:]):
+(-[WebAVSampleBufferErrorListener observeValueForKeyPath:ofObject:change:context:]):
+
 2014-06-20  Myles C. Maxfield  mmaxfi...@apple.com
 
 Use unsigneds instead of ints for indexes into a string in text layout code


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (170395 => 170396)

--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2014-06-24 22:32:33 UTC (rev 170395)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2014-06-24 22:33:38 UTC (rev 170396)
@@ -319,8 +319,10 @@
 if (!_parent  !_layers.size()  !_renderers.size())
 return;
 
-for (auto layer : _layers)
+for (auto layer : _layers) {
 [layer removeObserver:self forKeyPath:@error];
+[layer removeObserver:self forKeyPath:@outputObscuredDueToInsufficientExternalProtection];
+}
 _layers.clear();
 
 for (auto renderer : _renderers)
@@ -339,6 +341,7 @@
 
 _layers.append(layer);
 [layer addObserver:self forKeyPath:@error options:NSKeyValueObservingOptionNew context:nullptr];
+[layer addObserver:self forKeyPath:@outputObscuredDueToInsufficientExternalProtection options:NSKeyValueObservingOptionNew context:nullptr];
 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(layerFailedToDecode:) name:AVSampleBufferDisplayLayerFailedToDecodeNotification object:layer];
 }
 
@@ -380,14 +383,23 @@
 RetainPtrWebAVSampleBufferErrorListener strongSelf = self;
 if ([object isKindOfClass:getAVSampleBufferDisplayLayerClass()]) {
 RetainPtrAVSampleBufferDisplayLayer layer = (AVSampleBufferDisplayLayer *)object;
-RetainPtrNSError error = [change valueForKey:NSKeyValueChangeNewKey];
-
 ASSERT(_layers.contains(layer.get()));
-ASSERT([keyPath isEqualTo:@error]);
 
-callOnMainThread([strongSelf, layer, error] {
-strongSelf-_parent-layerDidReceiveError(layer.get(), error.get());
-});
+if ([keyPath isEqualTo:@error]) {
+RetainPtrNSError error = [change valueForKey:NSKeyValueChangeNewKey];
+callOnMainThread([strongSelf, layer, error] {
+strongSelf-_parent-layerDidReceiveError(layer.get(), error.get());
+});
+} else if ([keyPath isEqualTo:@outputObscuredDueToInsufficientExternalProtection]) {
+if ([[change valueForKey:NSKeyValueChangeNewKey] boolValue]) {
+RetainPtrNSError error = [NSError errorWithDomain:@com.apple.WebKit code:'HDCP' userInfo:nil];
+callOnMainThread([strongSelf, layer, error] {
+strongSelf-_parent-layerDidReceiveError(layer.get(), error.get());
+});
+}
+} else
+ASSERT_NOT_REACHED();
+
 } else if ([object isKindOfClass:getAVSampleBufferAudioRendererClass()]) {
 RetainPtrAVSampleBufferAudioRenderer renderer = (AVSampleBufferAudioRenderer *)object;
 RetainPtrNSError error = [change valueForKey:NSKeyValueChangeNewKey];






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

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

2014-06-24 Thread jer . noble

Title: [170397] trunk/Source/WebCore








Revision 170397
Author jer.no...@apple.com
Date 2014-06-24 15:38:34 -0700 (Tue, 24 Jun 2014)


Log Message
[Fullscreen][Mac] WKView is not firstResponder after entering fullscreen mode
https://bugs.webkit.org/show_bug.cgi?id=134270

Reviewed by Jon Honeycutt.

The WebCoreFullScreenWindow's firstResponder is reset when the full screen animation completes and
the window's style is changed to a fullscreen style. Save the firstResponder, and if it's still in
the window's view hierarchy after the style changes, reset it to the firstResponder.

* platform/mac/WebCoreFullScreenWindow.mm:
(-[WebCoreFullScreenWindow setStyleMask:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/WebCoreFullScreenWindow.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170396 => 170397)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 22:33:38 UTC (rev 170396)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 22:38:34 UTC (rev 170397)
@@ -1,5 +1,19 @@
 2014-06-24  Jer Noble  jer.no...@apple.com
 
+[Fullscreen][Mac] WKView is not firstResponder after entering fullscreen mode
+https://bugs.webkit.org/show_bug.cgi?id=134270
+
+Reviewed by Jon Honeycutt.
+
+The WebCoreFullScreenWindow's firstResponder is reset when the full screen animation completes and
+the window's style is changed to a fullscreen style. Save the firstResponder, and if it's still in
+the window's view hierarchy after the style changes, reset it to the firstResponder.
+
+* platform/mac/WebCoreFullScreenWindow.mm:
+(-[WebCoreFullScreenWindow setStyleMask:]):
+
+2014-06-24  Jer Noble  jer.no...@apple.com
+
 [MSE][Mac] Pass AVSampleBufferDisplayLayer HDCP status through to EME
 https://bugs.webkit.org/show_bug.cgi?id=134221
 


Modified: trunk/Source/WebCore/platform/mac/WebCoreFullScreenWindow.mm (170396 => 170397)

--- trunk/Source/WebCore/platform/mac/WebCoreFullScreenWindow.mm	2014-06-24 22:33:38 UTC (rev 170396)
+++ trunk/Source/WebCore/platform/mac/WebCoreFullScreenWindow.mm	2014-06-24 22:38:34 UTC (rev 170397)
@@ -67,6 +67,20 @@
 {
 [[self windowController] performClose:sender];
 }
+
+- (void)setStyleMask:(NSUInteger)styleMask
+{
+// Changing the styleMask of a NSWindow can reset the firstResponder if the frame view changes,
+// so save off the existing one, and restore it if necessary after the call to -setStyleMask:.
+NSResponder* savedFirstResponder = [self firstResponder];
+
+[super setStyleMask:styleMask];
+
+if ([self firstResponder] != savedFirstResponder
+ [savedFirstResponder isKindOfClass:[NSView class]]
+ [(NSView*)savedFirstResponder isDescendantOf:[self contentView]])
+[self makeFirstResponder:savedFirstResponder];
+}
 @end
 
 #endif // ENABLE(FULLSCREEN_API)






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

[webkit-changes] [170399] branches/ftlopt/Source

2014-06-24 Thread mark . lam

Title: [170399] branches/ftlopt/Source








Revision 170399
Author mark@apple.com
Date 2014-06-24 16:16:37 -0700 (Tue, 24 Jun 2014)


Log Message
[ftlopt] Renamed DebuggerActivation to DebuggerScope.
https://webkit.org/b/134273

Reviewed by Michael Saboff.


Source/_javascript_Core: 
* CMakeLists.txt:
* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
* _javascript_Core.xcodeproj/project.pbxproj:
* debugger/DebuggerActivation.cpp: Removed.
* debugger/DebuggerActivation.h: Removed.
* debugger/DebuggerScope.cpp: Copied from ../../trunk/Source/_javascript_Core/debugger/DebuggerActivation.cpp.
(JSC::DebuggerScope::DebuggerScope):
(JSC::DebuggerScope::finishCreation):
(JSC::DebuggerScope::visitChildren):
(JSC::DebuggerScope::className):
(JSC::DebuggerScope::getOwnPropertySlot):
(JSC::DebuggerScope::put):
(JSC::DebuggerScope::deleteProperty):
(JSC::DebuggerScope::getOwnPropertyNames):
(JSC::DebuggerScope::defineOwnProperty):
(JSC::DebuggerActivation::DebuggerActivation): Deleted.
(JSC::DebuggerActivation::finishCreation): Deleted.
(JSC::DebuggerActivation::visitChildren): Deleted.
(JSC::DebuggerActivation::className): Deleted.
(JSC::DebuggerActivation::getOwnPropertySlot): Deleted.
(JSC::DebuggerActivation::put): Deleted.
(JSC::DebuggerActivation::deleteProperty): Deleted.
(JSC::DebuggerActivation::getOwnPropertyNames): Deleted.
(JSC::DebuggerActivation::defineOwnProperty): Deleted.
* debugger/DebuggerScope.h: Copied from ../../trunk/Source/_javascript_Core/debugger/DebuggerActivation.h.
(JSC::DebuggerScope::create):
(JSC::DebuggerActivation::create): Deleted.
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:

Source/WebCore: 
No new tests.

* ForwardingHeaders/debugger/DebuggerActivation.h: Removed.
- Removed because this is not used.

Source/WebKit/mac: 
* WebView/WebScriptDebugDelegate.mm:
- Removed unneeded #include.

Modified Paths

branches/ftlopt/Source/_javascript_Core/CMakeLists.txt
branches/ftlopt/Source/_javascript_Core/ChangeLog
branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj
branches/ftlopt/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters
branches/ftlopt/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
branches/ftlopt/Source/_javascript_Core/runtime/VM.cpp
branches/ftlopt/Source/_javascript_Core/runtime/VM.h
branches/ftlopt/Source/WebCore/ChangeLog
branches/ftlopt/Source/WebKit/mac/ChangeLog
branches/ftlopt/Source/WebKit/mac/WebView/WebScriptDebugDelegate.mm


Added Paths

branches/ftlopt/Source/_javascript_Core/debugger/DebuggerScope.cpp
branches/ftlopt/Source/_javascript_Core/debugger/DebuggerScope.h


Removed Paths

branches/ftlopt/Source/_javascript_Core/debugger/DebuggerActivation.cpp
branches/ftlopt/Source/_javascript_Core/debugger/DebuggerActivation.h
branches/ftlopt/Source/WebCore/ForwardingHeaders/debugger/DebuggerActivation.h




Diff

Modified: branches/ftlopt/Source/_javascript_Core/CMakeLists.txt (170398 => 170399)

--- branches/ftlopt/Source/_javascript_Core/CMakeLists.txt	2014-06-24 22:56:41 UTC (rev 170398)
+++ branches/ftlopt/Source/_javascript_Core/CMakeLists.txt	2014-06-24 23:16:37 UTC (rev 170399)
@@ -103,8 +103,8 @@
 bytecompiler/NodesCodegen.cpp
 
 debugger/Debugger.cpp
-debugger/DebuggerActivation.cpp
 debugger/DebuggerCallFrame.cpp
+debugger/DebuggerScope.cpp
 
 dfg/DFGAbstractHeap.cpp
 dfg/DFGAbstractValue.cpp


Modified: branches/ftlopt/Source/_javascript_Core/ChangeLog (170398 => 170399)

--- branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 22:56:41 UTC (rev 170398)
+++ branches/ftlopt/Source/_javascript_Core/ChangeLog	2014-06-24 23:16:37 UTC (rev 170399)
@@ -1,3 +1,42 @@
+2014-06-24  Mark Lam  mark@apple.com
+
+[ftlopt] Renamed DebuggerActivation to DebuggerScope.
+https://webkit.org/b/134273
+
+Reviewed by Michael Saboff.
+
+* CMakeLists.txt:
+* _javascript_Core.vcxproj/_javascript_Core.vcxproj:
+* _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters:
+* _javascript_Core.xcodeproj/project.pbxproj:
+* debugger/DebuggerActivation.cpp: Removed.
+* debugger/DebuggerActivation.h: Removed.
+* debugger/DebuggerScope.cpp: Copied from ../../trunk/Source/_javascript_Core/debugger/DebuggerActivation.cpp.
+(JSC::DebuggerScope::DebuggerScope):
+(JSC::DebuggerScope::finishCreation):
+(JSC::DebuggerScope::visitChildren):
+(JSC::DebuggerScope::className):
+(JSC::DebuggerScope::getOwnPropertySlot):
+(JSC::DebuggerScope::put):
+(JSC::DebuggerScope::deleteProperty):
+(JSC::DebuggerScope::getOwnPropertyNames):
+(JSC::DebuggerScope::defineOwnProperty):
+(JSC::DebuggerActivation::DebuggerActivation): Deleted.
+(JSC::DebuggerActivation::finishCreation): Deleted.
+(JSC::DebuggerActivation::visitChildren): Deleted.

[webkit-changes] [170400] trunk/Source

2014-06-24 Thread beidson

Title: [170400] trunk/Source








Revision 170400
Author beid...@apple.com
Date 2014-06-24 16:17:22 -0700 (Tue, 24 Jun 2014)


Log Message
Enable GAMEPAD in the Mac build, but disabled at runtime.
https://bugs.webkit.org/show_bug.cgi?id=134255

Reviewed by Dean Jackson.

Source/_javascript_Core:
* Configurations/FeatureDefines.xcconfig:

* runtime/JSObject.h: Export JSObject::removeDirect() to allow disabling
  functions at runtime.

Source/WebCore:
No new tests (No changes to a tested config).

* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation): Add the ability to have a function be EnabledAtRuntime by
  removing such functions from the prototype if they are disabled.

Change the three new objects and the one new function to be EnabledAtRuntime
* Modules/gamepad/Gamepad.idl:
* Modules/gamepad/GamepadButton.idl:
* Modules/gamepad/GamepadEvent.idl:
* Modules/gamepad/NavigatorGamepad.idl:

Add a RuntimeEnabledFeature for Gamepads:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setGamepadsEnabled):
(WebCore::RuntimeEnabledFeatures::gamepadsEnabled):

* Configurations/FeatureDefines.xcconfig:

Source/WebKit/mac:
* Configurations/FeatureDefines.xcconfig:

* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(-[WebPreferences gamepadsEnabled]):
(-[WebPreferences setGamepadsEnabled:]):
* WebView/WebPreferencesPrivate.h:

* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit2:
* Configurations/FeatureDefines.xcconfig:

* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetGamepadsEnabled):
(WKPreferencesGetGamepadsEnabled):
* UIProcess/API/C/WKPreferencesRefPrivate.h:

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig
trunk/Source/_javascript_Core/runtime/JSObject.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig
trunk/Source/WebCore/Modules/gamepad/Gamepad.idl
trunk/Source/WebCore/Modules/gamepad/GamepadButton.idl
trunk/Source/WebCore/Modules/gamepad/GamepadEvent.idl
trunk/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
trunk/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
trunk/Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
trunk/Source/WebKit/mac/WebView/WebPreferences.mm
trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig
trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h
trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (170399 => 170400)

--- trunk/Source/_javascript_Core/ChangeLog	2014-06-24 23:16:37 UTC (rev 170399)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-06-24 23:17:22 UTC (rev 170400)
@@ -1,3 +1,15 @@
+2014-06-24  Brady Eidson  beid...@apple.com
+
+Enable GAMEPAD in the Mac build, but disabled at runtime.
+https://bugs.webkit.org/show_bug.cgi?id=134255
+
+Reviewed by Dean Jackson.
+
+* Configurations/FeatureDefines.xcconfig:
+
+* runtime/JSObject.h: Export JSObject::removeDirect() to allow disabling
+  functions at runtime.
+
 2014-06-24  Mark Hahnenberg  mhahnenb...@apple.com
 
 REGRESSION (r169703): Invalid cast in JSC::asGetterSetter / JSC::JSObject::defineOwnNonIndexProperty


Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (170399 => 170400)

--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2014-06-24 23:16:37 UTC (rev 170399)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig	2014-06-24 23:17:22 UTC (rev 170400)
@@ -87,7 +87,8 @@
 ENABLE_FONT_LOAD_EVENTS = ;
 ENABLE_FULLSCREEN_API = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
 ENABLE_FULLSCREEN_API_macosx = ENABLE_FULLSCREEN_API;
-ENABLE_GAMEPAD = ;
+ENABLE_GAMEPAD = $(ENABLE_GAMEPAD_$(PLATFORM_NAME));
+ENABLE_GAMEPAD_macosx = ENABLE_GAMEPAD;
 ENABLE_GAMEPAD_DEPRECATED = ;
 ENABLE_GEOLOCATION = ENABLE_GEOLOCATION;
 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING = $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING_$(PLATFORM_NAME));


Modified: trunk/Source/_javascript_Core/runtime/JSObject.h (170399 => 170400)

--- trunk/Source/_javascript_Core/runtime/JSObject.h	2014-06-24 23:16:37 UTC (rev 170399)
+++ trunk/Source/_javascript_Core/runtime/JSObject.h	2014-06-24

[webkit-changes] [170401] tags/Safari-538.42.1/Source/WebKit2

2014-06-24 Thread bshafiei

Title: [170401] tags/Safari-538.42.1/Source/WebKit2








Revision 170401
Author bshaf...@apple.com
Date 2014-06-24 16:18:55 -0700 (Tue, 24 Jun 2014)


Log Message
Merged r170385. rdar://problem/17427740

Modified Paths

tags/Safari-538.42.1/Source/WebKit2/ChangeLog
tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h




Diff

Modified: tags/Safari-538.42.1/Source/WebKit2/ChangeLog (170400 => 170401)

--- tags/Safari-538.42.1/Source/WebKit2/ChangeLog	2014-06-24 23:17:22 UTC (rev 170400)
+++ tags/Safari-538.42.1/Source/WebKit2/ChangeLog	2014-06-24 23:18:55 UTC (rev 170401)
@@ -1,3 +1,20 @@
+2014-06-24  Babak Shafiei  bshaf...@apple.com
+
+Merge r170385
+
+2014-06-24  Andreas Kling  akl...@apple.com
+
+[iOS WebKit2] Disable screen font substitution by default.
+https://webkit.org/b/134266
+rdar://problem/17427740
+
+Just like OS X = 10.9, screen font substitution should be disabled
+by default in WebKit2 for iOS.
+
+Reviewed by Anders Carlsson.
+
+* Shared/WebPreferencesDefinitions.h:
+
 2014-06-23  Lucas Forschler  lforsch...@apple.com
 
 Merge r170311


Modified: tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170400 => 170401)

--- tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2014-06-24 23:17:22 UTC (rev 170400)
+++ tags/Safari-538.42.1/Source/WebKit2/Shared/WebPreferencesDefinitions.h	2014-06-24 23:18:55 UTC (rev 170401)
@@ -40,7 +40,7 @@
 #define DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED false
 #endif
 
-#if PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090
+#if PLATFORM(IOS) || (PLATFORM(MAC)  __MAC_OS_X_VERSION_MIN_REQUIRED = 1090)
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED false
 #else
 #define DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED true






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

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

2014-06-24 Thread mmaxfield

Title: [170402] trunk/Source/WebCore








Revision 170402
Author mmaxfi...@apple.com
Date 2014-06-24 16:32:31 -0700 (Tue, 24 Jun 2014)


Log Message
advanceByCombiningCharacterSequence() can be simplified
https://bugs.webkit.org/show_bug.cgi?id=133591

Reviewed by Dean Jackson.

Use U16_NEXT() because it already does what we're trying to do.

No new tests because there is no behavior change.

* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::advanceByCombiningCharacterSequence):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170401 => 170402)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 23:18:55 UTC (rev 170401)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 23:32:31 UTC (rev 170402)
@@ -1,3 +1,17 @@
+2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
+
+advanceByCombiningCharacterSequence() can be simplified
+https://bugs.webkit.org/show_bug.cgi?id=133591
+
+Reviewed by Dean Jackson.
+
+Use U16_NEXT() because it already does what we're trying to do.
+
+No new tests because there is no behavior change.
+
+* platform/graphics/mac/ComplexTextController.cpp:
+(WebCore::advanceByCombiningCharacterSequence):
+
 2014-06-24  Brady Eidson  beid...@apple.com
 
 Enable GAMEPAD in the Mac build, but disabled at runtime.


Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (170401 => 170402)

--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-24 23:18:55 UTC (rev 170401)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-24 23:32:31 UTC (rev 170402)
@@ -268,18 +268,12 @@
 
 markCount = 0;
 
-baseCharacter = *iterator++;
+unsigned i = 0;
+U16_NEXT(iterator, i, end - iterator, baseCharacter);
+iterator = iterator + i;
 
-if (U16_IS_SURROGATE(baseCharacter)) {
-if (!U16_IS_LEAD(baseCharacter))
-return false;
-if (iterator == end)
-return false;
-UChar trail = *iterator++;
-if (!U16_IS_TRAIL(trail))
-return false;
-baseCharacter = U16_GET_SUPPLEMENTARY(baseCharacter, trail);
-}
+if (U16_IS_SURROGATE(baseCharacter))
+return false;
 
 // Consume marks.
 while (iterator  end) {






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

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

2014-06-24 Thread andersca

Title: [170403] trunk/Source/WebKit2








Revision 170403
Author ander...@apple.com
Date 2014-06-24 16:33:03 -0700 (Tue, 24 Jun 2014)


Log Message
Simplify decodeLegacySessionState
https://bugs.webkit.org/show_bug.cgi?id=134280

Reviewed by Andreas Kling.

There's no need to use a LegacySessionStateDecoder object with a single member,
just make all functions static and only export a single entry point; decodeLegacySessionState.

No functionality change, just moving code around.

* UIProcess/API/C/WKSessionStateRef.cpp:
(WKSessionStateCreateFromData):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeSessionHistoryEntryData):
(WebKit::decodeSessionHistoryEntry):
(WebKit::decodeSessionHistoryEntries):
(WebKit::decodeV0SessionHistory):
(WebKit::decodeV1SessionHistory):
(WebKit::decodeSessionHistory):
(WebKit::decodeLegacySessionState):
(WebKit::LegacySessionStateDecoder::LegacySessionStateDecoder): Deleted.
(WebKit::LegacySessionStateDecoder::~LegacySessionStateDecoder): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionState): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeV0SessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeV1SessionHistory): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntry): Deleted.
(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData): Deleted.
* UIProcess/mac/LegacySessionStateCoding.h:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170402 => 170403)

--- trunk/Source/WebKit2/ChangeLog	2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-24 23:33:03 UTC (rev 170403)
@@ -1,3 +1,36 @@
+2014-06-24  Anders Carlsson  ander...@apple.com
+
+Simplify decodeLegacySessionState
+https://bugs.webkit.org/show_bug.cgi?id=134280
+
+Reviewed by Andreas Kling.
+
+There's no need to use a LegacySessionStateDecoder object with a single member,
+just make all functions static and only export a single entry point; decodeLegacySessionState.
+
+No functionality change, just moving code around.
+
+* UIProcess/API/C/WKSessionStateRef.cpp:
+(WKSessionStateCreateFromData):
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::decodeSessionHistoryEntryData):
+(WebKit::decodeSessionHistoryEntry):
+(WebKit::decodeSessionHistoryEntries):
+(WebKit::decodeV0SessionHistory):
+(WebKit::decodeV1SessionHistory):
+(WebKit::decodeSessionHistory):
+(WebKit::decodeLegacySessionState):
+(WebKit::LegacySessionStateDecoder::LegacySessionStateDecoder): Deleted.
+(WebKit::LegacySessionStateDecoder::~LegacySessionStateDecoder): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeSessionState): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeSessionHistory): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeV0SessionHistory): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeV1SessionHistory): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntries): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntry): Deleted.
+(WebKit::LegacySessionStateDecoder::decodeSessionHistoryEntryData): Deleted.
+* UIProcess/mac/LegacySessionStateCoding.h:
+
 2014-06-24  Brady Eidson  beid...@apple.com
 
 Enable GAMEPAD in the Mac build, but disabled at runtime.


Modified: trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp (170402 => 170403)

--- trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp	2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp	2014-06-24 23:33:03 UTC (rev 170403)
@@ -33,10 +33,8 @@
 
 WKSessionStateRef WKSessionStateCreateFromData(WKDataRef data)
 {
-WebKit::LegacySessionStateDecoder decoder { WebKit::toImpl(data) };
-
 WebKit::SessionState sessionState;
-if (!decoder.decodeSessionState(sessionState))
+if (!WebKit::decodeLegacySessionState(*WebKit::toImpl(data), sessionState))
 return nullptr;
 
 return WebKit::toAPI(API::SessionState::create(std::move(sessionState)).leakRef());


Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170402 => 170403)

--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 23:32:31 UTC (rev 170402)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp	2014-06-24 23:33:03 UTC (rev 170403)
@@ -53,181 +53,6 @@
 // Session history entry data.
 const uint32_t sessionHistoryEntryDataVersion = 2;

[webkit-changes] [170404] trunk

2014-06-24 Thread mrowe

Title: [170404] trunk








Revision 170404
Author mr...@apple.com
Date 2014-06-24 16:33:55 -0700 (Tue, 24 Jun 2014)


Log Message
WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
https://webkit.org/b/134271 / rdar://problem/16270167

Reviewed by Brady Eidson.

Source/WebCore:
Tests: http/tests/globalhistory/history-delegate-pushstate.html
   http/tests/globalhistory/history-delegate-replacestate.html

* page/History.cpp:
(WebCore::History::stateObjectAdded): Call HistoryController after updating the document's URL so that the
URL will reflect the destination of the navigation when FrameLoaderClient::updateGlobalHistory is called.

LayoutTests:
* http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
* http/tests/globalhistory/history-delegate-pushstate.html: Added.
* http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
* http/tests/globalhistory/history-delegate-replacestate.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/History.cpp


Added Paths

trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt
trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html
trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate-expected.txt
trunk/LayoutTests/http/tests/globalhistory/history-delegate-replacestate.html




Diff

Modified: trunk/LayoutTests/ChangeLog (170403 => 170404)

--- trunk/LayoutTests/ChangeLog	2014-06-24 23:33:03 UTC (rev 170403)
+++ trunk/LayoutTests/ChangeLog	2014-06-24 23:33:55 UTC (rev 170404)
@@ -1,3 +1,15 @@
+2014-06-24  Mark Rowe  mr...@apple.com
+
+WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used
+https://webkit.org/b/134271 / rdar://problem/16270167
+
+Reviewed by Brady Eidson.
+
+* http/tests/globalhistory/history-delegate-pushstate-expected.txt: Added.
+* http/tests/globalhistory/history-delegate-pushstate.html: Added.
+* http/tests/globalhistory/history-delegate-replacestate-expected.txt: Added.
+* http/tests/globalhistory/history-delegate-replacestate.html: Added.
+
 2014-06-24  Yusuke Suzuki  utatane@gmail.com
 
 CSS JIT: Add positionInRootFragments to SelectorFragment


Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt (0 => 170404)

--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt	(rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate-expected.txt	2014-06-24 23:33:55 UTC (rev 170404)
@@ -0,0 +1,10 @@
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?1 with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?2 with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?3 with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?4 with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+WebView navigated to url http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?5 with title  with HTTP equivalent method GET.  The navigation was successful and was not a client redirect.
+This tests functionality of the history delegate related to history.pushState.


Added: trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html (0 => 170404)

--- trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html	(rev 0)
+++ trunk/LayoutTests/http/tests/globalhistory/history-delegate-pushstate.html	2014-06-24 23:33:55 UTC (rev 170404)
@@ -0,0 +1,23 @@
+script
+
+if (window.testRunner) {
+testRunner.waitUntilDone();
+testRunner.dumpAsText();
+testRunner.dumpFrameLoadCallbacks();
+}
+
+var n = 0;
+function runTest() {
+if (++n  5) {
+if (window.testRunner)
+testRunner.notifyDone();
+return;
+}
+history.pushState({}, 'State ' + n, 'http://127.0.0.1:8000/globalhistory/history-delegate-pushstate.html?' + n);
+setTimeout(runTest, 10);
+}
+
+/script
+body

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

2014-06-24 Thread jer . noble

Title: [170405] trunk/Source/WebCore








Revision 170405
Author jer.no...@apple.com
Date 2014-06-24 16:39:15 -0700 (Tue, 24 Jun 2014)


Log Message
[MSE][Mac] Uncaught exception when deallocating AVSampleBufferDisplayLayer
https://bugs.webkit.org/show_bug.cgi?id=134281

Reviewed by Brent Fulgham.

AVSampleBufferDisplayLayer is throwing an exception from its -dealloc method because KVO observers exist
at the time of dealloc. Remove the observer for outputObscuredDueToInsufficientExternalProtection inside
-stopObservingLayer.

* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
(-[WebAVSampleBufferErrorListener stopObservingLayer:]):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (170404 => 170405)

--- trunk/Source/WebCore/ChangeLog	2014-06-24 23:33:55 UTC (rev 170404)
+++ trunk/Source/WebCore/ChangeLog	2014-06-24 23:39:15 UTC (rev 170405)
@@ -1,3 +1,17 @@
+2014-06-24  Jer Noble  jer.no...@apple.com
+
+[MSE][Mac] Uncaught exception when deallocating AVSampleBufferDisplayLayer
+https://bugs.webkit.org/show_bug.cgi?id=134281
+
+Reviewed by Brent Fulgham.
+
+AVSampleBufferDisplayLayer is throwing an exception from its -dealloc method because KVO observers exist
+at the time of dealloc. Remove the observer for outputObscuredDueToInsufficientExternalProtection inside
+-stopObservingLayer.
+
+* platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:
+(-[WebAVSampleBufferErrorListener stopObservingLayer:]):
+
 2014-06-24  Mark Rowe  mr...@apple.com
 
 WKContextHistoryClient::didNavigateWithNavigationData is passed incorrect URL when history.pushState is used


Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm (170404 => 170405)

--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2014-06-24 23:33:55 UTC (rev 170404)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm	2014-06-24 23:39:15 UTC (rev 170405)
@@ -351,6 +351,7 @@
 ASSERT(_layers.contains(layer));
 
 [layer removeObserver:self forKeyPath:@error];
+[layer removeObserver:self forKeyPath:@outputObscuredDueToInsufficientExternalProtection];
 _layers.remove(_layers.find(layer));
 
 [[NSNotificationCenter defaultCenter] removeObserver:self name:AVSampleBufferDisplayLayerFailedToDecodeNotification object:layer];






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

[webkit-changes] [170407] trunk/Source/WebKit/mac

2014-06-24 Thread benjamin

Title: [170407] trunk/Source/WebKit/mac








Revision 170407
Author benja...@webkit.org
Date 2014-06-24 17:13:04 -0700 (Tue, 24 Jun 2014)


Log Message
WK1 WebFrameNetworkingContext cleanup: do not instanciate an empty NSString to create an empty WTF::String
https://bugs.webkit.org/show_bug.cgi?id=134222

Patch by Benjamin Poulain bpoul...@apple.com on 2014-06-24
Reviewed by Andreas Kling.

* WebCoreSupport/WebFrameNetworkingContext.mm:
(WebFrameNetworkingContext::sourceApplicationIdentifier):

Modified Paths

trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm




Diff

Modified: trunk/Source/WebKit/mac/ChangeLog (170406 => 170407)

--- trunk/Source/WebKit/mac/ChangeLog	2014-06-24 23:50:07 UTC (rev 170406)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-06-25 00:13:04 UTC (rev 170407)
@@ -1,3 +1,13 @@
+2014-06-24  Benjamin Poulain  bpoul...@apple.com
+
+WK1 WebFrameNetworkingContext cleanup: do not instanciate an empty NSString to create an empty WTF::String
+https://bugs.webkit.org/show_bug.cgi?id=134222
+
+Reviewed by Andreas Kling.
+
+* WebCoreSupport/WebFrameNetworkingContext.mm:
+(WebFrameNetworkingContext::sourceApplicationIdentifier):
+
 2014-06-24  Joseph Pecoraro  pecor...@apple.com
 
 [iOS]: WK2 Inspector Node Highlighting


Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm (170406 => 170407)

--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm	2014-06-24 23:50:07 UTC (rev 170406)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.mm	2014-06-25 00:13:04 UTC (rev 170407)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -106,7 +106,7 @@
 
 String WebFrameNetworkingContext::sourceApplicationIdentifier() const
 {
-return @;
+return emptyString();
 }
 
 ResourceError WebFrameNetworkingContext::blockedError(const ResourceRequest request) const






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

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

2014-06-24 Thread benjamin

Title: [170408] trunk/Source/WebKit2








Revision 170408
Author benja...@webkit.org
Date 2014-06-24 17:15:25 -0700 (Tue, 24 Jun 2014)


Log Message
[iOS][WK2] Adopt the C API of UIWebTouchEventsGestureRecognizer for touch event mapping
https://bugs.webkit.org/show_bug.cgi?id=134234

Patch by Benjamin Poulain bpoul...@apple.com on 2014-06-24
Reviewed by Tim Horton.

The C API is more efficient and expose properties we will need for other patches. This patch moves from
getting each value independently on UIWebTouchEventsGestureRecognizer to the single structure exposed
by _UIWebTouchEvent.

* Shared/NativeWebTouchEvent.h:
* Shared/ios/NativeWebTouchEventIOS.mm:
(WebKit::convertTouchPhase):
(WebKit::extractWebTouchPoint):
(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _webTouchEventsRecognized:]):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h
trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170407 => 170408)

--- trunk/Source/WebKit2/ChangeLog	2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-25 00:15:25 UTC (rev 170408)
@@ -1,3 +1,22 @@
+2014-06-24  Benjamin Poulain  bpoul...@apple.com
+
+[iOS][WK2] Adopt the C API of UIWebTouchEventsGestureRecognizer for touch event mapping
+https://bugs.webkit.org/show_bug.cgi?id=134234
+
+Reviewed by Tim Horton.
+
+The C API is more efficient and expose properties we will need for other patches. This patch moves from
+getting each value independently on UIWebTouchEventsGestureRecognizer to the single structure exposed
+by _UIWebTouchEvent.
+
+* Shared/NativeWebTouchEvent.h:
+* Shared/ios/NativeWebTouchEventIOS.mm:
+(WebKit::convertTouchPhase):
+(WebKit::extractWebTouchPoint):
+(WebKit::NativeWebTouchEvent::NativeWebTouchEvent):
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView _webTouchEventsRecognized:]):
+
 2014-06-24  Joseph Pecoraro  pecor...@apple.com
 
 [iOS]: WK2 Inspector Node Highlighting


Modified: trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h (170407 => 170408)

--- trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h	2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/Shared/NativeWebTouchEvent.h	2014-06-25 00:15:25 UTC (rev 170408)
@@ -31,8 +31,7 @@
 #include WebEvent.h
 
 #if PLATFORM(IOS)
-#include wtf/RetainPtr.h
-OBJC_CLASS UIWebTouchEventsGestureRecognizer;
+struct _UIWebTouchEvent;
 #elif PLATFORM(GTK)
 #include WebCore/GUniquePtrGtk.h
 #include WebCore/GtkTouchContextHelper.h
@@ -47,7 +46,7 @@
 class NativeWebTouchEvent : public WebTouchEvent {
 public:
 #if PLATFORM(IOS)
-explicit NativeWebTouchEvent(UIWebTouchEventsGestureRecognizer *);
+explicit NativeWebTouchEvent(const _UIWebTouchEvent*);
 #elif PLATFORM(GTK)
 NativeWebTouchEvent(const NativeWebTouchEvent);
 NativeWebTouchEvent(GdkEvent*, WebCore::GtkTouchContextHelper);


Modified: trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm (170407 => 170408)

--- trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm	2014-06-25 00:13:04 UTC (rev 170407)
+++ trunk/Source/WebKit2/Shared/ios/NativeWebTouchEventIOS.mm	2014-06-25 00:15:25 UTC (rev 170408)
@@ -51,9 +51,8 @@
 }
 }
 
-static WebPlatformTouchPoint::TouchPointState convertTouchPhase(NSNumber *touchPhaseNumber)
+static WebPlatformTouchPoint::TouchPointState convertTouchPhase(UITouchPhase touchPhase)
 {
-UITouchPhase touchPhase = static_castUITouchPhase([touchPhaseNumber unsignedIntValue]);
 switch (touchPhase) {
 case UITouchPhaseBegan:
 return WebPlatformTouchPoint::TouchPressed;
@@ -76,27 +75,24 @@
 return WebCore::IntPoint(position);
 }
 
-static inline VectorWebPlatformTouchPoint extractWebTouchPoint(UIWebTouchEventsGestureRecognizer *gestureRecognizer)
+static inline VectorWebPlatformTouchPoint extractWebTouchPoint(const _UIWebTouchEvent* event)
 {
-unsigned touchCount = [gestureRecognizer.touchLocations count];
-NSArray *touchLocations = gestureRecognizer.touchLocations;
-NSArray *touchIdentifiers = gestureRecognizer.touchIdentifiers;
-NSArray *touchPhases = gestureRecognizer.touchPhases;
+unsigned touchCount = event-touchPointCount;
 
 VectorWebPlatformTouchPoint touchPointList;
 touchPointList.reserveInitialCapacity(touchCount);
 for (unsigned i = 0; i  touchCount; ++i) {
-unsigned identifier = [(NSNumber *)[touchIdentifiers objectAtIndex:i] unsignedIntValue];
-WebCore::IntPoint location = positionForCGPoint([(NSValue *)[touchLocations objectAtIndex:i] pointValue]);
-WebPlatformTouchPoint::TouchPointState phase = convertTouchPhase([touchPhases objectAtIndex:i]);
-WebPlatformTouchPoint touchPoint(identifier, location,

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

2014-06-24 Thread benjamin

Title: [170409] trunk/Source/WebKit2








Revision 170409
Author benja...@webkit.org
Date 2014-06-24 17:18:45 -0700 (Tue, 24 Jun 2014)


Log Message
[iOS][WK2] We should not start potential tap activation unless the tap gesture recognizer succeed
https://bugs.webkit.org/show_bug.cgi?id=134277
rdar://problem/17439973

Patch by Benjamin Poulain bpoul...@apple.com on 2014-06-24
Reviewed by Anders Carlsson.

* UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m:
(-[WKSyntheticClickTapGestureRecognizer setState:]):
We were calling the _gestureRecognizedAction even for failure states. The potential activation work
is not light on the Web Process, we should not start if we don't care about the result.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m




Diff

Modified: trunk/Source/WebKit2/ChangeLog (170408 => 170409)

--- trunk/Source/WebKit2/ChangeLog	2014-06-25 00:15:25 UTC (rev 170408)
+++ trunk/Source/WebKit2/ChangeLog	2014-06-25 00:18:45 UTC (rev 170409)
@@ -1,5 +1,18 @@
 2014-06-24  Benjamin Poulain  bpoul...@apple.com
 
+[iOS][WK2] We should not start potential tap activation unless the tap gesture recognizer succeed
+https://bugs.webkit.org/show_bug.cgi?id=134277
+rdar://problem/17439973
+
+Reviewed by Anders Carlsson.
+
+* UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m:
+(-[WKSyntheticClickTapGestureRecognizer setState:]):
+We were calling the _gestureRecognizedAction even for failure states. The potential activation work
+is not light on the Web Process, we should not start if we don't care about the result.
+
+2014-06-24  Benjamin Poulain  bpoul...@apple.com
+
 [iOS][WK2] Adopt the C API of UIWebTouchEventsGestureRecognizer for touch event mapping
 https://bugs.webkit.org/show_bug.cgi?id=134234
 


Modified: trunk/Source/WebKit2/UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m (170408 => 170409)

--- trunk/Source/WebKit2/UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m	2014-06-25 00:15:25 UTC (rev 170408)
+++ trunk/Source/WebKit2/UIProcess/ios/WKSyntheticClickTapGestureRecognizer.m	2014-06-25 00:18:45 UTC (rev 170409)
@@ -51,7 +51,8 @@
 
 - (void)setState:(UIGestureRecognizerState)state
 {
-[_gestureRecognizedTarget performSelector:_gestureRecognizedAction withObject:self];
+if (state == UIGestureRecognizerStateEnded)
+[_gestureRecognizedTarget performSelector:_gestureRecognizedAction withObject:self];
 [super setState:state];
 }
 






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

[webkit-changes] [170410] trunk/Websites/webkit.org

2014-06-24 Thread bfulgham

Title: [170410] trunk/Websites/webkit.org








Revision 170410
Author bfulg...@apple.com
Date 2014-06-24 17:36:53 -0700 (Tue, 24 Jun 2014)


Log Message
[Win] Remove some out-of-date stuff from our instructions.
https://bugs.webkit.org/show_bug.cgi?id=134282

Reviewed by Tim Horton.

* building/build.html: Remove reference to Platform SDK which we don't manuall 
install anymore (it's part of Visual Studio 2013).
* building/tools.html: We no longer need QuickTime SDK, QuickTime Player, or
the DirectX SDK.

Modified Paths

trunk/Websites/webkit.org/ChangeLog
trunk/Websites/webkit.org/building/build.html
trunk/Websites/webkit.org/building/tools.html




Diff

Modified: trunk/Websites/webkit.org/ChangeLog (170409 => 170410)

--- trunk/Websites/webkit.org/ChangeLog	2014-06-25 00:18:45 UTC (rev 170409)
+++ trunk/Websites/webkit.org/ChangeLog	2014-06-25 00:36:53 UTC (rev 170410)
@@ -1,3 +1,15 @@
+2014-06-24  Brent Fulgham  bfulg...@apple.com
+
+[Win] Remove some out-of-date stuff from our instructions.
+https://bugs.webkit.org/show_bug.cgi?id=134282
+
+Reviewed by Tim Horton.
+
+* building/build.html: Remove reference to Platform SDK which we don't manuall 
+install anymore (it's part of Visual Studio 2013).
+* building/tools.html: We no longer need QuickTime SDK, QuickTime Player, or
+the DirectX SDK.
+
 2014-06-23  Ryosuke Niwa  rn...@webkit.org
 
 Drop the cross organizational support requirement from reviewer nomination policy


Modified: trunk/Websites/webkit.org/building/build.html (170409 => 170410)

--- trunk/Websites/webkit.org/building/build.html	2014-06-25 00:18:45 UTC (rev 170409)
+++ trunk/Websites/webkit.org/building/build.html	2014-06-25 00:36:53 UTC (rev 170410)
@@ -32,9 +32,6 @@
 
 div class=windows-instructions
 h4Windows/h4
-pA common source of build errors on Windows is Visual C++ Express forgetting the Platform SDK paths.  If you have trouble building WebKit,
-double check that the paths you set during a href="" 2 of the Platform SDK Installation/a
-are still there and add them again if necessary./p
 pBuilding on Windows requires a few more steps, you should look at: http://trac.webkit.org/wiki/BuildingOnWindows/p
 pDon't forget that if you have any questions or problems building WebKit, feel free to a href="" in touch!/a/p
 /div


Modified: trunk/Websites/webkit.org/building/tools.html (170409 => 170410)

--- trunk/Websites/webkit.org/building/tools.html	2014-06-25 00:18:45 UTC (rev 170409)
+++ trunk/Websites/webkit.org/building/tools.html	2014-06-25 00:36:53 UTC (rev 170410)
@@ -59,12 +59,6 @@
 pIf you are behind a proxy you need to do the following to allow cygwin svn to get through the proxy (similar steps are available for your Windows svn):
 ulliIn bash (Cygwin) run: codesvn help/code. This will create in your cygwin home directory the file .subversion/servers./li
 liEdit the file mentioned above and follow the instructions in the file to set up your proxy settings./li/ul/p
-lipInstall QuickTime SDK and QuickTime or GStreamer/p
-pDownload QuickTime SDK for Windows from a href="" and install it to the default location (\Program Files\QuickTime SDK). This is needed for media support for the AppleWin port.
-pYou'll also want quicktime itself. You don't need it to build but without it media fallbacks won't work on the AppleWin port. /p
-lipInstall DirectX SDK/p
-pDownload the a href="" 2010 DirectX SDK/a  This is needed for accelerated compositing./p
-/p
 lipInstall php, we use the following steps (you need this to run http layout tests):/p
 ol
 licd /usr/local/bin/li






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

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

2014-06-24 Thread rniwa

Title: [170411] trunk/Source/WebCore








Revision 170411
Author rn...@webkit.org
Date 2014-06-24 17:53:24 -0700 (Tue, 24 Jun 2014)


Log Message
Speculative 32-bit Mac build fix after r170402.

* platform/graphics/mac/ComplexTextController.cpp:
(WebCore::advanceByCombiningCharacterSequence):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170410 => 170411)

--- trunk/Source/WebCore/ChangeLog	2014-06-25 00:36:53 UTC (rev 170410)
+++ trunk/Source/WebCore/ChangeLog	2014-06-25 00:53:24 UTC (rev 170411)
@@ -1,3 +1,10 @@
+2014-06-24  Ryosuke Niwa  rn...@webkit.org
+
+Speculative 32-bit Mac build fix after r170402.
+
+* platform/graphics/mac/ComplexTextController.cpp:
+(WebCore::advanceByCombiningCharacterSequence):
+
 2014-06-24  Joseph Pecoraro  pecor...@apple.com
 
 [iOS]: WK2 Inspector Node Highlighting


Modified: trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp (170410 => 170411)

--- trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-25 00:36:53 UTC (rev 170410)
+++ trunk/Source/WebCore/platform/graphics/mac/ComplexTextController.cpp	2014-06-25 00:53:24 UTC (rev 170411)
@@ -269,7 +269,8 @@
 markCount = 0;
 
 unsigned i = 0;
-U16_NEXT(iterator, i, end - iterator, baseCharacter);
+unsigned remainingCharacters = end - iterator;
+U16_NEXT(iterator, i, remainingCharacters, baseCharacter);
 iterator = iterator + i;
 
 if (U16_IS_SURROGATE(baseCharacter))






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

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

2014-06-24 Thread mmaxfield

Title: [170413] trunk/Source/WebCore








Revision 170413
Author mmaxfi...@apple.com
Date 2014-06-24 18:19:25 -0700 (Tue, 24 Jun 2014)


Log Message
InlineTextBox's m_len can be an unsigned (rather than an unsigned short)
https://bugs.webkit.org/show_bug.cgi?id=134173

Reviewed by Daniel Bates.

After Zalan's talks with Kling, it seems that the simple line layout code
might alleviate the need for the space savings in InlineTextBox. Given this,
it would be beneficial to be a little more safe by using unsigneds throughout.

For example, we have code like void setLen(unsigned len) { m_len = len; }
which might silently break if given particular inputs.

No new tests because there is no behavior change.

* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::isSelected):
(WebCore::InlineTextBox::localSelectionRect):
(WebCore::InlineTextBox::paint):
(WebCore::InlineTextBox::selectionStartEnd):
(WebCore::InlineTextBox::paintSelection):
(WebCore::InlineTextBox::paintCompositionBackground):
(WebCore::InlineTextBox::paintDocumentMarker):
(WebCore::InlineTextBox::paintTextMatchMarker):
(WebCore::InlineTextBox::computeRectForReplacementMarker):
* rendering/InlineTextBox.h:
(WebCore::InlineTextBox::truncation):
* rendering/RenderTextLineBoxes.cpp:
(WebCore::ellipsisRectForBox):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/InlineTextBox.cpp
trunk/Source/WebCore/rendering/InlineTextBox.h
trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (170412 => 170413)

--- trunk/Source/WebCore/ChangeLog	2014-06-25 00:56:17 UTC (rev 170412)
+++ trunk/Source/WebCore/ChangeLog	2014-06-25 01:19:25 UTC (rev 170413)
@@ -1,3 +1,34 @@
+2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
+
+InlineTextBox's m_len can be an unsigned (rather than an unsigned short)
+https://bugs.webkit.org/show_bug.cgi?id=134173
+
+Reviewed by Daniel Bates.
+
+After Zalan's talks with Kling, it seems that the simple line layout code
+might alleviate the need for the space savings in InlineTextBox. Given this,
+it would be beneficial to be a little more safe by using unsigneds throughout.
+
+For example, we have code like void setLen(unsigned len) { m_len = len; }
+which might silently break if given particular inputs.
+
+No new tests because there is no behavior change.
+
+* rendering/InlineTextBox.cpp:
+(WebCore::InlineTextBox::isSelected):
+(WebCore::InlineTextBox::localSelectionRect):
+(WebCore::InlineTextBox::paint):
+(WebCore::InlineTextBox::selectionStartEnd):
+(WebCore::InlineTextBox::paintSelection):
+(WebCore::InlineTextBox::paintCompositionBackground):
+(WebCore::InlineTextBox::paintDocumentMarker):
+(WebCore::InlineTextBox::paintTextMatchMarker):
+(WebCore::InlineTextBox::computeRectForReplacementMarker):
+* rendering/InlineTextBox.h:
+(WebCore::InlineTextBox::truncation):
+* rendering/RenderTextLineBoxes.cpp:
+(WebCore::ellipsisRectForBox):
+
 2014-06-24  Ryosuke Niwa  rn...@webkit.org
 
 Speculative 32-bit Mac build fix after r170402.


Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (170412 => 170413)

--- trunk/Source/WebCore/rendering/InlineTextBox.cpp	2014-06-25 00:56:17 UTC (rev 170412)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp	2014-06-25 01:19:25 UTC (rev 170413)
@@ -59,7 +59,7 @@
 
 struct SameSizeAsInlineTextBox : public InlineBox {
 unsigned variables[1];
-unsigned short variables2[2];
+unsigned variables2[2];
 void* pointers[2];
 };
 
@@ -201,7 +201,7 @@
 unsigned sPos = startPos  m_start ? startPos - m_start : 0;
 if (endPos = m_start)
 return false;
-unsigned ePos = std::min(endPos - m_start, static_castunsigned(m_len));
+unsigned ePos = std::min(endPos - m_start, m_len);
 return sPos  ePos;
 }
 
@@ -278,7 +278,7 @@
 if (endPos  m_start)
 return LayoutRect();
 
-unsigned ePos = std::min(endPos - m_start, static_castunsigned(m_len));
+unsigned ePos = std::min(endPos - m_start, m_len);
 
 if (sPos  ePos)
 return LayoutRect();
@@ -640,8 +640,8 @@
 selectionStartEnd(sPos, ePos);
 
 if (m_truncation != cNoTruncation) {
-sPos = std::min(sPos, static_castunsigned(m_truncation));
-ePos = std::min(ePos, static_castunsigned(m_truncation));
+sPos = std::min(sPos, m_truncation);
+ePos = std::min(ePos, m_truncation);
 length = m_truncation;
 }
 
@@ -721,7 +721,7 @@
 
 sPos = startPos  m_start ? startPos - m_start : 0;
 ePos = endPos  m_start ? endPos - m_start : 0;
-ePos = std::min(ePos, static_castunsigned(m_len));
+ePos = std::min(ePos, m_len);
 }
 
 void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint boxOrigin, const RenderStyle style, const Font font, Color

[webkit-changes] [170414] trunk

2014-06-24 Thread mmaxfield

Title: [170414] trunk








Revision 170414
Author mmaxfi...@apple.com
Date 2014-06-24 18:25:23 -0700 (Tue, 24 Jun 2014)


Log Message
Tiles on bottom of screen are not always allocated when necessary
https://bugs.webkit.org/show_bug.cgi?id=134272

Reviewed by Simon Fraser.

Source/WebCore:
The initial visibleRect is in the coordinate of the root layer, so its origin
is at the top left of the view. The initial rect we were using doesn't
include the contents inset, so it was too short, which was causing tiles near
the bottom of the screen to not always be allocated if the tile threshold was
close to the bottom of the view. Instead, we want to include the contents
inset size so the visible rect includes the entire view.
GraphicsLayerCA::recursiveCommitChanges() takes care of mapping and cropping
the visible rect into the tiled layer's coordinate system, at which point it
is used for visible tile logic.

Test: platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html

* platform/graphics/ca/TileCoverageMap.cpp:
(WebCore::TileCoverageMap::update):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::flushPendingLayerChanges):

LayoutTests:
Apply a content inset, then dump visible rects.

* platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp


Added Paths

trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt
trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html




Diff

Modified: trunk/LayoutTests/ChangeLog (170413 => 170414)

--- trunk/LayoutTests/ChangeLog	2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/LayoutTests/ChangeLog	2014-06-25 01:25:23 UTC (rev 170414)
@@ -1,3 +1,15 @@
+2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
+
+Tiles on bottom of screen are not always allocated when necessary
+https://bugs.webkit.org/show_bug.cgi?id=134272
+
+Reviewed by Simon Fraser.
+
+Apply a content inset, then dump visible rects.
+
+* platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt: Added.
+* platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html: Added.
+
 2014-06-24  Samuel White  samuel_wh...@apple.com
 
 AX: Remove tight platform expectation coupling form roles-exposed layout test.


Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt (0 => 170414)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt	2014-06-25 01:25:23 UTC (rev 170414)
@@ -0,0 +1,19 @@
+This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 500.00)
+  (visible rect 0.00, 0.00 800.00 x 500.00)
+  (contentsScale 1.00)
+  (children 1
+(GraphicsLayer
+  (bounds 800.00 500.00)
+  (contentsOpaque 1)
+  (visible rect 0.00, 0.00 800.00 x 500.00)
+  (contentsScale 1.00)
+  (tile cache coverage 0, 0 800 x 500)
+  (tile size 512 x 512)
+  (top left tile 0, 0 tiles grid 2 x 1)
+)
+  )
+)
+


Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html (0 => 170414)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html	(rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html	2014-06-25 01:25:23 UTC (rev 170414)
@@ -0,0 +1,25 @@
+!DOCTYPE html
+
+html
+head
+script
+if (window.testRunner)
+testRunner.dumpAsText();
+if (window.internals)
+window.internals.setTopContentInset(100);
+
+function doTest()
+{
+if (window.internals) {
+document.getElementById('layers').innerText = internals.layerTreeAsText(document,
+internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
+}
+}
+window.addEventListener('load', doTest, false);
+/script
+/head
+body
+This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
+pre id=layersLayer tree goes here/p
+/body
+/html


Modified: trunk/Source/WebCore/ChangeLog (170413 => 170414)

--- trunk/Source/WebCore/ChangeLog	2014-06-25 01:19:25 UTC (rev 170413)
+++ trunk/Source/WebCore/ChangeLog	2014-06-25 01:25:23 UTC (rev 170414)
@@ -1,5 +1,29 @@
 2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
 
+Tiles on bottom of

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

2014-06-24 Thread jonowells

Title: [170416] trunk/Source/WebInspectorUI








Revision 170416
Author jonowe...@apple.com
Date 2014-06-24 20:13:23 -0700 (Tue, 24 Jun 2014)


Log Message
Web Inspector: clicking Show All Nodes button throws TypeError
https://bugs.webkit.org/show_bug.cgi?id=133701

Reviewed by Timothy Hatcher.

The method used for isEventWithinDisclosureTriangle needs to consider the possibility that the
targeted TreeElement isn't contained within the visible DOM, for instance in the case of the
Show All Nodes button immediately after it is pressed.

* UserInterface/Views/TreeOutline.js:
(TreeElement.prototype.isEventWithinDisclosureTriangle): Check to make sure TreeElement node is in the visible DOM.

Modified Paths

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




Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (170415 => 170416)

--- trunk/Source/WebInspectorUI/ChangeLog	2014-06-25 01:28:40 UTC (rev 170415)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-06-25 03:13:23 UTC (rev 170416)
@@ -1,5 +1,19 @@
 2014-06-24  Jono Wells  jonowe...@apple.com
 
+Web Inspector: clicking Show All Nodes button throws TypeError
+https://bugs.webkit.org/show_bug.cgi?id=133701
+
+Reviewed by Timothy Hatcher.
+
+The method used for isEventWithinDisclosureTriangle needs to consider the possibility that the 
+targeted TreeElement isn't contained within the visible DOM, for instance in the case of the
+Show All Nodes button immediately after it is pressed.
+
+* UserInterface/Views/TreeOutline.js:
+(TreeElement.prototype.isEventWithinDisclosureTriangle): Check to make sure TreeElement node is in the visible DOM.
+
+2014-06-24  Jono Wells  jonowe...@apple.com
+
 Web Inspector: TypeError when hovering over Show All Nodes button in the Dom Tree inspector
 https://bugs.webkit.org/show_bug.cgi?id=133699
 


Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (170415 => 170416)

--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2014-06-25 01:28:40 UTC (rev 170415)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2014-06-25 03:13:23 UTC (rev 170416)
@@ -1063,6 +1063,9 @@
 
 TreeElement.prototype.isEventWithinDisclosureTriangle = function(event)
 {
+if (!document.contains(this._listItemNode))
+return false;
+
 // FIXME: We should not use getComputedStyle(). For that we need to get rid of using ::before for disclosure triangle. (http://webk.it/74446)
 var computedLeftPadding = window.getComputedStyle(this._listItemNode).getPropertyCSSValue(padding-left).getFloatValue(CSSPrimitiveValue.CSS_PX);
 var left = this._listItemNode.totalOffsetLeft + computedLeftPadding;






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

[webkit-changes] [170417] trunk

2014-06-24 Thread commit-queue

Title: [170417] trunk








Revision 170417
Author commit-qu...@webkit.org
Date 2014-06-24 21:30:40 -0700 (Tue, 24 Jun 2014)


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

the patch added a test that fails on almost every Mac tester
(Requested by rniwa on #webkit).

Reverted changeset:

Tiles on bottom of screen are not always allocated when
necessary
https://bugs.webkit.org/show_bug.cgi?id=134272
http://trac.webkit.org/changeset/170414

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp


Removed Paths

trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt
trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html




Diff

Modified: trunk/LayoutTests/ChangeLog (170416 => 170417)

--- trunk/LayoutTests/ChangeLog	2014-06-25 03:13:23 UTC (rev 170416)
+++ trunk/LayoutTests/ChangeLog	2014-06-25 04:30:40 UTC (rev 170417)
@@ -1,3 +1,18 @@
+2014-06-24  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r170414.
+https://bugs.webkit.org/show_bug.cgi?id=134291
+
+the patch added a test that fails on almost every Mac tester
+(Requested by rniwa on #webkit).
+
+Reverted changeset:
+
+Tiles on bottom of screen are not always allocated when
+necessary
+https://bugs.webkit.org/show_bug.cgi?id=134272
+http://trac.webkit.org/changeset/170414
+
 2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
 
 Tiles on bottom of screen are not always allocated when necessary


Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt (170416 => 170417)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt	2014-06-25 03:13:23 UTC (rev 170416)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset-expected.txt	2014-06-25 04:30:40 UTC (rev 170417)
@@ -1,19 +0,0 @@
-This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
-(GraphicsLayer
-  (anchor 0.00 0.00)
-  (bounds 800.00 500.00)
-  (visible rect 0.00, 0.00 800.00 x 500.00)
-  (contentsScale 1.00)
-  (children 1
-(GraphicsLayer
-  (bounds 800.00 500.00)
-  (contentsOpaque 1)
-  (visible rect 0.00, 0.00 800.00 x 500.00)
-  (contentsScale 1.00)
-  (tile cache coverage 0, 0 800 x 500)
-  (tile size 512 x 512)
-  (top left tile 0, 0 tiles grid 2 x 1)
-)
-  )
-)
-


Deleted: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html (170416 => 170417)

--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html	2014-06-25 03:13:23 UTC (rev 170416)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/visible-rect-content-inset.html	2014-06-25 04:30:40 UTC (rev 170417)
@@ -1,25 +0,0 @@
-!DOCTYPE html
-
-html
-head
-script
-if (window.testRunner)
-testRunner.dumpAsText();
-if (window.internals)
-window.internals.setTopContentInset(100);
-
-function doTest()
-{
-if (window.internals) {
-document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-}
-}
-window.addEventListener('load', doTest, false);
-/script
-/head
-body
-This test applies a content inset and then dumps the layer tree including visible rects. The visible rects should match the expected rects.
-pre id=layersLayer tree goes here/p
-/body
-/html


Modified: trunk/Source/WebCore/ChangeLog (170416 => 170417)

--- trunk/Source/WebCore/ChangeLog	2014-06-25 03:13:23 UTC (rev 170416)
+++ trunk/Source/WebCore/ChangeLog	2014-06-25 04:30:40 UTC (rev 170417)
@@ -1,3 +1,18 @@
+2014-06-24  Commit Queue  commit-qu...@webkit.org
+
+Unreviewed, rolling out r170414.
+https://bugs.webkit.org/show_bug.cgi?id=134291
+
+the patch added a test that fails on almost every Mac tester
+(Requested by rniwa on #webkit).
+
+Reverted changeset:
+
+Tiles on bottom of screen are not always allocated when
+necessary
+https://bugs.webkit.org/show_bug.cgi?id=134272
+http://trac.webkit.org/changeset/170414
+
 2014-06-24  Myles C. Maxfield  mmaxfi...@apple.com
 
 Tiles on bottom of screen are not always allocated when necessary


Modified: trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp (170416 => 170417)

--- trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp	2014-06-25 03:13:23 UTC (rev 170416)
+++ trunk/Source/WebCore/platform/graphics/ca/TileCoverageMap.cpp	2014-06-25 04:30:40 UTC (rev 170417)
@@ -63,6

57 matches

Mail list logo