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

2012-01-06 Thread commit-queue
Title: [104270] trunk/Source/_javascript_Core








Revision 104270
Author commit-qu...@webkit.org
Date 2012-01-06 00:04:29 -0800 (Fri, 06 Jan 2012)


Log Message
WTF::String: Inline method shouldn't have WTF_EXPORT_PRIVATE
https://bugs.webkit.org/show_bug.cgi?id=75612

Patch by Hajime Morrita morr...@chromium.org on 2012-01-06
Reviewed by Kevin Ollivier.

* wtf/text/WTFString.h:
(WTF::String::findIgnoringCase):
(WTF::String::append):
(WTF::String::fromUTF8):
(WTF::String::fromUTF8WithLatin1Fallback):
(WTF::String::isHashTableDeletedValue):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/text/WTFString.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104269 => 104270)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 06:41:04 UTC (rev 104269)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 08:04:29 UTC (rev 104270)
@@ -1,3 +1,17 @@
+2012-01-06  Hajime Morrita  morr...@chromium.org
+
+WTF::String: Inline method shouldn't have WTF_EXPORT_PRIVATE
+https://bugs.webkit.org/show_bug.cgi?id=75612
+
+Reviewed by Kevin Ollivier.
+
+* wtf/text/WTFString.h:
+(WTF::String::findIgnoringCase):
+(WTF::String::append):
+(WTF::String::fromUTF8):
+(WTF::String::fromUTF8WithLatin1Fallback):
+(WTF::String::isHashTableDeletedValue):
+
 2012-01-05  Dan Bernstein  m...@apple.com
 
 rdar://problem/10633760 Update copyright strings


Modified: trunk/Source/_javascript_Core/wtf/text/WTFString.h (104269 => 104270)

--- trunk/Source/_javascript_Core/wtf/text/WTFString.h	2012-01-06 06:41:04 UTC (rev 104269)
+++ trunk/Source/_javascript_Core/wtf/text/WTFString.h	2012-01-06 08:04:29 UTC (rev 104270)
@@ -214,9 +214,9 @@
 { return m_impl ? m_impl-reverseFind(str.impl(), start) : notFound; }
 
 // Case insensitive string matching.
-WTF_EXPORT_PRIVATE size_t findIgnoringCase(const LChar* str, unsigned start = 0) const
+size_t findIgnoringCase(const LChar* str, unsigned start = 0) const
 { return m_impl ? m_impl-findIgnoringCase(str, start) : notFound; }
-WTF_EXPORT_PRIVATE size_t findIgnoringCase(const String str, unsigned start = 0) const
+size_t findIgnoringCase(const String str, unsigned start = 0) const
 { return m_impl ? m_impl-findIgnoringCase(str.impl(), start) : notFound; }
 size_t reverseFindIgnoringCase(const String str, unsigned start = UINT_MAX) const
 { return m_impl ? m_impl-reverseFindIgnoringCase(str.impl(), start) : notFound; }
@@ -244,7 +244,7 @@
 
 WTF_EXPORT_PRIVATE void append(const String);
 WTF_EXPORT_PRIVATE void append(LChar);
-inline WTF_EXPORT_PRIVATE void append(char c) { append(static_castLChar(c)); };
+void append(char c) { append(static_castLChar(c)); };
 WTF_EXPORT_PRIVATE void append(UChar);
 WTF_EXPORT_PRIVATE void append(const UChar*, unsigned length);
 WTF_EXPORT_PRIVATE void insert(const String, unsigned pos);
@@ -356,12 +356,12 @@
 // the input data contains invalid UTF-8 sequences.
 WTF_EXPORT_PRIVATE static String fromUTF8(const LChar*, size_t);
 WTF_EXPORT_PRIVATE static String fromUTF8(const LChar*);
-inline WTF_EXPORT_PRIVATE static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_castconst LChar*(s), length); };
-inline WTF_EXPORT_PRIVATE static String fromUTF8(const char* s) { return fromUTF8(reinterpret_castconst LChar*(s)); };
+static String fromUTF8(const char* s, size_t length) { return fromUTF8(reinterpret_castconst LChar*(s), length); };
+static String fromUTF8(const char* s) { return fromUTF8(reinterpret_castconst LChar*(s)); };
 
 // Tries to convert the passed in string to UTF-8, but will fall back to Latin-1 if the string is not valid UTF-8.
 WTF_EXPORT_PRIVATE static String fromUTF8WithLatin1Fallback(const LChar*, size_t);
-inline WTF_EXPORT_PRIVATE static String fromUTF8WithLatin1Fallback(const char* s, size_t length) { return fromUTF8WithLatin1Fallback(reinterpret_castconst LChar*(s), length); };
+static String fromUTF8WithLatin1Fallback(const char* s, size_t length) { return fromUTF8WithLatin1Fallback(reinterpret_castconst LChar*(s), length); };
 
 // Determines the writing direction using the Unicode Bidi Algorithm rules P2 and P3.
 WTF::Unicode::Direction defaultWritingDirection(bool* hasStrongDirectionality = 0) const
@@ -379,7 +379,7 @@
 
 // Hash table deleted values, which are only constructed and never copied or destroyed.
 String(WTF::HashTableDeletedValueType) : m_impl(WTF::HashTableDeletedValue) { }
-WTF_EXPORT_PRIVATE bool isHashTableDeletedValue() const { return m_impl.isHashTableDeletedValue(); }
+bool isHashTableDeletedValue() const { return m_impl.isHashTableDeletedValue(); }
 
 #ifndef NDEBUG
 void show() const;






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

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

2012-01-06 Thread commit-queue
Title: [104271] trunk/Source/WebCore








Revision 104271
Author commit-qu...@webkit.org
Date 2012-01-06 00:07:42 -0800 (Fri, 06 Jan 2012)


Log Message
Unreviewed, rolling out r104259 and r104261.
http://trac.webkit.org/changeset/104259
http://trac.webkit.org/changeset/104261
https://bugs.webkit.org/show_bug.cgi?id=75688

Caused assertion failures (Requested by rniwa on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-01-06

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::takeAllChildrenFrom):
(WebCore::ContainerNode::insertBefore):
(WebCore::ContainerNode::replaceChild):
(WebCore::ContainerNode::removeBetween):
(WebCore::ContainerNode::removeChildren):
(WebCore::ContainerNode::appendChild):
(WebCore::ContainerNode::parserAddChild):
* dom/DOMAllInOne.cpp:
* dom/Document.cpp:
(WebCore::Document::setDocType):
(WebCore::Document::adoptNode):
* dom/Element.cpp:
(WebCore::Element::removeShadowRoot):
* dom/Node.cpp:
(WebCore::Node::setDocument):
(WebCore::Node::setTreeScopeRecursively):
(WebCore::Node::setDocumentRecursively):
(WebCore::Node::didMoveToNewDocument):
* dom/Node.h:
* dom/TreeScope.cpp:
* dom/TreeScope.h:
* dom/TreeScopeAdopter.cpp: Removed.
* dom/TreeScopeAdopter.h: Removed.

Modified Paths

trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/GNUmakefile.list.am
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/dom/ContainerNode.cpp
trunk/Source/WebCore/dom/DOMAllInOne.cpp
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Node.cpp
trunk/Source/WebCore/dom/Node.h
trunk/Source/WebCore/dom/TreeScope.cpp
trunk/Source/WebCore/dom/TreeScope.h


Removed Paths

trunk/Source/WebCore/dom/TreeScopeAdopter.cpp
trunk/Source/WebCore/dom/TreeScopeAdopter.h




Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (104270 => 104271)

--- trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:04:29 UTC (rev 104270)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:07:42 UTC (rev 104271)
@@ -610,7 +610,6 @@
 dom/TransformSourceLibxslt.cpp
 dom/Traversal.cpp
 dom/TreeScope.cpp
-dom/TreeScopeAdopter.cpp
 dom/TreeWalker.cpp
 dom/UIEvent.cpp
 dom/UIEventWithKeyState.cpp


Modified: trunk/Source/WebCore/ChangeLog (104270 => 104271)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 08:04:29 UTC (rev 104270)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 08:07:42 UTC (rev 104271)
@@ -1,3 +1,43 @@
+2012-01-06  Sheriff Bot  webkit.review@gmail.com
+
+Unreviewed, rolling out r104259 and r104261.
+http://trac.webkit.org/changeset/104259
+http://trac.webkit.org/changeset/104261
+https://bugs.webkit.org/show_bug.cgi?id=75688
+
+Caused assertion failures (Requested by rniwa on #webkit).
+
+* CMakeLists.txt:
+* GNUmakefile.list.am:
+* Target.pri:
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* WebCore.xcodeproj/project.pbxproj:
+* dom/ContainerNode.cpp:
+(WebCore::ContainerNode::takeAllChildrenFrom):
+(WebCore::ContainerNode::insertBefore):
+(WebCore::ContainerNode::replaceChild):
+(WebCore::ContainerNode::removeBetween):
+(WebCore::ContainerNode::removeChildren):
+(WebCore::ContainerNode::appendChild):
+(WebCore::ContainerNode::parserAddChild):
+* dom/DOMAllInOne.cpp:
+* dom/Document.cpp:
+(WebCore::Document::setDocType):
+(WebCore::Document::adoptNode):
+* dom/Element.cpp:
+(WebCore::Element::removeShadowRoot):
+* dom/Node.cpp:
+(WebCore::Node::setDocument):
+(WebCore::Node::setTreeScopeRecursively):
+(WebCore::Node::setDocumentRecursively):
+(WebCore::Node::didMoveToNewDocument):
+* dom/Node.h:
+* dom/TreeScope.cpp:
+* dom/TreeScope.h:
+* dom/TreeScopeAdopter.cpp: Removed.
+* dom/TreeScopeAdopter.h: Removed.
+
 2012-01-05  Dan Bernstein  m...@apple.com
 
 rdar://problem/10633760 Update copyright strings


Modified: trunk/Source/WebCore/GNUmakefile.list.am (104270 => 104271)

--- trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:04:29 UTC (rev 104270)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:07:42 UTC (rev 104271)
@@ -1674,8 +1674,6 @@
 	Source/WebCore/dom/TreeDepthLimit.h \
 	Source/WebCore/dom/TreeScope.cpp \
 	Source/WebCore/dom/TreeScope.h \
-	Source/WebCore/dom/TreeScopeAdopter.cpp \
-	Source/WebCore/dom/TreeScopeAdopter.h \
 	Source/WebCore/dom/TreeWalker.cpp \
 	Source/WebCore/dom/TreeWalker.h \
 	Source/WebCore/dom/UIEvent.cpp \


Modified: trunk/Source/WebCore/Target.pri (104270 => 104271)

--- 

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

2012-01-06 Thread ossy
Title: [104272] trunk/Source/WebCore








Revision 104272
Author o...@webkit.org
Date 2012-01-06 00:09:16 -0800 (Fri, 06 Jan 2012)


Log Message
Unreviewed, rolling out r104268.
http://trac.webkit.org/changeset/104268
https://bugs.webkit.org/show_bug.cgi?id=75689

It broke the mac build (Requested by Ossy on #webkit).

Patch by Sheriff Bot webkit.review@gmail.com on 2012-01-06

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* html/HTMLElementsAllInOne.cpp:
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
(WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
(WebCore::HTMLFormControlElementWithState::shouldAutocomplete):
(WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState):
(WebCore::HTMLFormControlElementWithState::finishParsingChildren):
* html/HTMLFormControlElement.h:
(WebCore::HTMLFormControlElementWithState::canContainRangeEndPoint):
(WebCore::HTMLFormControlElementWithState::saveFormControlState):
(WebCore::HTMLFormControlElementWithState::restoreFormControlState):
* html/HTMLFormControlElementWithState.cpp: Removed.
* html/HTMLFormControlElementWithState.h: Removed.
* html/HTMLKeygenElement.h:
* html/HTMLSelectElement.h:
* html/HTMLTextFormControlElement.h:

Modified Paths

trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/GNUmakefile.list.am
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp
trunk/Source/WebCore/html/HTMLFormControlElement.cpp
trunk/Source/WebCore/html/HTMLFormControlElement.h
trunk/Source/WebCore/html/HTMLKeygenElement.h
trunk/Source/WebCore/html/HTMLSelectElement.h
trunk/Source/WebCore/html/HTMLTextFormControlElement.h


Removed Paths

trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp
trunk/Source/WebCore/html/HTMLFormControlElementWithState.h




Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (104271 => 104272)

--- trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:09:16 UTC (rev 104272)
@@ -739,7 +739,6 @@
 html/HTMLFontElement.cpp
 html/HTMLFormCollection.cpp
 html/HTMLFormControlElement.cpp
-html/HTMLFormControlElementWithState.cpp
 html/HTMLFormElement.cpp
 html/HTMLFrameElement.cpp
 html/HTMLFrameElementBase.cpp


Modified: trunk/Source/WebCore/ChangeLog (104271 => 104272)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 08:09:16 UTC (rev 104272)
@@ -1,5 +1,37 @@
 2012-01-06  Sheriff Bot  webkit.review@gmail.com
 
+Unreviewed, rolling out r104268.
+http://trac.webkit.org/changeset/104268
+https://bugs.webkit.org/show_bug.cgi?id=75689
+
+It broke the mac build (Requested by Ossy on #webkit).
+
+* CMakeLists.txt:
+* GNUmakefile.list.am:
+* Target.pri:
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* WebCore.xcodeproj/project.pbxproj:
+* html/HTMLElementsAllInOne.cpp:
+* html/HTMLFormControlElement.cpp:
+(WebCore::HTMLFormControlElementWithState::HTMLFormControlElementWithState):
+(WebCore::HTMLFormControlElementWithState::~HTMLFormControlElementWithState):
+(WebCore::HTMLFormControlElementWithState::didMoveToNewDocument):
+(WebCore::HTMLFormControlElementWithState::shouldAutocomplete):
+(WebCore::HTMLFormControlElementWithState::shouldSaveAndRestoreFormControlState):
+(WebCore::HTMLFormControlElementWithState::finishParsingChildren):
+* html/HTMLFormControlElement.h:
+(WebCore::HTMLFormControlElementWithState::canContainRangeEndPoint):
+(WebCore::HTMLFormControlElementWithState::saveFormControlState):
+(WebCore::HTMLFormControlElementWithState::restoreFormControlState):
+* html/HTMLFormControlElementWithState.cpp: Removed.
+* html/HTMLFormControlElementWithState.h: Removed.
+* html/HTMLKeygenElement.h:
+* html/HTMLSelectElement.h:
+* html/HTMLTextFormControlElement.h:
+
+2012-01-06  Sheriff Bot  webkit.review@gmail.com
+
 Unreviewed, rolling out r104259 and r104261.
 http://trac.webkit.org/changeset/104259
 http://trac.webkit.org/changeset/104261


Modified: trunk/Source/WebCore/GNUmakefile.list.am (104271 => 104272)

--- trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:07:42 UTC (rev 104271)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:09:16 UTC (rev 104272)
@@ -2018,8 +2018,6 @@
 	Source/WebCore/html/HTMLFormCollection.h \
 	

[webkit-changes] [104273] trunk/Tools

2012-01-06 Thread ossy
Title: [104273] trunk/Tools








Revision 104273
Author o...@webkit.org
Date 2012-01-06 00:14:02 -0800 (Fri, 06 Jan 2012)


Log Message
NRWT should use test_expectation.txt on wk2 platforms
https://bugs.webkit.org/show_bug.cgi?id=75417

Reviewed by Dirk Pranke.

* Scripts/webkitpy/layout_tests/port/webkit.py:
(path_to_test_expectations_file):
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
(test_path_to_test_expectations_file):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (104272 => 104273)

--- trunk/Tools/ChangeLog	2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/ChangeLog	2012-01-06 08:14:02 UTC (rev 104273)
@@ -1,3 +1,15 @@
+2012-01-06  Csaba Osztrogonác  o...@webkit.org
+
+NRWT should use test_expectation.txt on wk2 platforms
+https://bugs.webkit.org/show_bug.cgi?id=75417
+
+Reviewed by Dirk Pranke.
+
+* Scripts/webkitpy/layout_tests/port/webkit.py:
+(path_to_test_expectations_file):
+* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+(test_path_to_test_expectations_file):
+
 2012-01-05  Jochen Eisinger  joc...@chromium.org
 
 Don't hardcode expected file URIs in as they depend on the platform


Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (104272 => 104273)

--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2012-01-06 08:14:02 UTC (rev 104273)
@@ -78,8 +78,7 @@
 
 def path_to_test_expectations_file(self):
 # test_expectations are always in mac/ not mac-leopard/ by convention, hence we use port_name instead of name().
-expectations_directory = self._wk2_port_name() if self.get_option('webkit_test_runner') else self.port_name
-return self._filesystem.join(self._webkit_baseline_path(expectations_directory), 'test_expectations.txt')
+return self._filesystem.join(self._webkit_baseline_path(self.port_name), 'test_expectations.txt')
 
 def _port_flag_for_scripts(self):
 # This is overrriden by ports which need a flag passed to scripts to distinguish the use of that port.


Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (104272 => 104273)

--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py	2012-01-06 08:09:16 UTC (rev 104272)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py	2012-01-06 08:14:02 UTC (rev 104273)
@@ -92,6 +92,13 @@
 def test_baseline_search_path(self):
 pass
 
+def test_path_to_test_expectations_file(self):
+port = TestWebKitPort()
+port._options = MockOptions(webkit_test_runner=False)
+self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/test_expectations.txt')
+port._options = MockOptions(webkit_test_runner=True)
+self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/test_expectations.txt')
+
 def test_skipped_directories_for_symbols(self):
 # This first test confirms that the commonly found symbols result in the expected skipped directories.
 symbols_string =  .join([GraphicsLayer, WebCoreHas3DRendering, isXHTMLMPDocument, fooSymbol])






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


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

2012-01-06 Thread tkent
Title: [104274] trunk/Source/WebCore








Revision 104274
Author tk...@chromium.org
Date 2012-01-06 00:33:24 -0800 (Fri, 06 Jan 2012)


Log Message
Move HTMLFormControlElementWithState class in its own header file.
https://bugs.webkit.org/show_bug.cgi?id=75482

Patch by Alexis Menard alexis.men...@openbossa.org on 2012-01-06
Reviewed by Kent Tamura.

Move HTMLFormControlElementWithState class which was mixed in HTMLFormControlElement
files into its own header file and its own implementation file.

No new tests : the existing ones should cover the refactoring.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* html/HTMLElementsAllInOne.cpp:
* html/HTMLFormControlElement.cpp:
* html/HTMLFormControlElement.h:
* html/HTMLKeygenElement.h:
* html/HTMLSelectElement.h:
* html/HTMLTextFormControlElement.h:

Modified Paths

trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/GNUmakefile.list.am
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/html/HTMLElementsAllInOne.cpp
trunk/Source/WebCore/html/HTMLFormControlElement.cpp
trunk/Source/WebCore/html/HTMLFormControlElement.h
trunk/Source/WebCore/html/HTMLKeygenElement.h
trunk/Source/WebCore/html/HTMLSelectElement.h
trunk/Source/WebCore/html/HTMLTextFormControlElement.h


Added Paths

trunk/Source/WebCore/html/HTMLFormControlElementWithState.cpp
trunk/Source/WebCore/html/HTMLFormControlElementWithState.h




Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (104273 => 104274)

--- trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:14:02 UTC (rev 104273)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-01-06 08:33:24 UTC (rev 104274)
@@ -739,6 +739,7 @@
 html/HTMLFontElement.cpp
 html/HTMLFormCollection.cpp
 html/HTMLFormControlElement.cpp
+html/HTMLFormControlElementWithState.cpp
 html/HTMLFormElement.cpp
 html/HTMLFrameElement.cpp
 html/HTMLFrameElementBase.cpp


Modified: trunk/Source/WebCore/ChangeLog (104273 => 104274)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 08:14:02 UTC (rev 104273)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 08:33:24 UTC (rev 104274)
@@ -1,3 +1,28 @@
+2012-01-06  Alexis Menard  alexis.men...@openbossa.org
+
+Move HTMLFormControlElementWithState class in its own header file.
+https://bugs.webkit.org/show_bug.cgi?id=75482
+
+Reviewed by Kent Tamura.
+
+Move HTMLFormControlElementWithState class which was mixed in HTMLFormControlElement
+files into its own header file and its own implementation file.
+
+No new tests : the existing ones should cover the refactoring.
+
+* CMakeLists.txt:
+* GNUmakefile.list.am:
+* Target.pri:
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* WebCore.xcodeproj/project.pbxproj:
+* html/HTMLElementsAllInOne.cpp:
+* html/HTMLFormControlElement.cpp:
+* html/HTMLFormControlElement.h:
+* html/HTMLKeygenElement.h:
+* html/HTMLSelectElement.h:
+* html/HTMLTextFormControlElement.h:
+
 2012-01-06  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r104268.


Modified: trunk/Source/WebCore/GNUmakefile.list.am (104273 => 104274)

--- trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:14:02 UTC (rev 104273)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 08:33:24 UTC (rev 104274)
@@ -2018,6 +2018,8 @@
 	Source/WebCore/html/HTMLFormCollection.h \
 	Source/WebCore/html/HTMLFormControlElement.cpp \
 	Source/WebCore/html/HTMLFormControlElement.h \
+	Source/WebCore/html/HTMLFormControlElementWithState.cpp \
+	Source/WebCore/html/HTMLFormControlElementWithState.h \
 	Source/WebCore/html/HTMLFormElement.cpp \
 	Source/WebCore/html/HTMLFormElement.h \
 	Source/WebCore/html/HTMLFrameElementBase.cpp \


Modified: trunk/Source/WebCore/Target.pri (104273 => 104274)

--- trunk/Source/WebCore/Target.pri	2012-01-06 08:14:02 UTC (rev 104273)
+++ trunk/Source/WebCore/Target.pri	2012-01-06 08:33:24 UTC (rev 104274)
@@ -724,6 +724,7 @@
 html/HTMLFontElement.cpp \
 html/HTMLFormCollection.cpp \
 html/HTMLFormControlElement.cpp \
+html/HTMLFormControlElementWithState.cpp \
 html/HTMLFormElement.cpp \
 html/HTMLFrameElement.cpp \
 html/HTMLFrameElementBase.cpp \
@@ -1793,6 +1794,7 @@
 html/HTMLFontElement.h \
 html/HTMLFormCollection.h \
 html/HTMLFormControlElement.h \
+html/HTMLFormControlElementWithState.h \
 html/HTMLFormElement.h \
 html/HTMLFrameElementBase.h \
 html/HTMLFrameElement.h \


Modified: trunk/Source/WebCore/WebCore.gypi (104273 => 104274)

--- trunk/Source/WebCore/WebCore.gypi	2012-01-06 08:14:02 UTC (rev 104273)
+++ trunk/Source/WebCore/WebCore.gypi	2012-01-06 08:33:24 UTC (rev 104274)
@@ 

[webkit-changes] [104275] trunk

2012-01-06 Thread tkent
Title: [104275] trunk








Revision 104275
Author tk...@chromium.org
Date 2012-01-06 00:47:18 -0800 (Fri, 06 Jan 2012)


Log Message
Fix a crash by importing an element of which local name ends with :input.
https://bugs.webkit.org/show_bug.cgi?id=75103

Reviewed by Ryosuke Niwa.

Source/WebCore:

Test: fast/dom/importNode-confusing-localName.html

* dom/Document.cpp:
(WebCore::Document::importNode): Pass QualifiedName of the source elemnt
to createElement() in order to avoid unnecessary serialization and
parsing of the qualified name

LayoutTests:

* fast/dom/importNode-confusing-localName-expected.txt: Added.
* fast/dom/importNode-confusing-localName.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp


Added Paths

trunk/LayoutTests/fast/dom/importNode-confusing-localName-expected.txt
trunk/LayoutTests/fast/dom/importNode-confusing-localName.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104274 => 104275)

--- trunk/LayoutTests/ChangeLog	2012-01-06 08:33:24 UTC (rev 104274)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 08:47:18 UTC (rev 104275)
@@ -1,3 +1,13 @@
+2012-01-05  Kent Tamura  tk...@chromium.org
+
+Fix a crash by importing an element of which local name ends with :input.
+https://bugs.webkit.org/show_bug.cgi?id=75103
+
+Reviewed by Ryosuke Niwa.
+
+* fast/dom/importNode-confusing-localName-expected.txt: Added.
+* fast/dom/importNode-confusing-localName.html: Added.
+
 2012-01-05  Gavin Barraclough  barraclo...@apple.com
 
 Date constructor handles infinite values incorrectly.


Added: trunk/LayoutTests/fast/dom/importNode-confusing-localName-expected.txt (0 => 104275)

--- trunk/LayoutTests/fast/dom/importNode-confusing-localName-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/dom/importNode-confusing-localName-expected.txt	2012-01-06 08:47:18 UTC (rev 104275)
@@ -0,0 +1,5 @@
+PASS imported.constructor is source.constructor
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Property changes on: trunk/LayoutTests/fast/dom/importNode-confusing-localName-expected.txt
___


Added: svn:eol-style

Added: trunk/LayoutTests/fast/dom/importNode-confusing-localName.html (0 => 104275)

--- trunk/LayoutTests/fast/dom/importNode-confusing-localName.html	(rev 0)
+++ trunk/LayoutTests/fast/dom/importNode-confusing-localName.html	2012-01-06 08:47:18 UTC (rev 104275)
@@ -0,0 +1,15 @@
+!DOCTYPE html
+html
+head
+script src=""
+/head
+body
+xht:input id=test/xht:input
+script
+var source = document.getElementById('test');
+var imported = document.importNode(source, true);
+shouldBe('imported.constructor', 'source.constructor');
+/script
+script src=""
+/body
+/html
Property changes on: trunk/LayoutTests/fast/dom/importNode-confusing-localName.html
___


Added: svn:eol-style

Modified: trunk/Source/WebCore/ChangeLog (104274 => 104275)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 08:33:24 UTC (rev 104274)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 08:47:18 UTC (rev 104275)
@@ -1,3 +1,17 @@
+2012-01-05  Kent Tamura  tk...@chromium.org
+
+Fix a crash by importing an element of which local name ends with :input.
+https://bugs.webkit.org/show_bug.cgi?id=75103
+
+Reviewed by Ryosuke Niwa.
+
+Test: fast/dom/importNode-confusing-localName.html
+
+* dom/Document.cpp:
+(WebCore::Document::importNode): Pass QualifiedName of the source elemnt
+to createElement() in order to avoid unnecessary serialization and
+parsing of the qualified name
+
 2012-01-06  Alexis Menard  alexis.men...@openbossa.org
 
 Move HTMLFormControlElementWithState class in its own header file.


Modified: trunk/Source/WebCore/dom/Document.cpp (104274 => 104275)

--- trunk/Source/WebCore/dom/Document.cpp	2012-01-06 08:33:24 UTC (rev 104274)
+++ trunk/Source/WebCore/dom/Document.cpp	2012-01-06 08:47:18 UTC (rev 104275)
@@ -835,8 +835,13 @@
 return createComment(importedNode-nodeValue());
 case ELEMENT_NODE: {
 Element* oldElement = static_castElement*(importedNode);
-RefPtrElement newElement = createElementNS(oldElement-namespaceURI(), oldElement-tagQName().toString(), ec);
-
+// FIXME: The following check might be unnecessary. Is it possible that
+// oldElement has mismatched prefix/namespace?
+if (hasPrefixNamespaceMismatch(oldElement-tagQName())) {
+ec = NAMESPACE_ERR;
+return 0;
+}
+RefPtrElement newElement = createElement(oldElement-tagQName(), ec);
 if (ec)
 return 0;
 






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


[webkit-changes] [104277] trunk/LayoutTests

2012-01-06 Thread ossy
Title: [104277] trunk/LayoutTests








Revision 104277
Author o...@webkit.org
Date 2012-01-06 01:03:23 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Unreviewed gardening. Update Qt specific expected results after r104208.

* platform/qt/fast/table/032-expected.png:
* platform/qt/fast/table/032-expected.txt:
* platform/qt/fast/writing-mode/table-percent-width-quirk-expected.png: Added.
* platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt: Added.
* platform/qt/tables/mozilla/bugs/bug55694-expected.png:
* platform/qt/tables/mozilla/bugs/bug55694-expected.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt/fast/table/032-expected.png
trunk/LayoutTests/platform/qt/fast/table/032-expected.txt
trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug55694-expected.png
trunk/LayoutTests/platform/qt/tables/mozilla/bugs/bug55694-expected.txt


Added Paths

trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.png
trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104276 => 104277)

--- trunk/LayoutTests/ChangeLog	2012-01-06 08:53:12 UTC (rev 104276)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 09:03:23 UTC (rev 104277)
@@ -1,3 +1,14 @@
+2012-01-06  Csaba Osztrogonác  o...@webkit.org
+
+[Qt] Unreviewed gardening. Update Qt specific expected results after r104208.
+
+* platform/qt/fast/table/032-expected.png:
+* platform/qt/fast/table/032-expected.txt:
+* platform/qt/fast/writing-mode/table-percent-width-quirk-expected.png: Added.
+* platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt: Added.
+* platform/qt/tables/mozilla/bugs/bug55694-expected.png:
+* platform/qt/tables/mozilla/bugs/bug55694-expected.txt:
+
 2012-01-06  Alice Boxhall  aboxh...@chromium.org
 
 Report correct line number for non-native editable text elements.


Modified: trunk/LayoutTests/platform/qt/fast/table/032-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/qt/fast/table/032-expected.txt (104276 => 104277)

--- trunk/LayoutTests/platform/qt/fast/table/032-expected.txt	2012-01-06 08:53:12 UTC (rev 104276)
+++ trunk/LayoutTests/platform/qt/fast/table/032-expected.txt	2012-01-06 09:03:23 UTC (rev 104277)
@@ -3,21 +3,16 @@
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
 RenderBody {BODY} at (8,8) size 784x584
-  RenderText {#text} at (0,0) size 780x42
-text run at (0,0) width 561: Because we're in quirks mode, you should see a 100x100 green square below. 
-text run at (561,0) width 219: If the square is only a couple of
-text run at (0,21) width 294: pixels wide or tall, then the test has failed.
-  RenderText {#text} at (0,0) size 0x0
 layer at (8,50) size 100x50
   RenderBlock (positioned) {DIV} at (8,50) size 100x50
-RenderBlock (floating) {DIV} at (0,0) size 100x50 [bgcolor=#008000]
-  RenderTable {TABLE} at (0,0) size 100x6
-RenderTableSection {TBODY} at (0,0) size 100x6
-  RenderTableRow {TR} at (0,2) size 100x2
-RenderTableCell {TD} at (2,2) size 96x2 [r=0 c=0 rs=1 cs=1]
-layer at (8,100) size 100x50
-  RenderBlock (positioned) {DIV} at (0,50) size 100x50 [bgcolor=#008000]
-RenderTable {TABLE} at (0,0) size 100x6
-  RenderTableSection {TBODY} at (0,0) size 100x6
-RenderTableRow {TR} at (0,2) size 100x2
-  RenderTableCell {TD} at (2,2) size 96x2 [r=0 c=0 rs=1 cs=1]
+RenderBlock (floating) {DIV} at (0,0) size 6x50 [bgcolor=#008000]
+  RenderTable {TABLE} at (0,0) size 6x6
+RenderTableSection {TBODY} at (0,0) size 6x6
+  RenderTableRow {TR} at (0,2) size 6x2
+RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]
+layer at (8,100) size 6x50
+  RenderBlock (positioned) {DIV} at (0,50) size 6x50 [bgcolor=#008000]
+RenderTable {TABLE} at (0,0) size 6x6
+  RenderTableSection {TBODY} at (0,0) size 6x6
+RenderTableRow {TR} at (0,2) size 6x2
+  RenderTableCell {TD} at (2,2) size 2x2 [r=0 c=0 rs=1 cs=1]


Added: trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt (0 => 104277)

--- trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/qt/fast/writing-mode/table-percent-width-quirk-expected.txt	2012-01-06 09:03:23 UTC (rev 104277)
@@ -0,0 +1,56 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 

[webkit-changes] [104278] trunk

2012-01-06 Thread commit-queue
Title: [104278] trunk








Revision 104278
Author commit-qu...@webkit.org
Date 2012-01-06 01:43:44 -0800 (Fri, 06 Jan 2012)


Log Message
Move MediaDocument styles into CSS. Set black background for chromium.
https://bugs.webkit.org/show_bug.cgi?id=74123

Source/WebCore:

Patch by Dale Curtis dalecur...@chromium.org on 2012-01-06
Reviewed by Eric Seidel.

Test: platform/chromium/media/video-black-bg-in-media-document.html

* css/mediaControls.css:
(body:-webkit-full-page-media):
(video:-webkit-full-page-media):
* css/mediaControlsChromium.css:
(body:-webkit-full-page-media):
* html/MediaDocument.cpp:
(WebCore::MediaDocumentParser::createDocumentStructure):

LayoutTests:

Adds a new chromium specific test for ensuring the background is set
properly.

Rebaselines the text portions of media-document-audio-repaint.

Patch by Dale Curtis dalecur...@chromium.org on 2012-01-06
Reviewed by Eric Seidel.

* platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt:
* platform/chromium-gpu/media/media-document-audio-repaint-expected.txt:
* platform/chromium-win/media/media-document-audio-repaint-expected.txt:
* platform/chromium/media/media-document-audio-repaint-expected.txt:
* platform/chromium/media/video-black-bg-in-media-document-expected.txt: Added.
* platform/chromium/media/video-black-bg-in-media-document.html: Added.
* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/media/media-document-audio-repaint-expected.txt
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/LayoutTests/platform/chromium-gpu/media/media-document-audio-repaint-expected.txt
trunk/LayoutTests/platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt
trunk/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/mediaControls.css
trunk/Source/WebCore/css/mediaControlsChromium.css
trunk/Source/WebCore/html/MediaDocument.cpp


Added Paths

trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document-expected.txt
trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104277 => 104278)

--- trunk/LayoutTests/ChangeLog	2012-01-06 09:03:23 UTC (rev 104277)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 09:43:44 UTC (rev 104278)
@@ -1,3 +1,23 @@
+2012-01-06  Dale Curtis  dalecur...@chromium.org
+
+Move MediaDocument styles into CSS. Set black background for chromium.
+https://bugs.webkit.org/show_bug.cgi?id=74123
+
+Adds a new chromium specific test for ensuring the background is set
+properly.
+
+Rebaselines the text portions of media-document-audio-repaint.
+
+Reviewed by Eric Seidel.
+
+* platform/chromium-gpu-win/media/media-document-audio-repaint-expected.txt:
+* platform/chromium-gpu/media/media-document-audio-repaint-expected.txt:
+* platform/chromium-win/media/media-document-audio-repaint-expected.txt:
+* platform/chromium/media/media-document-audio-repaint-expected.txt:
+* platform/chromium/media/video-black-bg-in-media-document-expected.txt: Added.
+* platform/chromium/media/video-black-bg-in-media-document.html: Added.
+* platform/chromium/test_expectations.txt:
+
 2012-01-06  Csaba Osztrogonác  o...@webkit.org
 
 [Qt] Unreviewed gardening. Update Qt specific expected results after r104208.


Modified: trunk/LayoutTests/platform/chromium/media/media-document-audio-repaint-expected.txt (104277 => 104278)

--- trunk/LayoutTests/platform/chromium/media/media-document-audio-repaint-expected.txt	2012-01-06 09:03:23 UTC (rev 104277)
+++ trunk/LayoutTests/platform/chromium/media/media-document-audio-repaint-expected.txt	2012-01-06 09:43:44 UTC (rev 104278)
@@ -13,7 +13,7 @@
 RenderView at (0,0) size 380x330
   layer at (0,0) size 380x330
 RenderBlock {HTML} at (0,0) size 380x330
-  RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#262626]
+  RenderBody {BODY} at (8,8) size 364x314 [bgcolor=#00]
   layer at (40,164) size 300x1
 RenderVideo {VIDEO} at (40,164) size 300x1
   layer at (40,164) size 300x1


Added: trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document-expected.txt (0 => 104278)

--- trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document-expected.txt	2012-01-06 09:43:44 UTC (rev 104278)
@@ -0,0 +1,6 @@
+Test that video media documents have a black background.
+
+
+EXPECTED (iframeBodyStyle.backgroundColor == 'rgb(0, 0, 0)') OK
+END OF TEST
+


Added: trunk/LayoutTests/platform/chromium/media/video-black-bg-in-media-document.html (0 => 104278)

--- 

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

2012-01-06 Thread abarth
Title: [104279] trunk/Source/WebCore








Revision 104279
Author aba...@webkit.org
Date 2012-01-06 02:28:24 -0800 (Fri, 06 Jan 2012)


Log Message
FrameDestructionObserver should be more full-service
https://bugs.webkit.org/show_bug.cgi?id=75690

Reviewed by Eric Seidel.

This patch moves code common to both subclasses of
FrameDestructionObserver into FrameDestructionObserver itself.  As we
add more subclasses, we don't want to keep copy/pasting this code.

* page/Frame.cpp:
(WebCore::FrameDestructionObserver::FrameDestructionObserver):
(WebCore::FrameDestructionObserver::~FrameDestructionObserver):
(WebCore::FrameDestructionObserver::frameDestroyed):
* page/Frame.h:
(WebCore::FrameDestructionObserver::frame):
* plugins/DOMMimeType.cpp:
(WebCore::DOMMimeType::DOMMimeType):
(WebCore::DOMMimeType::~DOMMimeType):
* plugins/DOMMimeType.h:
* plugins/DOMPlugin.cpp:
(WebCore::DOMPlugin::DOMPlugin):
(WebCore::DOMPlugin::~DOMPlugin):
* plugins/DOMPlugin.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/Frame.cpp
trunk/Source/WebCore/page/Frame.h
trunk/Source/WebCore/plugins/DOMMimeType.cpp
trunk/Source/WebCore/plugins/DOMMimeType.h
trunk/Source/WebCore/plugins/DOMPlugin.cpp
trunk/Source/WebCore/plugins/DOMPlugin.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104278 => 104279)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 09:43:44 UTC (rev 104278)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 10:28:24 UTC (rev 104279)
@@ -1,3 +1,29 @@
+2012-01-06  Adam Barth  aba...@webkit.org
+
+FrameDestructionObserver should be more full-service
+https://bugs.webkit.org/show_bug.cgi?id=75690
+
+Reviewed by Eric Seidel.
+
+This patch moves code common to both subclasses of
+FrameDestructionObserver into FrameDestructionObserver itself.  As we
+add more subclasses, we don't want to keep copy/pasting this code.
+
+* page/Frame.cpp:
+(WebCore::FrameDestructionObserver::FrameDestructionObserver):
+(WebCore::FrameDestructionObserver::~FrameDestructionObserver):
+(WebCore::FrameDestructionObserver::frameDestroyed):
+* page/Frame.h:
+(WebCore::FrameDestructionObserver::frame):
+* plugins/DOMMimeType.cpp:
+(WebCore::DOMMimeType::DOMMimeType):
+(WebCore::DOMMimeType::~DOMMimeType):
+* plugins/DOMMimeType.h:
+* plugins/DOMPlugin.cpp:
+(WebCore::DOMPlugin::DOMPlugin):
+(WebCore::DOMPlugin::~DOMPlugin):
+* plugins/DOMPlugin.h:
+
 2012-01-06  Dale Curtis  dalecur...@chromium.org
 
 Move MediaDocument styles into CSS. Set black background for chromium.


Modified: trunk/Source/WebCore/page/Frame.cpp (104278 => 104279)

--- trunk/Source/WebCore/page/Frame.cpp	2012-01-06 09:43:44 UTC (rev 104278)
+++ trunk/Source/WebCore/page/Frame.cpp	2012-01-06 10:28:24 UTC (rev 104279)
@@ -235,6 +235,24 @@
 }
 }
 
+FrameDestructionObserver::FrameDestructionObserver(Frame* frame)
+: m_frame(frame)
+{
+if (m_frame)
+m_frame-addDestructionObserver(this);
+}
+
+FrameDestructionObserver::~FrameDestructionObserver()
+{
+if (m_frame)
+m_frame-removeDestructionObserver(this);
+}
+
+void FrameDestructionObserver::frameDestroyed()
+{
+m_frame = 0;
+}
+
 void Frame::addDestructionObserver(FrameDestructionObserver* observer)
 {
 m_destructionObservers.add(observer);


Modified: trunk/Source/WebCore/page/Frame.h (104278 => 104279)

--- trunk/Source/WebCore/page/Frame.h	2012-01-06 09:43:44 UTC (rev 104278)
+++ trunk/Source/WebCore/page/Frame.h	2012-01-06 10:28:24 UTC (rev 104279)
@@ -63,6 +63,7 @@
 namespace WebCore {
 
 class Document;
+class Frame;
 class FrameView;
 class HTMLTableCellElement;
 class RegularExpression;
@@ -75,9 +76,14 @@
 
 class FrameDestructionObserver {
 public:
-virtual ~FrameDestructionObserver() { }
+explicit FrameDestructionObserver(Frame*);
+virtual void frameDestroyed();
+Frame* frame() const { return m_frame; }
 
-virtual void frameDestroyed() = 0;
+protected:
+virtual ~FrameDestructionObserver();
+
+Frame* m_frame;
 };
 
 class Frame : public RefCountedFrame, public TiledBackingStoreClient {


Modified: trunk/Source/WebCore/plugins/DOMMimeType.cpp (104278 => 104279)

--- trunk/Source/WebCore/plugins/DOMMimeType.cpp	2012-01-06 09:43:44 UTC (rev 104278)
+++ trunk/Source/WebCore/plugins/DOMMimeType.cpp	2012-01-06 10:28:24 UTC (rev 104279)
@@ -30,18 +30,14 @@
 namespace WebCore {
 
 DOMMimeType::DOMMimeType(PassRefPtrPluginData pluginData, Frame* frame, unsigned index)
-: m_pluginData(pluginData)
-, m_frame(frame)
+: FrameDestructionObserver(frame)
+, m_pluginData(pluginData)
 , m_index(index)
 {
-if (m_frame)
-m_frame-addDestructionObserver(this);
 }
 
 DOMMimeType::~DOMMimeType()
 {
-if (m_frame)
-m_frame-removeDestructionObserver(this);
 }
 
 const String 

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

2012-01-06 Thread zeno . albisser
Title: [104280] trunk/Source/WebKit2








Revision 104280
Author zeno.albis...@nokia.com
Date 2012-01-06 02:31:36 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt][WK2] Add test for application URL schemes.
https://bugs.webkit.org/show_bug.cgi?id=74933

Reviewed by Kenneth Rohde Christiansen.

* UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml: Added.
* UIProcess/API/qt/tests/qmltests/qmltests.pro:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro


Added Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104279 => 104280)

--- trunk/Source/WebKit2/ChangeLog	2012-01-06 10:28:24 UTC (rev 104279)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-06 10:31:36 UTC (rev 104280)
@@ -1,3 +1,13 @@
+2012-01-06  Zeno Albisser  z...@webkit.org
+
+[Qt][WK2] Add test for application URL schemes.
+https://bugs.webkit.org/show_bug.cgi?id=74933
+
+Reviewed by Kenneth Rohde Christiansen.
+
+* UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml: Added.
+* UIProcess/API/qt/tests/qmltests/qmltests.pro:
+
 2012-01-05  Dan Bernstein  m...@apple.com
 
 rdar://problem/10633760 Update copyright strings


Added: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml (0 => 104280)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml	(rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_applicationScheme.qml	2012-01-06 10:31:36 UTC (rev 104280)
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+import QtWebKit.experimental 3.0
+
+WebView {
+id: webView
+width: 400
+height: 300
+
+experimental {
+urlSchemeDelegates: [
+UrlSchemeDelegate {
+scheme: applicationScheme
+onReceivedRequest: {
+reply.data = "" Application Scheme/title/headbodyA test page./body/html
+reply.send()
+}
+}
+]
+}
+
+SignalSpy {
+id: spyTitle
+target: webView
+signalName: titleChanged
+}
+
+TestCase {
+name: WebViewApplicationSchemes
+
+function test_applicationScheme() {
+compare(spyTitle.count, 0)
+var testUrl = applicationScheme://something
+webView.load(testUrl)
+spyTitle.wait()
+compare(webView.title, Test Application Scheme)
+}
+}
+
+}


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (104279 => 104280)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro	2012-01-06 10:28:24 UTC (rev 104279)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro	2012-01-06 10:31:36 UTC (rev 104280)
@@ -27,4 +27,5 @@
 WebView/tst_loadProgressSignal.qml \
 WebView/tst_preferences.qml \
 WebView/tst_properties.qml \
-WebView/tst_titleChanged.qml
+WebView/tst_titleChanged.qml \
+WebView/tst_applicationScheme.qml






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


[webkit-changes] [104281] trunk/LayoutTests

2012-01-06 Thread jknotten
Title: [104281] trunk/LayoutTests








Revision 104281
Author jknot...@chromium.org
Date 2012-01-06 02:55:22 -0800 (Fri, 06 Jan 2012)


Log Message
[Chromium] Update test expectations.
https://bugs.webkit.org/show_bug.cgi?id=75698

Unreviewed.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104280 => 104281)

--- trunk/LayoutTests/ChangeLog	2012-01-06 10:31:36 UTC (rev 104280)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 10:55:22 UTC (rev 104281)
@@ -1,3 +1,12 @@
+2012-01-06  John Knottenbelt  jknot...@chromium.org
+
+[Chromium] Update test expectations.
+https://bugs.webkit.org/show_bug.cgi?id=75698
+
+Unreviewed.
+
+* platform/chromium/test_expectations.txt:
+
 2012-01-06  Dale Curtis  dalecur...@chromium.org
 
 Move MediaDocument styles into CSS. Set black background for chromium.


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104280 => 104281)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 10:31:36 UTC (rev 104280)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 10:55:22 UTC (rev 104281)
@@ -3881,4 +3881,6 @@
 BUGWK75633 : fast/media/viewport-media-query.html = PASS IMAGE+TEXT
 
 // Needs rebaseline after BUGWK74123 goes in.
-BUGWK75505 : media/media-document-audio-repaint.html = IMAGE
\ No newline at end of file
+BUGWK75505 : media/media-document-audio-repaint.html = IMAGE
+
+BUGWK75696 MAC LINUX DEBUG: svg/text/text-style-recalc-crash.html = PASS TIMEOUT






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


[webkit-changes] [104282] trunk

2012-01-06 Thread commit-queue
Title: [104282] trunk








Revision 104282
Author commit-qu...@webkit.org
Date 2012-01-06 03:25:24 -0800 (Fri, 06 Jan 2012)


Log Message
Source/WebKit/efl: [EFL] Add new pre-rendering code.
https://bugs.webkit.org/show_bug.cgi?id=73430

Patch by JungJik Lee jungjik@samsung.com on 2012-01-06
Reviewed by Zoltan Herczeg.

Add new pre-rendering code to pre-render the view area more efficiently.
At first find centered view position where backing store starts to queuing the render request from.
And append the request into the tiled backing store in spiral order.

* ewk/ewk_private.h:
* ewk/ewk_tiled_backing_store.cpp:
(ewk_tiled_backing_store_pre_render_tile_add):
(ewk_tiled_backing_store_pre_render_spiral_queue):
* ewk/ewk_tiled_backing_store.h:
* ewk/ewk_view.cpp:
(_ewk_view_smart_pre_render_start):
(ewk_view_base_smart_set):
(ewk_view_pre_render_start):
* ewk/ewk_view.h:
* ewk/ewk_view_tiled.cpp:
(_ewk_view_tiled_rect_collision_check):
(_ewk_view_tiled_rect_collision_resolve):
(_ewk_view_tiled_smart_pre_render_start):
(ewk_view_tiled_smart_set):

Tools: [EFL] Add pre-render handling code in EWebLauncher.
https://bugs.webkit.org/show_bug.cgi?id=73430

Patch by JungJik Lee jungjik@samsung.com on 2012-01-06
Reviewed by Zoltan Herczeg.

Add pre-render handling code by pressing Insert key.

* EWebLauncher/main.c:
(on_key_down):

Modified Paths

trunk/Source/WebKit/efl/ChangeLog
trunk/Source/WebKit/efl/ewk/ewk_private.h
trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp
trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.h
trunk/Source/WebKit/efl/ewk/ewk_view.cpp
trunk/Source/WebKit/efl/ewk/ewk_view.h
trunk/Source/WebKit/efl/ewk/ewk_view_tiled.cpp
trunk/Tools/ChangeLog
trunk/Tools/EWebLauncher/main.c




Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (104281 => 104282)

--- trunk/Source/WebKit/efl/ChangeLog	2012-01-06 10:55:22 UTC (rev 104281)
+++ trunk/Source/WebKit/efl/ChangeLog	2012-01-06 11:25:24 UTC (rev 104282)
@@ -1,3 +1,30 @@
+2012-01-06  JungJik Lee  jungjik@samsung.com
+
+[EFL] Add new pre-rendering code.
+https://bugs.webkit.org/show_bug.cgi?id=73430
+
+Reviewed by Zoltan Herczeg.
+
+Add new pre-rendering code to pre-render the view area more efficiently.
+At first find centered view position where backing store starts to queuing the render request from.
+And append the request into the tiled backing store in spiral order.
+
+* ewk/ewk_private.h:
+* ewk/ewk_tiled_backing_store.cpp:
+(ewk_tiled_backing_store_pre_render_tile_add):
+(ewk_tiled_backing_store_pre_render_spiral_queue):
+* ewk/ewk_tiled_backing_store.h:
+* ewk/ewk_view.cpp:
+(_ewk_view_smart_pre_render_start):
+(ewk_view_base_smart_set):
+(ewk_view_pre_render_start):
+* ewk/ewk_view.h:
+* ewk/ewk_view_tiled.cpp:
+(_ewk_view_tiled_rect_collision_check):
+(_ewk_view_tiled_rect_collision_resolve):
+(_ewk_view_tiled_smart_pre_render_start):
+(ewk_view_tiled_smart_set):
+
 2012-01-05  KwangHyuk Kim  hyuki@samsung.com
 
 [EFL] Invalidation request for ewk_view can be discarded without rendering.


Modified: trunk/Source/WebKit/efl/ewk/ewk_private.h (104281 => 104282)

--- trunk/Source/WebKit/efl/ewk/ewk_private.h	2012-01-06 10:55:22 UTC (rev 104281)
+++ trunk/Source/WebKit/efl/ewk/ewk_private.h	2012-01-06 11:25:24 UTC (rev 104282)
@@ -45,6 +45,7 @@
 
 // If defined, ewk will do type checking to ensure objects are of correct type
 #define EWK_TYPE_CHECK 1
+#define EWK_ARGB_BYTES_SIZE 4
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
 #define EWK_JS_OBJECT_MAGIC 0x696969


Modified: trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp (104281 => 104282)

--- trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp	2012-01-06 10:55:22 UTC (rev 104281)
+++ trunk/Source/WebKit/efl/ewk/ewk_tiled_backing_store.cpp	2012-01-06 11:25:24 UTC (rev 104282)
@@ -21,6 +21,7 @@
 #include config.h
 #include ewk_tiled_backing_store.h
 
+#include ewk_private.h
 #include ewk_tiled_matrix.h
 #include ewk_tiled_private.h
 #include Ecore.h
@@ -1838,6 +1839,111 @@
 #endif
 }
 
+Eina_Bool ewk_tiled_backing_store_pre_render_tile_add(Evas_Object* ewkBackingStore, int column, int row, float zoom)
+{
+PRIV_DATA_GET_OR_RETURN(ewkBackingStore, priv, false);
+
+if (ewk_tile_matrix_tile_exact_exists(priv-model.matrix, column, row, zoom))
+return false;
+
+if (!_ewk_tiled_backing_store_pre_render_request_add(priv, column, row, zoom))
+return false;
+
+return true;
+}
+
+Eina_Bool ewk_tiled_backing_store_pre_render_spiral_queue(Evas_Object* ewkBackingStore, Eina_Rectangle* viewRect, Eina_Rectangle* renderRect, int maxMemory, float zoom)
+{
+PRIV_DATA_GET_OR_RETURN(ewkBackingStore, priv, false);
+EINA_SAFETY_ON_NULL_RETURN_VAL(viewRect, false);
+EINA_SAFETY_ON_NULL_RETURN_VAL(renderRect, false);
+
+const int tileWidth = priv-view.tile.width;
+

[webkit-changes] [104283] trunk/LayoutTests

2012-01-06 Thread ossy
Title: [104283] trunk/LayoutTests








Revision 104283
Author o...@webkit.org
Date 2012-01-06 04:27:33 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Unreviewed gardening. Skip a new failing test.

* platform/qt/Skipped:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/qt/Skipped




Diff

Modified: trunk/LayoutTests/ChangeLog (104282 => 104283)

--- trunk/LayoutTests/ChangeLog	2012-01-06 11:25:24 UTC (rev 104282)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 12:27:33 UTC (rev 104283)
@@ -1,3 +1,9 @@
+2012-01-06  Csaba Osztrogonác  o...@webkit.org
+
+[Qt] Unreviewed gardening. Skip a new failing test.
+
+* platform/qt/Skipped:
+
 2012-01-06  John Knottenbelt  jknot...@chromium.org
 
 [Chromium] Update test expectations.


Modified: trunk/LayoutTests/platform/qt/Skipped (104282 => 104283)

--- trunk/LayoutTests/platform/qt/Skipped	2012-01-06 11:25:24 UTC (rev 104282)
+++ trunk/LayoutTests/platform/qt/Skipped	2012-01-06 12:27:33 UTC (rev 104283)
@@ -2544,3 +2544,7 @@
 # [Qt]http/tests/workers/terminate-during-sync-operation.html fails intermittently
 # https://bugs.webkit.org/show_bug.cgi?id=75614
 http/tests/workers/terminate-during-sync-operation.html
+
+# [Qt] REGRESSION(r104267): fast/js/date-constructor.html fails
+# https://bugs.webkit.org/show_bug.cgi?id=75692
+fast/js/date-constructor.html






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


[webkit-changes] [104284] trunk

2012-01-06 Thread vestbo
Title: [104284] trunk








Revision 104284
Author ves...@webkit.org
Date 2012-01-06 04:44:11 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Add a few more files ot OTHER_FILES

Rubber-stamped by Simon Hausmann.

Modified Paths

trunk/ChangeLog
trunk/WebKit.pro




Diff

Modified: trunk/ChangeLog (104283 => 104284)

--- trunk/ChangeLog	2012-01-06 12:27:33 UTC (rev 104283)
+++ trunk/ChangeLog	2012-01-06 12:44:11 UTC (rev 104284)
@@ -1,3 +1,11 @@
+2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
+[Qt] Add a few more files ot OTHER_FILES
+
+Rubber-stamped by Simon Hausmann.
+
+* WebKit.pro:
+
 2012-01-05  Ulan Degenbaev  u...@chromium.org
 
 [v8] Null pointer exception if a typed array constructor set to a primitive value.


Modified: trunk/WebKit.pro (104283 => 104284)

--- trunk/WebKit.pro	2012-01-06 12:27:33 UTC (rev 104283)
+++ trunk/WebKit.pro	2012-01-06 12:44:11 UTC (rev 104284)
@@ -38,6 +38,9 @@
 OTHER_FILES = \
 Tools/qmake/README \
 Tools/qmake/mkspecs/modules/qt_webkit.pri \
+Tools/qmake/configure.pro \
+Tools/qmake/sync.profile \
+Tools/qmake/config.tests/fontconfig/* \
 Tools/qmake/mkspecs/features/*.prf \
 Tools/qmake/mkspecs/features/mac/*.prf \
 Tools/qmake/mkspecs/features/unix/*.prf \






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


[webkit-changes] [104285] trunk

2012-01-06 Thread vestbo
Title: [104285] trunk








Revision 104285
Author ves...@webkit.org
Date 2012-01-06 04:53:33 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Move listing of include paths and libs to pri files in sources

Includepaths are sometimes modified by non-Qt contributors so keeping
them in files inside Sources makes it more likely that they are updated
along with project files for the other ports.

Using pri files instead of prf files for this also has the benefit that
the include() from the main target file can be parsed and followed by
Qt Creator -- something that does not work with load().

Dependency from a target to a library through the WEBKIT variable are
handled through forwarding-files in Tools/qmake/mkspecs/modules, which
set the source root of the module and include the right pri file.

Ideally we'd use the variant of include() that takes an optional
namespace to read the variables into, or the fromfile() function,
but both of these add an overhead of about 40% on the total qmake
runtime, due to making a deep copy of all the variables in the
project or re-reading all the prf files from scratch.

Reviewed by Simon Hausmann.
Reviewed by Ossy.

Modified Paths

trunk/ChangeLog
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/Target.pri
trunk/Source/_javascript_Core/wtf/wtf.pro
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Target.pri
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Target.pri
trunk/Tools/ChangeLog
trunk/Tools/qmake/mkspecs/features/default_post.prf
trunk/WebKit.pro


Added Paths

trunk/Source/_javascript_Core/_javascript_Core.pri
trunk/Source/_javascript_Core/wtf/wtf.pri
trunk/Source/WebCore/WebCore.pri
trunk/Source/WebKit2/WebKit2.pri
trunk/Tools/qmake/mkspecs/modules/_javascript_core.prf
trunk/Tools/qmake/mkspecs/modules/webcore.prf
trunk/Tools/qmake/mkspecs/modules/webkit2.prf
trunk/Tools/qmake/mkspecs/modules/wtf.prf


Removed Paths

trunk/Tools/qmake/mkspecs/features/_javascript_core.prf
trunk/Tools/qmake/mkspecs/features/webcore.prf
trunk/Tools/qmake/mkspecs/features/webkit2.prf
trunk/Tools/qmake/mkspecs/features/wtf.prf




Diff

Modified: trunk/ChangeLog (104284 => 104285)

--- trunk/ChangeLog	2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/ChangeLog	2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,5 +1,32 @@
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
+[Qt] Move listing of include paths and libs to pri files in sources
+
+Includepaths are sometimes modified by non-Qt contributors so keeping
+them in files inside Sources makes it more likely that they are updated
+along with project files for the other ports.
+
+Using pri files instead of prf files for this also has the benefit that
+the include() from the main target file can be parsed and followed by
+Qt Creator -- something that does not work with load().
+
+Dependency from a target to a library through the WEBKIT variable are
+handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+set the source root of the module and include the right pri file.
+
+Ideally we'd use the variant of include() that takes an optional
+namespace to read the variables into, or the fromfile() function,
+but both of these add an overhead of about 40% on the total qmake
+runtime, due to making a deep copy of all the variables in the
+project or re-reading all the prf files from scratch.
+
+Reviewed by Simon Hausmann.
+Reviewed by Ossy.
+
+* WebKit.pro:
+
+2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
 [Qt] Add a few more files ot OTHER_FILES
 
 Rubber-stamped by Simon Hausmann.


Modified: trunk/Source/_javascript_Core/ChangeLog (104284 => 104285)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 12:44:11 UTC (rev 104284)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 12:53:33 UTC (rev 104285)
@@ -1,3 +1,33 @@
+2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
+[Qt] Move listing of include paths and libs to pri files in sources
+
+Includepaths are sometimes modified by non-Qt contributors so keeping
+them in files inside Sources makes it more likely that they are updated
+along with project files for the other ports.
+
+Using pri files instead of prf files for this also has the benefit that
+the include() from the main target file can be parsed and followed by
+Qt Creator -- something that does not work with load().
+
+Dependency from a target to a library through the WEBKIT variable are
+handled through forwarding-files in Tools/qmake/mkspecs/modules, which
+set the source root of the module and include the right pri file.
+
+Ideally we'd use the variant of include() that takes an optional
+namespace to read the variables into, or the fromfile() function,
+but both of these add an overhead of about 40% on the 

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

2012-01-06 Thread vestbo
Title: [104286] trunk/Source/_javascript_Core








Revision 104286
Author ves...@webkit.org
Date 2012-01-06 05:18:09 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Remove un-needed VPATHs from project includes

Reviewed by Simon Hausmann.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.pri
trunk/Source/_javascript_Core/wtf/wtf.pri




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104285 => 104286)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 12:53:33 UTC (rev 104285)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 13:18:09 UTC (rev 104286)
@@ -1,5 +1,14 @@
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
+[Qt] Remove un-needed VPATHs from project includes
+
+Reviewed by Simon Hausmann.
+
+* _javascript_Core.pri:
+* wtf/wtf.pri:
+
+2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
+
 [Qt] Move listing of include paths and libs to pri files in sources
 
 Includepaths are sometimes modified by non-Qt contributors so keeping


Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (104285 => 104286)

--- trunk/Source/_javascript_Core/_javascript_Core.pri	2012-01-06 12:53:33 UTC (rev 104285)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri	2012-01-06 13:18:09 UTC (rev 104286)
@@ -28,8 +28,6 @@
 $$SOURCE_DIR/ForwardingHeaders \
 $$_javascript_CORE_GENERATED_SOURCES_DIR
 
-VPATH += $$SOURCE_DIR
-
 win32-* {
 DEFINES += _HAS_TR1=0
 LIBS += -lwinmm


Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (104285 => 104286)

--- trunk/Source/_javascript_Core/wtf/wtf.pri	2012-01-06 12:53:33 UTC (rev 104285)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri	2012-01-06 13:18:09 UTC (rev 104286)
@@ -16,8 +16,6 @@
 $$SOURCE_DIR/qt \
 $$SOURCE_DIR/unicode
 
-VPATH += $$SOURCE_DIR
-
 contains(CONFIG, use_system_icu) {
 DEFINES += WTF_USE_ICU_UNICODE=1
 DEFINES -= WTF_USE_QT4_UNICODE






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


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

2012-01-06 Thread commit-queue
Title: [104287] trunk/Source/WebKit2








Revision 104287
Author commit-qu...@webkit.org
Date 2012-01-06 05:34:27 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt][WK2] QQuickWebView breaks when an empty url is loaded
https://bugs.webkit.org/show_bug.cgi?id=75445

Patch by Rafael Brandao rafael.l...@openbossa.org on 2012-01-06
Reviewed by Tor Arne Vestbø.

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebView::load):
* UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml: Check if a request to load
an empty url is ignored. 'about:blank' should be used instead to load an empty page.
* UIProcess/API/qt/tests/qmltests/qmltests.pro:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro


Added Paths

trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104286 => 104287)

--- trunk/Source/WebKit2/ChangeLog	2012-01-06 13:18:09 UTC (rev 104286)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-06 13:34:27 UTC (rev 104287)
@@ -1,3 +1,16 @@
+2012-01-06  Rafael Brandao  rafael.l...@openbossa.org
+
+[Qt][WK2] QQuickWebView breaks when an empty url is loaded
+https://bugs.webkit.org/show_bug.cgi?id=75445
+
+Reviewed by Tor Arne Vestbø.
+
+* UIProcess/API/qt/qquickwebview.cpp:
+(QQuickWebView::load):
+* UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml: Check if a request to load
+an empty url is ignored. 'about:blank' should be used instead to load an empty page.
+* UIProcess/API/qt/tests/qmltests/qmltests.pro:
+
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
 [Qt] Move listing of include paths and libs to pri files in sources


Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (104286 => 104287)

--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-01-06 13:18:09 UTC (rev 104286)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp	2012-01-06 13:34:27 UTC (rev 104287)
@@ -814,6 +814,9 @@
 
 void QQuickWebView::load(const QUrl url)
 {
+if (url.isEmpty())
+return;
+
 Q_D(QQuickWebView);
 d-webPageProxy-loadURL(url.toString());
 }


Added: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml (0 => 104287)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml	(rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_loadUrl.qml	2012-01-06 13:34:27 UTC (rev 104287)
@@ -0,0 +1,55 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QtWebKit 3.0
+
+WebView {
+id: webView
+property variant lastUrl
+property bool watchProgress: false
+
+onLoadProgressChanged: {
+if (watchProgress  webView.loadProgress != 100) {
+watchProgress = false
+load('')
+}
+}
+
+SignalSpy {
+id: spy
+target: webView
+signalName: loadSucceeded
+}
+
+TestCase {
+id: test
+name: WebViewLoadUrl
+function test_loadIgnoreEmptyUrl() {
+compare(spy.count, 0)
+var url = ""
+
+webView.load(url)
+spy.wait()
+compare(spy.count, 1)
+compare(webView.url, url)
+
+lastUrl = webView.url
+webView.load('')
+wait(1000)
+compare(spy.count, 1)
+compare(webView.url, lastUrl)
+
+webView.load('about:blank')
+spy.wait()
+compare(spy.count, 2)
+compare(webView.url, 'about:blank')
+
+// It shouldn't interrupt any ongoing load when an empty url is used.
+watchProgress = true
+webView.load(url)
+spy.wait()
+compare(spy.count, 3)
+verify(!watchProgress)
+compare(webView.url, url)
+}
+}
+}


Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro (104286 => 104287)

--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro	2012-01-06 13:18:09 UTC (rev 104286)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro	2012-01-06 13:34:27 UTC (rev 104287)
@@ -22,6 +22,7 @@
 WebView/tst_itemSelector.qml \
 WebView/tst_javaScriptDialogs.qml \
 WebView/tst_loadFail.qml \
+WebView/tst_loadIgnore.qml \
 WebView/tst_loadHtml.qml \
 WebView/tst_loadProgress.qml \
 WebView/tst_loadProgressSignal.qml \






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


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

2012-01-06 Thread commit-queue
Title: [104288] trunk/Source/WebKit








Revision 104288
Author commit-qu...@webkit.org
Date 2012-01-06 06:21:14 -0800 (Fri, 06 Jan 2012)


Log Message
[BlackBerry] Upstream BlackBerry WebCoreSupport cache client
https://bugs.webkit.org/show_bug.cgi?id=75649

Patch by Jacky Jiang zhaji...@rim.com on 2012-01-06
Reviewed by Antonio Gomes.

Initial upstream, no new tests.

* blackberry/WebCoreSupport/CacheClientBlackBerry.cpp: Added.
* blackberry/WebCoreSupport/CacheClientBlackBerry.h: Added.

Modified Paths

trunk/Source/WebKit/ChangeLog


Added Paths

trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp
trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.h




Diff

Modified: trunk/Source/WebKit/ChangeLog (104287 => 104288)

--- trunk/Source/WebKit/ChangeLog	2012-01-06 13:34:27 UTC (rev 104287)
+++ trunk/Source/WebKit/ChangeLog	2012-01-06 14:21:14 UTC (rev 104288)
@@ -1,3 +1,15 @@
+2012-01-06  Jacky Jiang  zhaji...@rim.com
+
+[BlackBerry] Upstream BlackBerry WebCoreSupport cache client
+https://bugs.webkit.org/show_bug.cgi?id=75649
+
+Reviewed by Antonio Gomes.
+
+Initial upstream, no new tests.
+
+* blackberry/WebCoreSupport/CacheClientBlackBerry.cpp: Added.
+* blackberry/WebCoreSupport/CacheClientBlackBerry.h: Added.
+
 2012-01-03  Jon Lee  jon...@apple.com
 
 Leak of WebNotificationClient when page is destroyed


Added: trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp (0 => 104288)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp	(rev 0)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.cpp	2012-01-06 14:21:14 UTC (rev 104288)
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include config.h
+#include CacheClientBlackBerry.h
+
+#include MemoryCache.h
+#include BlackBerryPlatformMisc.h
+#include BlackBerryPlatformSettings.h
+
+namespace WebCore {
+
+CacheClientBlackBerry* CacheClientBlackBerry::get()
+{
+static CacheClientBlackBerry s_cacheClient;
+return s_cacheClient;
+}
+
+CacheClientBlackBerry::CacheClientBlackBerry()
+: m_lastCapacity(0)
+{
+}
+
+void CacheClientBlackBerry::initialize()
+{
+#if ENABLE(BLACKBERRY_DEBUG_MEMORY)
+bool isDisabled = true;
+#else
+bool isDisabled = false;
+#endif
+memoryCache()-setDisabled(isDisabled);
+if (!isDisabled) {
+// We have to set a non-zero interval to schedule cache pruning after a CachedImage becoming dead.
+memoryCache()-setDeadDecodedDataDeletionInterval(0.01);
+updateCacheCapacity();
+}
+}
+
+void CacheClientBlackBerry::updateCacheCapacity()
+{
+#if ENABLE(BLACKBERRY_DEBUG_MEMORY)
+// We're debugging memory usage. So keep it disabled.
+#else
+unsigned cacheCapacity = BlackBerry::Platform::Settings::get()-getSuggestedCacheCapacity(memoryCache()-totalSize());
+if (m_lastCapacity == cacheCapacity) {
+// Suggested capacity hasn't been changed.
+return;
+}
+
+m_lastCapacity = cacheCapacity;
+memoryCache()-setCapacities(0, m_lastCapacity, m_lastCapacity);
+#endif
+}
+
+} // WebCore


Added: trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.h (0 => 104288)

--- trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.h	(rev 0)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/CacheClientBlackBerry.h	2012-01-06 14:21:14 UTC (rev 104288)
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * 

[webkit-changes] [104289] trunk

2012-01-06 Thread kov
Title: [104289] trunk








Revision 104289
Author k...@webkit.org
Date 2012-01-06 06:25:39 -0800 (Fri, 06 Jan 2012)


Log Message
Make the new WTF module build on Gtk
https://bugs.webkit.org/show_bug.cgi?id=75669

Patch by Eric Seidel  e...@webkit.org and Gustavo Noronha Silva gustavo.noro...@collabora.com on 2012-01-06

Source/_javascript_Core:

* GNUmakefile.am:

Source/WTF:

* GNUmakefile.am: Added.
* GNUmakefile.list.am: Added.

Modified Paths

trunk/GNUmakefile.am
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/GNUmakefile.am
trunk/Source/WTF/ChangeLog


Added Paths

trunk/Source/WTF/GNUmakefile.am
trunk/Source/WTF/GNUmakefile.list.am




Diff

Modified: trunk/GNUmakefile.am (104288 => 104289)

--- trunk/GNUmakefile.am	2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/GNUmakefile.am	2012-01-06 14:25:39 UTC (rev 104289)
@@ -56,6 +56,9 @@
 POFILES :=
 MOFILES :=
 dom_binding_idls :=
+wtf_cppflags:=
+wtf_cflags :=
+wtf_sources :=
 _javascript_core_h_api :=
 _javascript_core_cppflags:=
 _javascript_core_cflags :=
@@ -219,6 +222,8 @@
 	$(srcdir)/Source/WebKit/LICENSE
 
 # Include module makefiles
+include Source/WTF/GNUmakefile.am
+
 if USE_JSC
 include Source/_javascript_Core/GNUmakefile.am
 endif


Modified: trunk/Source/_javascript_Core/ChangeLog (104288 => 104289)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 14:25:39 UTC (rev 104289)
@@ -1,3 +1,10 @@
+2012-01-06  Eric Seidel  e...@webkit.org and Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+Make the new WTF module build on Gtk
+https://bugs.webkit.org/show_bug.cgi?id=75669
+
+* GNUmakefile.am:
+
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
 [Qt] Remove un-needed VPATHs from project includes


Modified: trunk/Source/_javascript_Core/GNUmakefile.am (104288 => 104289)

--- trunk/Source/_javascript_Core/GNUmakefile.am	2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/_javascript_Core/GNUmakefile.am	2012-01-06 14:25:39 UTC (rev 104289)
@@ -23,10 +23,11 @@
 	$(_javascript_core_sources)
 
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \
+	-lpthread \
+	libWTF.la \
 	$(UNICODE_LIBS) \
 	$(GLIB_LIBS) \
-	$(WINMM_LIBS) \
-	-lpthread
+	$(WINMM_LIBS)
 
 libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \
 	$(global_cxxflags) \
@@ -68,6 +69,9 @@
 	-I$(srcdir)/Source/_javascript_Core/yarr \
 	-I$(top_builddir)/DerivedSources/_javascript_Core
 
+_javascript_core_cppflags += \
+	-I$(srcdir)/Source/WTF
+
 _javascript_core_cflags += \
 	$(global_cflags) \
 	$(GLIB_CFLAGS) \


Modified: trunk/Source/WTF/ChangeLog (104288 => 104289)

--- trunk/Source/WTF/ChangeLog	2012-01-06 14:21:14 UTC (rev 104288)
+++ trunk/Source/WTF/ChangeLog	2012-01-06 14:25:39 UTC (rev 104289)
@@ -1,3 +1,11 @@
+2012-01-06  Eric Seidel  e...@webkit.org and Gustavo Noronha Silva  gustavo.noro...@collabora.com
+
+Make the new WTF module build on Gtk
+https://bugs.webkit.org/show_bug.cgi?id=75669
+
+* GNUmakefile.am: Added.
+* GNUmakefile.list.am: Added.
+
 2011-11-19  Adam Barth  aba...@webkit.org
 
 Integrate Source/WTF with the Chromium build system


Added: trunk/Source/WTF/GNUmakefile.am (0 => 104289)

--- trunk/Source/WTF/GNUmakefile.am	(rev 0)
+++ trunk/Source/WTF/GNUmakefile.am	2012-01-06 14:25:39 UTC (rev 104289)
@@ -0,0 +1,38 @@
+include $(srcdir)/Source/WTF/GNUmakefile.list.am
+
+noinst_LTLIBRARIES += \
+	libWTF.la
+
+libWTF_la_LDFLAGS = \
+	$(no_undefined)
+
+libWTF_la_SOURCES = \
+	$(wtf_sources)
+
+libWTF_la_LIBADD = \
+	$(UNICODE_LIBS) \
+	$(GLIB_LIBS) \
+	$(WINMM_LIBS) \
+	-lpthread
+
+libWTF_la_CXXFLAGS = \
+	$(global_cxxflags) \
+	$(libWTF_la_CFLAGS)
+
+wtf_cflags += \
+	$(global_cflags) \
+	$(GLIB_CFLAGS) \
+	$(UNICODE_CFLAGS)
+
+libWTF_la_CFLAGS = \
+	-fstrict-aliasing \
+	-O3 \
+	$(wtf_cflags)
+
+wtf_cppflags += \
+	-I$(srcdir)/Source \
+	-I$(srcdir)/Source/WTF
+
+libWTF_la_CPPFLAGS = \
+	$(global_cppflags) \
+	$(wtf_cppflags)


Added: trunk/Source/WTF/GNUmakefile.list.am (0 => 104289)

--- trunk/Source/WTF/GNUmakefile.list.am	(rev 0)
+++ trunk/Source/WTF/GNUmakefile.list.am	2012-01-06 14:25:39 UTC (rev 104289)
@@ -0,0 +1,3 @@
+wtf_sources += \
+	Source/WTF/Stub.cpp \
+	Source/WTF/Stub.h






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


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

2012-01-06 Thread antti
Title: [104290] trunk/Source/WebCore








Revision 104290
Author an...@apple.com
Date 2012-01-06 06:48:23 -0800 (Fri, 06 Jan 2012)


Log Message
REGRESSION (r104060): fast/forms/textarea-metrics.html is failing
https://bugs.webkit.org/show_bug.cgi?id=75644

Reviewed by Alexey Proskuryakov.

We need to clear the style selector on doc type change as the doc type
may affect interpretation of the stylesheets. r104060 extended the life
of the style selector in some cases, exposing this problem.

* dom/Document.cpp:
(WebCore::Document::setDocType):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (104289 => 104290)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 14:25:39 UTC (rev 104289)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 14:48:23 UTC (rev 104290)
@@ -1,3 +1,17 @@
+2012-01-05  Antti Koivisto  an...@apple.com
+
+REGRESSION (r104060): fast/forms/textarea-metrics.html is failing
+https://bugs.webkit.org/show_bug.cgi?id=75644
+
+Reviewed by Alexey Proskuryakov.
+
+We need to clear the style selector on doc type change as the doc type
+may affect interpretation of the stylesheets. r104060 extended the life
+of the style selector in some cases, exposing this problem.
+
+* dom/Document.cpp:
+(WebCore::Document::setDocType):
+
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
 [Qt] Move listing of include paths and libs to pri files in sources


Modified: trunk/Source/WebCore/dom/Document.cpp (104289 => 104290)

--- trunk/Source/WebCore/dom/Document.cpp	2012-01-06 14:25:39 UTC (rev 104289)
+++ trunk/Source/WebCore/dom/Document.cpp	2012-01-06 14:48:23 UTC (rev 104290)
@@ -713,6 +713,8 @@
 m_docType = docType;
 if (m_docType)
 m_docType-setTreeScopeRecursively(this);
+// Doctype affects the interpretation of the stylesheets.
+m_styleSelector.clear();
 }
 
 DOMImplementation* Document::implementation()






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


[webkit-changes] [104291] trunk

2012-01-06 Thread hausmann
Title: [104291] trunk








Revision 104291
Author hausm...@webkit.org
Date 2012-01-06 07:28:47 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] Fix compilation of app code against QtWebKit master header file

Unreviewed trivial build fix.

* Source/sync.profile: Exclude util.h and testwindow.h from the master header
file, because it cannot be used outside of the WebKit source tree.

Modified Paths

trunk/ChangeLog
trunk/Source/sync.profile




Diff

Modified: trunk/ChangeLog (104290 => 104291)

--- trunk/ChangeLog	2012-01-06 14:48:23 UTC (rev 104290)
+++ trunk/ChangeLog	2012-01-06 15:28:47 UTC (rev 104291)
@@ -1,3 +1,12 @@
+2012-01-06  Simon Hausmann  simon.hausm...@nokia.com
+
+[Qt] Fix compilation of app code against QtWebKit master header file
+
+Unreviewed trivial build fix.
+
+* Source/sync.profile: Exclude util.h and testwindow.h from the master header
+file, because it cannot be used outside of the WebKit source tree.
+
 2012-01-06  Tor Arne Vestbø  tor.arne.ves...@nokia.com
 
 [Qt] Move listing of include paths and libs to pri files in sources


Modified: trunk/Source/sync.profile (104290 => 104291)

--- trunk/Source/sync.profile	2012-01-06 14:48:23 UTC (rev 104290)
+++ trunk/Source/sync.profile	2012-01-06 15:28:47 UTC (rev 104291)
@@ -15,4 +15,4 @@
 %modulepris = (
 QtWebKit = $basedir/../Tools/qmake/mkspecs/modules/qt_webkit.pri,
 );
-@ignore_for_master_contents = ( qwebscriptworld.h );
+@ignore_for_master_contents = ( qwebscriptworld.h, testwindow.h, util.h );






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


[webkit-changes] [104293] trunk/LayoutTests

2012-01-06 Thread commit-queue
Title: [104293] trunk/LayoutTests








Revision 104293
Author commit-qu...@webkit.org
Date 2012-01-06 07:42:57 -0800 (Fri, 06 Jan 2012)


Log Message
make canvas-lineWidth test pass even if pixel values vary a tiny bit
https://bugs.webkit.org/show_bug.cgi?id=75627

Patch by Elliot Poger epo...@google.com on 2012-01-06
Reviewed by Stephen White.

* fast/canvas/canvas-lineWidth.js:
(compareRows):

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/canvas/canvas-lineWidth.js




Diff

Modified: trunk/LayoutTests/ChangeLog (104292 => 104293)

--- trunk/LayoutTests/ChangeLog	2012-01-06 15:37:57 UTC (rev 104292)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 15:42:57 UTC (rev 104293)
@@ -1,3 +1,13 @@
+2012-01-06  Elliot Poger  epo...@google.com
+
+make canvas-lineWidth test pass even if pixel values vary a tiny bit
+https://bugs.webkit.org/show_bug.cgi?id=75627
+
+Reviewed by Stephen White.
+
+* fast/canvas/canvas-lineWidth.js:
+(compareRows):
+
 2012-01-06  John Knottenbelt  jknot...@chromium.org
 
 Rebaseline mac results after r104240.


Modified: trunk/LayoutTests/fast/canvas/canvas-lineWidth.js (104292 => 104293)

--- trunk/LayoutTests/fast/canvas/canvas-lineWidth.js	2012-01-06 15:37:57 UTC (rev 104292)
+++ trunk/LayoutTests/fast/canvas/canvas-lineWidth.js	2012-01-06 15:42:57 UTC (rev 104293)
@@ -1,10 +1,11 @@
-// Compare sections of a canvas to assert they are identical.
-function compareRows(ctx, y0, y1, width, height) {
+// Compare sections of a canvas to assert they are identical, or nearly so.
+function compareRows(ctx, y0, y1, width, height, allowableDifference) {
 var data0 = ctx.getImageData(0, y0, width, height).data;
 var data1 = ctx.getImageData(0, y1, width, height).data;
 for (var i = 0, il = data0.length; i  il; ++i) {
-if (data0[i] != data1[i]) {
-testFailed(Pixel at  + i +  should be  + data0[i] +  but was  + data1[i]);
+if (Math.abs(data0[i] - data1[i])  allowableDifference) {
+testFailed(Pixel at  + i +  should be within  + allowableDifference +
+ of  + data0[i] +  but was  + data1[i]);
 break;
 }
 }
@@ -40,6 +41,7 @@
 }
 }
 
-// Make sure that all rows are identical.
-compareRows(ctx, 0, 100, 600, 100);
-compareRows(ctx, 0, 200, 600, 100);
+// Make sure that all rows are nearly identical.
+// (Tiny variations are OK.)
+compareRows(ctx, 0, 100, 600, 100, 1);
+compareRows(ctx, 0, 200, 600, 100, 1);






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


[webkit-changes] [104294] trunk/LayoutTests

2012-01-06 Thread jknotten
Title: [104294] trunk/LayoutTests








Revision 104294
Author jknot...@chromium.org
Date 2012-01-06 09:03:49 -0800 (Fri, 06 Jan 2012)


Log Message
[Chromium] Set baseline for new test plugins/npruntime/object-from-destroyed-plugin-in-subframe.html
https://bugs.webkit.org/show_bug.cgi?id=75706

Unreviewed.

* platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt: Added.

Modified Paths

trunk/LayoutTests/ChangeLog


Added Paths

trunk/LayoutTests/platform/chromium/plugins/npruntime/
trunk/LayoutTests/platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104293 => 104294)

--- trunk/LayoutTests/ChangeLog	2012-01-06 15:42:57 UTC (rev 104293)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 17:03:49 UTC (rev 104294)
@@ -1,3 +1,12 @@
+2012-01-06  John Knottenbelt  jknot...@chromium.org
+
+[Chromium] Set baseline for new test plugins/npruntime/object-from-destroyed-plugin-in-subframe.html
+https://bugs.webkit.org/show_bug.cgi?id=75706
+
+Unreviewed.
+
+* platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt: Added.
+
 2012-01-06  Elliot Poger  epo...@google.com
 
 make canvas-lineWidth test pass even if pixel values vary a tiny bit


Added: trunk/LayoutTests/platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt (0 => 104294)

--- trunk/LayoutTests/platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt	2012-01-06 17:03:49 UTC (rev 104294)
@@ -0,0 +1,10 @@
+Test various operation on an NPObject whose plug-in (that lives in a subframe) has been destroyed
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+ PASS testObject.gettingProperty threw exception ReferenceError: NPObject deleted.
+PASS testObject.settingProperty = 10 threw exception ReferenceError: NPObject deleted.
+PASS testObject() threw exception ReferenceError: NPObject deleted.
+PASS new testObject(); threw exception ReferenceError: NPObject deleted.
+
Property changes on: trunk/LayoutTests/platform/chromium/plugins/npruntime/object-from-destroyed-plugin-in-subframe-expected.txt
___


Added: svn:eol-style




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


[webkit-changes] [104295] trunk/LayoutTests

2012-01-06 Thread commit-queue
Title: [104295] trunk/LayoutTests








Revision 104295
Author commit-qu...@webkit.org
Date 2012-01-06 09:13:42 -0800 (Fri, 06 Jan 2012)


Log Message
[Chromium] Expectations for svg/carto.net/button.svg can be updated
https://bugs.webkit.org/show_bug.cgi?id=75621

Unreviewed update to Chromium test_expectations

Patch by Stephen Chenney schen...@chromium.org on 2012-01-06

* platform/chromium/test_expectations.txt: Removed flakiness line for carto.net/button.svg

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104294 => 104295)

--- trunk/LayoutTests/ChangeLog	2012-01-06 17:03:49 UTC (rev 104294)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 17:13:42 UTC (rev 104295)
@@ -1,3 +1,12 @@
+2012-01-06  Stephen Chenney  schen...@chromium.org
+
+[Chromium] Expectations for svg/carto.net/button.svg can be updated
+https://bugs.webkit.org/show_bug.cgi?id=75621
+
+Unreviewed update to Chromium test_expectations
+
+* platform/chromium/test_expectations.txt: Removed flakiness line for carto.net/button.svg
+
 2012-01-06  John Knottenbelt  jknot...@chromium.org
 
 [Chromium] Set baseline for new test plugins/npruntime/object-from-destroyed-plugin-in-subframe.html


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104294 => 104295)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 17:03:49 UTC (rev 104294)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 17:13:42 UTC (rev 104295)
@@ -981,10 +981,6 @@
 // Our gradients are wrong here.
 BUGCR19559 LINUX WIN : svg/W3C-SVG-1.1/pservers-grad-08-b.svg = FAIL
 
-// This seems to be correct at this time. Marking flakey to verify that changed
-// expectations are correct and that it no longer crashes.
-BUGCR10304 LINUX WIN : svg/carto.net/button.svg = PASS FAIL CRASH
-
 // Probably need to change the test upstream to describe it better and use no
 // hard coded numbers.
 BUGCR19897 LINUX WIN : svg/custom/getscreenctm-in-mixed-content2.xhtml = FAIL






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


[webkit-changes] [104296] trunk/Source/WebKit/win

2012-01-06 Thread jberlin
Title: [104296] trunk/Source/WebKit/win








Revision 104296
Author jber...@webkit.org
Date 2012-01-06 09:19:12 -0800 (Fri, 06 Jan 2012)


Log Message
Windows build fix.

* Interfaces/IWebViewPrivate.idl:

Modified Paths

trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl




Diff

Modified: trunk/Source/WebKit/win/ChangeLog (104295 => 104296)

--- trunk/Source/WebKit/win/ChangeLog	2012-01-06 17:13:42 UTC (rev 104295)
+++ trunk/Source/WebKit/win/ChangeLog	2012-01-06 17:19:12 UTC (rev 104296)
@@ -1,3 +1,9 @@
+2012-01-06  Jessie Berlin  jber...@apple.com
+
+Windows build fix.
+
+* Interfaces/IWebViewPrivate.idl:
+
 2012-01-05  Adam Roben  aro...@apple.com
 
 Add WebKitTestRunnerLauncher to WebKit.sln.


Modified: trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (104295 => 104296)

--- trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl	2012-01-06 17:13:42 UTC (rev 104295)
+++ trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl	2012-01-06 17:19:12 UTC (rev 104296)
@@ -274,4 +274,7 @@
 
 HRESULT setUsesLayeredWindow([in] BOOL usesLayeredWindow);
 HRESULT usesLayeredWindow([out, retval] BOOL* usesLayeredWindow);
+
+HRESULT registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing([in] BSTR scheme);
+HRESULT registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing([in] BSTR scheme);
 }






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


[webkit-changes] [104297] branches/safari-534.54-branch/Source/WebKit/win

2012-01-06 Thread lforschler
Title: [104297] branches/safari-534.54-branch/Source/WebKit/win








Revision 104297
Author lforsch...@apple.com
Date 2012-01-06 09:33:40 -0800 (Fri, 06 Jan 2012)


Log Message
Merged r104296.

Modified Paths

branches/safari-534.54-branch/Source/WebKit/win/ChangeLog
branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl




Diff

Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (104296 => 104297)

--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-06 17:19:12 UTC (rev 104296)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-06 17:33:40 UTC (rev 104297)
@@ -1,3 +1,13 @@
+2011-1-6  Lucas Forschler  lforsch...@apple.com
+
+Merge 104296
+
+2012-01-06  Jessie Berlin  jber...@apple.com
+
+Windows build fix.
+
+* Interfaces/IWebViewPrivate.idl:
+
 2011-1-5  Lucas Forschler  lforsch...@apple.com
 
 Merge 103479


Modified: branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (104296 => 104297)

--- branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl	2012-01-06 17:19:12 UTC (rev 104296)
+++ branches/safari-534.54-branch/Source/WebKit/win/Interfaces/IWebViewPrivate.idl	2012-01-06 17:33:40 UTC (rev 104297)
@@ -275,4 +275,7 @@
 
 HRESULT setUsesLayeredWindow([in] BOOL usesLayeredWindow);
 HRESULT usesLayeredWindow([out, retval] BOOL* usesLayeredWindow);
+
+HRESULT registerURLSchemeAsAllowingLocalStorageAccessInPrivateBrowsing([in] BSTR scheme);
+HRESULT registerURLSchemeAsAllowingDatabaseAccessInPrivateBrowsing([in] BSTR scheme);
 }






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


[webkit-changes] [104298] branches/chromium/wpotest/Source

2012-01-06 Thread tony
Title: [104298] branches/chromium/wpotest/Source








Revision 104298
Author t...@chromium.org
Date 2012-01-06 09:34:57 -0800 (Fri, 06 Jan 2012)


Log Message
Merge 103722 - [chromium] really enable wpo for WebCore libs and for WTF
https://bugs.webkit.org/show_bug.cgi?id=75264

Reviewed by Adam Barth.

Source/_javascript_Core:

* _javascript_Core.gyp/_javascript_Core.gyp: Enable WPO for wtf and yarr.

Source/WebCore:

* WebCore.gyp/WebCore.gyp: The variable was getting clobbered by the
value set in common.gypi.  Use a target_defaults instead to set the
variable.  I tested manually on my Windows machine and
WholeProgramOptimization is getting set when buildtype is Official.

TBR=t...@chromium.org

Modified Paths

branches/chromium/wpotest/Source/_javascript_Core/ChangeLog
branches/chromium/wpotest/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp
branches/chromium/wpotest/Source/WebCore/ChangeLog
branches/chromium/wpotest/Source/WebCore/WebCore.gyp/WebCore.gyp




Diff

Modified: branches/chromium/wpotest/Source/_javascript_Core/ChangeLog (104297 => 104298)

--- branches/chromium/wpotest/Source/_javascript_Core/ChangeLog	2012-01-06 17:33:40 UTC (rev 104297)
+++ branches/chromium/wpotest/Source/_javascript_Core/ChangeLog	2012-01-06 17:34:57 UTC (rev 104298)
@@ -1,3 +1,12 @@
+2011-12-27  Tony Chang  t...@chromium.org
+
+[chromium] really enable wpo for WebCore libs and for WTF
+https://bugs.webkit.org/show_bug.cgi?id=75264
+
+Reviewed by Adam Barth.
+
+* _javascript_Core.gyp/_javascript_Core.gyp: Enable WPO for wtf and yarr.
+
 2011-12-02  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r101801.


Modified: branches/chromium/wpotest/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (104297 => 104298)

--- branches/chromium/wpotest/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp	2012-01-06 17:33:40 UTC (rev 104297)
+++ branches/chromium/wpotest/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp	2012-01-06 17:34:57 UTC (rev 104298)
@@ -104,6 +104,7 @@
   'target_name': 'wtf',
   'type': 'static_library',
   'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
+  'variables': { 'optimize': 'max' },
   'dependencies': [
 'wtf_config',
 '(chromium_src_dir)/third_party/icu/icu.gyp:icui18n',
@@ -205,6 +206,7 @@
 }],
   ],
   'msvs_guid': '49909552-0B0C-4C14-8CF6-DB8A2ADE0934',
+  'variables': { 'optimize': 'max' },
   'actions': [
 {
   'action_name': 'retgen',


Modified: branches/chromium/wpotest/Source/WebCore/ChangeLog (104297 => 104298)

--- branches/chromium/wpotest/Source/WebCore/ChangeLog	2012-01-06 17:33:40 UTC (rev 104297)
+++ branches/chromium/wpotest/Source/WebCore/ChangeLog	2012-01-06 17:34:57 UTC (rev 104298)
@@ -1,3 +1,15 @@
+2011-12-27  Tony Chang  t...@chromium.org
+
+[chromium] really enable wpo for WebCore libs and for WTF
+https://bugs.webkit.org/show_bug.cgi?id=75264
+
+Reviewed by Adam Barth.
+
+* WebCore.gyp/WebCore.gyp: The variable was getting clobbered by the
+value set in common.gypi.  Use a target_defaults instead to set the
+variable.  I tested manually on my Windows machine and
+WholeProgramOptimization is getting set when buildtype is Official.
+
 2011-12-02  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r101731.


Modified: branches/chromium/wpotest/Source/WebCore/WebCore.gyp/WebCore.gyp (104297 => 104298)

--- branches/chromium/wpotest/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-01-06 17:33:40 UTC (rev 104297)
+++ branches/chromium/wpotest/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-01-06 17:34:57 UTC (rev 104298)
@@ -259,6 +259,12 @@
 ],
   },  # variables
 
+  'target_defaults': {
+'variables': {
+  'optimize': 'max',
+},
+  },
+
   'conditions': [
 ['OS!=win and remove_webcore_debug_symbols==1', {
   # Remove -g from all targets defined here.






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


[webkit-changes] [104300] trunk/LayoutTests

2012-01-06 Thread senorblanco
Title: [104300] trunk/LayoutTests








Revision 104300
Author senorbla...@chromium.org
Date 2012-01-06 10:06:50 -0800 (Fri, 06 Jan 2012)


Log Message
[Chromium] Remove fast/files/domurl-script-execution-context-crash.html
from test_expectations (no longer crashing).

Unreviewed; test expectations update.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104299 => 104300)

--- trunk/LayoutTests/ChangeLog	2012-01-06 17:50:10 UTC (rev 104299)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 18:06:50 UTC (rev 104300)
@@ -1,3 +1,12 @@
+2012-01-06  Stephen White  senorbla...@chromium.org
+
+[Chromium] Remove fast/files/domurl-script-execution-context-crash.html
+from test_expectations (no longer crashing).
+
+Unreviewed; test expectations update.
+
+* platform/chromium/test_expectations.txt:
+
 2012-01-05  Jon Lee  jon...@apple.com
 
 Rebaseline fast/forms


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104299 => 104300)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 17:50:10 UTC (rev 104299)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 18:06:50 UTC (rev 104300)
@@ -3022,7 +3022,6 @@
 // broke in r84742 - just needs a new baseline?
 BUGWK60121 : http/tests/misc/will-send-request-returns-null-on-redirect.html = TEXT
 
-BUGCR86337 : fast/files/domurl-script-execution-context-crash.html = PASS CRASH
 BUGCR86338 : fast/loader/file-protocol-fragment.html = TEXT
 BUGCR86340 : fast/filesystem/file-writer-write-overlapped.html = PASS CRASH TEXT
 






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


[webkit-changes] [104301] trunk

2012-01-06 Thread jer . noble
Title: [104301] trunk








Revision 104301
Author jer.no...@apple.com
Date 2012-01-06 10:28:43 -0800 (Fri, 06 Jan 2012)


Log Message
REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally
https://bugs.webkit.org/show_bug.cgi?id=75200

Reviewed by Eric Carlson.

Source/WebCore:

Test: fullscreen/video-controls-drag.html

The !important rules in fullscreenQuickTime.css are overriding the styles added by the
drag operation in MediaControlElements.cpp.  Give the panel a dragged class in setPosition
(clearing it in resetPosition) that allows the !important rules to apply only when the
panel is not dragged.

* css/fullscreenQuickTime.css:
(video:-webkit-full-screen::-webkit-media-controls-panel):
(video:-webkit-full-screen::-webkit-media-controls-panel:not(.dragged)):
* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::setPosition):
(WebCore::MediaControlPanelElement::resetPosition):

LayoutTests:

* fullscreen/video-controls-drag-expected.txt: Added.
* fullscreen/video-controls-drag.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/fullscreenQuickTime.css
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp


Added Paths

trunk/LayoutTests/fullscreen/video-controls-drag-expected.txt
trunk/LayoutTests/fullscreen/video-controls-drag.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104300 => 104301)

--- trunk/LayoutTests/ChangeLog	2012-01-06 18:06:50 UTC (rev 104300)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 18:28:43 UTC (rev 104301)
@@ -1,3 +1,13 @@
+2012-01-05  Jer Noble  jer.no...@apple.com
+
+REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally
+https://bugs.webkit.org/show_bug.cgi?id=75200
+
+Reviewed by Eric Carlson.
+
+* fullscreen/video-controls-drag-expected.txt: Added.
+* fullscreen/video-controls-drag.html: Added.
+
 2012-01-06  Stephen White  senorbla...@chromium.org
 
 [Chromium] Remove fast/files/domurl-script-execution-context-crash.html


Added: trunk/LayoutTests/fullscreen/video-controls-drag-expected.txt (0 => 104301)

--- trunk/LayoutTests/fullscreen/video-controls-drag-expected.txt	(rev 0)
+++ trunk/LayoutTests/fullscreen/video-controls-drag-expected.txt	2012-01-06 18:28:43 UTC (rev 104301)
@@ -0,0 +1,7 @@
+This tests that the video element's controls are draggable in full screen. Press any key to continue.
+
+EVENT(webkitfullscreenchange)
+EXPECTED (endBox.left - startBox.left == '15') OK
+EXPECTED (endBox.top - startBox.top == '15') OK
+END OF TEST
+


Added: trunk/LayoutTests/fullscreen/video-controls-drag.html (0 => 104301)

--- trunk/LayoutTests/fullscreen/video-controls-drag.html	(rev 0)
+++ trunk/LayoutTests/fullscreen/video-controls-drag.html	2012-01-06 18:28:43 UTC (rev 104301)
@@ -0,0 +1,41 @@
+body
+pThis tests that the video element's controls are draggable in full screen.  Press any key to continue./p
+video id=video width=300 controls/video
+script src=""
+script src=""
+script
+var video = document.getElementById('video');
+var shadowRoot;
+var panel;
+var startBox;
+var endBox;
+
+var fullscreenChanged = function(event)
+{
+if (callback)
+callback(event)
+};
+waitForEvent(document, 'webkitfullscreenchange', function() {
+if (window.internals) {
+panel = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-panel');
+startBox = internals.boundingBox(panel);
+
+eventSender.mouseMoveTo(startBox.left + 5, startBox.top + 5);
+eventSender.mouseDown();
+
+eventSender.mouseMoveTo(startBox.left + 20, startBox.top + 20);
+eventSender.mouseUp();
+
+endBox = internals.boundingBox(panel);
+
+testExpected(endBox.left - startBox.left, 15);
+testExpected(endBox.top - startBox.top, 15);
+endTest();
+}
+else
+logResult(false, window.internals == undefined);
+});
+
+runWithKeyDown(function(){video.webkitRequestFullScreen()});
+/script
+/body


Modified: trunk/Source/WebCore/ChangeLog (104300 => 104301)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 18:06:50 UTC (rev 104300)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 18:28:43 UTC (rev 104301)
@@ -1,3 +1,24 @@
+2012-01-05  Jer Noble  jer.no...@apple.com
+
+REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally
+https://bugs.webkit.org/show_bug.cgi?id=75200
+
+Reviewed by Eric Carlson.
+
+Test: fullscreen/video-controls-drag.html
+
+The !important rules in fullscreenQuickTime.css are overriding the styles added by the 
+drag operation in MediaControlElements.cpp.  Give 

[webkit-changes] [104302] trunk/LayoutTests

2012-01-06 Thread jer . noble
Title: [104302] trunk/LayoutTests








Revision 104302
Author jer.no...@apple.com
Date 2012-01-06 11:03:04 -0800 (Fri, 06 Jan 2012)


Log Message
Add new (failing) test to Chromium test_expectations.  Fix tracked by
https://bugs.webkit.org/show_bug.cgi?id=75716

Unreviewed; test expectations update.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104301 => 104302)

--- trunk/LayoutTests/ChangeLog	2012-01-06 18:28:43 UTC (rev 104301)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 19:03:04 UTC (rev 104302)
@@ -1,3 +1,12 @@
+2012-01-06  Jer Noble  jer.no...@apple.com
+
+Add new (failing) test to Chromium test_expectations.  Fix tracked by
+https://bugs.webkit.org/show_bug.cgi?id=75716
+
+Unreviewed; test expectations update.
+
+* platform/chromium/test_expectations.txt:
+
 2012-01-05  Jer Noble  jer.no...@apple.com
 
 REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104301 => 104302)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 18:28:43 UTC (rev 104301)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 19:03:04 UTC (rev 104302)
@@ -3879,3 +3879,5 @@
 BUGWK75505 : media/media-document-audio-repaint.html = IMAGE
 
 BUGWK75696 MAC LINUX DEBUG: svg/text/text-style-recalc-crash.html = PASS TIMEOUT
+
+BUGWK75716 : fullscreen/video-controls-drag.html = TEXT






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


[webkit-changes] [104303] trunk

2012-01-06 Thread jer . noble
Title: [104303] trunk








Revision 104303
Author jer.no...@apple.com
Date 2012-01-06 11:13:02 -0800 (Fri, 06 Jan 2012)


Log Message
Media Element: scrubbing in full-screen mode breaks playback.
https://bugs.webkit.org/show_bug.cgi?id=75650

Reviewed by John Sullivan.

Source/WebCore:

Test: fullscreen/video-controls-timeline.html

Only begin scrubbing if the panel itself is the mousedown event target.

* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlPanelElement::defaultEventHandler):

LayoutTests:

* fullscreen/video-controls-timeline-expected.txt: Added.
* fullscreen/video-controls-timeline.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/shadow/MediaControlElements.cpp


Added Paths

trunk/LayoutTests/fullscreen/video-controls-timeline-expected.txt
trunk/LayoutTests/fullscreen/video-controls-timeline.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104302 => 104303)

--- trunk/LayoutTests/ChangeLog	2012-01-06 19:03:04 UTC (rev 104302)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 19:13:02 UTC (rev 104303)
@@ -1,3 +1,13 @@
+2012-01-05  Jer Noble  jer.no...@apple.com
+
+Media Element: scrubbing in full-screen mode breaks playback.
+https://bugs.webkit.org/show_bug.cgi?id=75650
+
+Reviewed by John Sullivan.
+
+* fullscreen/video-controls-timeline-expected.txt: Added.
+* fullscreen/video-controls-timeline.html: Added.
+
 2012-01-06  Jer Noble  jer.no...@apple.com
 
 Add new (failing) test to Chromium test_expectations.  Fix tracked by


Added: trunk/LayoutTests/fullscreen/video-controls-timeline-expected.txt (0 => 104303)

--- trunk/LayoutTests/fullscreen/video-controls-timeline-expected.txt	(rev 0)
+++ trunk/LayoutTests/fullscreen/video-controls-timeline-expected.txt	2012-01-06 19:13:02 UTC (rev 104303)
@@ -0,0 +1,8 @@
+This tests that the video element's timeline controls are draggable in full screen. Press any key to continue.
+
+EVENT(canplaythrough)
+EVENT(webkitfullscreenchange)
+EVENT(mousedown)
+EVENT(mouseup)
+END OF TEST
+


Added: trunk/LayoutTests/fullscreen/video-controls-timeline.html (0 => 104303)

--- trunk/LayoutTests/fullscreen/video-controls-timeline.html	(rev 0)
+++ trunk/LayoutTests/fullscreen/video-controls-timeline.html	2012-01-06 19:13:02 UTC (rev 104303)
@@ -0,0 +1,34 @@
+body
+pThis tests that the video element's timeline controls are draggable in full screen.  Press any key to continue./p
+video id=video width=300 controls/video
+script src=""
+script src=""
+script src=""
+script
+var video = document.getElementById('video');
+var timeline;
+
+waitForEvent(document, 'webkitfullscreenchange', function() {
+if (window.internals) {
+timeline = mediaControlsElement(internals.shadowRoot(video).firstChild, '-webkit-media-controls-timeline');
+var box = internals.boundingBox(timeline);
+
+eventSender.mouseMoveTo(box.left + 5, box.top + 5);
+
+waitForEvent(timeline, 'mousedown');
+eventSender.mouseDown();
+
+waitForEventAndEnd(timeline, 'mouseup');
+eventSender.mouseUp();
+}
+else
+logResult(false, window.internals == undefined);
+});
+
+waitForEvent(video, 'canplaythrough', function() {
+runWithKeyDown(function(){video.webkitRequestFullScreen()});
+});
+
+video.src = "" '../media/content/test');
+/script
+/body


Modified: trunk/Source/WebCore/ChangeLog (104302 => 104303)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 19:03:04 UTC (rev 104302)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 19:13:02 UTC (rev 104303)
@@ -1,5 +1,19 @@
 2012-01-05  Jer Noble  jer.no...@apple.com
 
+Media Element: scrubbing in full-screen mode breaks playback.
+https://bugs.webkit.org/show_bug.cgi?id=75650
+
+Reviewed by John Sullivan.
+
+Test: fullscreen/video-controls-timeline.html
+
+Only begin scrubbing if the panel itself is the mousedown event target.
+
+* html/shadow/MediaControlElements.cpp:
+(WebCore::MediaControlPanelElement::defaultEventHandler):
+
+2012-01-05  Jer Noble  jer.no...@apple.com
+
 REGRESSION (r90797): Full screen video HUD cannot be dragged horizontally
 https://bugs.webkit.org/show_bug.cgi?id=75200
 


Modified: trunk/Source/WebCore/html/shadow/MediaControlElements.cpp (104302 => 104303)

--- trunk/Source/WebCore/html/shadow/MediaControlElements.cpp	2012-01-06 19:03:04 UTC (rev 104302)
+++ trunk/Source/WebCore/html/shadow/MediaControlElements.cpp	2012-01-06 19:13:02 UTC (rev 104303)
@@ -236,12 +236,12 @@
 
 if (event-isMouseEvent()) {
 LayoutPoint location = static_castMouseEvent*(event)-absoluteLocation();
-if (event-type() == eventNames().mousedownEvent) {

[webkit-changes] [104305] trunk/LayoutTests

2012-01-06 Thread jonlee
Title: [104305] trunk/LayoutTests








Revision 104305
Author jon...@apple.com
Date 2012-01-06 11:30:16 -0800 (Fri, 06 Jan 2012)


Log Message
Update test expectations with rebaseline of fast/forms/listbox-clip.html from r104299.

Unreviewed.

* platform/mac/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/mac/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104304 => 104305)

--- trunk/LayoutTests/ChangeLog	2012-01-06 19:21:41 UTC (rev 104304)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 19:30:16 UTC (rev 104305)
@@ -1,3 +1,11 @@
+2012-01-06  Jon Lee  jon...@apple.com
+
+Update test expectations with rebaseline of fast/forms/listbox-clip.html from r104299.
+
+Unreviewed.
+
+* platform/mac/test_expectations.txt:
+
 2012-01-05  Jer Noble  jer.no...@apple.com
 
 Media Element: scrubbing in full-screen mode breaks playback.


Modified: trunk/LayoutTests/platform/mac/test_expectations.txt (104304 => 104305)

--- trunk/LayoutTests/platform/mac/test_expectations.txt	2012-01-06 19:21:41 UTC (rev 104304)
+++ trunk/LayoutTests/platform/mac/test_expectations.txt	2012-01-06 19:30:16 UTC (rev 104305)
@@ -25,9 +25,6 @@
 BUGWK58192 : fast/frames/flattening/iframe-flattening-offscreen.html = TEXT PASS
 BUGWK58192 : svg/dom/SVGScriptElement/script-set-href.svg = TEXT PASS
 
-// Need rebaseline
-BUGWK70765 : fast/forms/listbox-clip.html = TEXT
-
 BUGWK67007 DEBUG : fast/ruby/after-block-doesnt-crash.html = CRASH
 BUGWK67007 DEBUG : fast/ruby/after-table-doesnt-crash.html = CRASH
 BUGWK67007 DEBUG : fast/ruby/generated-after-counter-doesnt-crash.html = CRASH






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


[webkit-changes] [104306] trunk

2012-01-06 Thread jer . noble
Title: [104306] trunk








Revision 104306
Author jer.no...@apple.com
Date 2012-01-06 11:38:46 -0800 (Fri, 06 Jan 2012)


Log Message
Fullscreen video controller can't be dragged the first time I enter fullscreen
https://bugs.webkit.org/show_bug.cgi?id=75709

Reviewed by Eric Carlson.

Source/WebCore:

No new tests; updated video-controls-drag.html.

When the media controls are created, check to see if we are full screen, and pass
that information to the newly created controls.

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

LayoutTests:

Update the test to cover the case where the controls do not yet exist when entering
fullscreen.

* fullscreen/video-controls-drag.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fullscreen/video-controls-drag.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp




Diff

Modified: trunk/LayoutTests/ChangeLog (104305 => 104306)

--- trunk/LayoutTests/ChangeLog	2012-01-06 19:30:16 UTC (rev 104305)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 19:38:46 UTC (rev 104306)
@@ -1,3 +1,15 @@
+2012-01-06  Jer Noble  jer.no...@apple.com
+
+Fullscreen video controller can't be dragged the first time I enter fullscreen
+https://bugs.webkit.org/show_bug.cgi?id=75709
+
+Reviewed by Eric Carlson.
+
+Update the test to cover the case where the controls do not yet exist when entering
+fullscreen.
+
+* fullscreen/video-controls-drag.html:
+
 2012-01-06  Jon Lee  jon...@apple.com
 
 Update test expectations with rebaseline of fast/forms/listbox-clip.html from r104299.


Modified: trunk/LayoutTests/fullscreen/video-controls-drag.html (104305 => 104306)

--- trunk/LayoutTests/fullscreen/video-controls-drag.html	2012-01-06 19:30:16 UTC (rev 104305)
+++ trunk/LayoutTests/fullscreen/video-controls-drag.html	2012-01-06 19:38:46 UTC (rev 104306)
@@ -1,6 +1,6 @@
 body
 pThis tests that the video element's controls are draggable in full screen.  Press any key to continue./p
-video id=video width=300 controls/video
+video id=video width=300/video
 script src=""
 script src=""
 script


Modified: trunk/Source/WebCore/ChangeLog (104305 => 104306)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 19:30:16 UTC (rev 104305)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 19:38:46 UTC (rev 104306)
@@ -1,3 +1,18 @@
+2012-01-06  Jer Noble  jer.no...@apple.com
+
+Fullscreen video controller can't be dragged the first time I enter fullscreen
+https://bugs.webkit.org/show_bug.cgi?id=75709
+
+Reviewed by Eric Carlson.
+
+No new tests; updated video-controls-drag.html.
+
+When the media controls are created, check to see if we are full screen, and pass
+that information to the newly created controls.
+
+* html/HTMLMediaElement.cpp:
+(WebCore::HTMLMediaElement::createMediaControls):
+
 2012-01-05  Jer Noble  jer.no...@apple.com
 
 Media Element: scrubbing in full-screen mode breaks playback.


Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (104305 => 104306)

--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-01-06 19:30:16 UTC (rev 104305)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2012-01-06 19:38:46 UTC (rev 104306)
@@ -3484,6 +3484,8 @@
 
 controls-setMediaController(m_mediaController ? m_mediaController.get() : static_castMediaControllerInterface*(this));
 controls-reset();
+if (isFullscreen())
+controls-enteredFullscreen();
 
 ensureShadowRoot()-appendChild(controls, ec);
 return true;






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


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

2012-01-06 Thread benjamin
Title: [104307] trunk/Source/WebKit








Revision 104307
Author benja...@webkit.org
Date 2012-01-06 11:47:02 -0800 (Fri, 06 Jan 2012)


Log Message
[Mac] Sort the resources of WebKit.xcodeproj
https://bugs.webkit.org/show_bug.cgi?id=75634

Patch by Benjamin Poulain bpoul...@apple.com on 2012-01-06
Reviewed by Andreas Kling.

* WebKit.xcodeproj/project.pbxproj:

Modified Paths

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




Diff

Modified: trunk/Source/WebKit/ChangeLog (104306 => 104307)

--- trunk/Source/WebKit/ChangeLog	2012-01-06 19:38:46 UTC (rev 104306)
+++ trunk/Source/WebKit/ChangeLog	2012-01-06 19:47:02 UTC (rev 104307)
@@ -1,3 +1,12 @@
+2012-01-06  Benjamin Poulain  bpoul...@apple.com
+
+[Mac] Sort the resources of WebKit.xcodeproj
+https://bugs.webkit.org/show_bug.cgi?id=75634
+
+Reviewed by Andreas Kling.
+
+* WebKit.xcodeproj/project.pbxproj:
+
 2012-01-06  Jacky Jiang  zhaji...@rim.com
 
 [BlackBerry] Upstream BlackBerry WebCoreSupport cache client


Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (104306 => 104307)

--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2012-01-06 19:38:46 UTC (rev 104306)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj	2012-01-06 19:47:02 UTC (rev 104307)
@@ -771,6 +771,7 @@
 			files = (
 939811290824BF01008DF038 /* Carbon.framework in Frameworks */,
 9398112A0824BF01008DF038 /* Cocoa.framework in Frameworks */,
+5D4DE0991479CBDF00EA3DF4 /* DiskArbitration.framework in Frameworks */,
 CD8EAC7311CAC9A300774075 /* IOKit.framework in Frameworks */,
 9398112B0824BF01008DF038 /* _javascript_Core.framework in Frameworks */,
 9398112E0824BF01008DF038 /* libicucore.dylib in Frameworks */,
@@ -778,7 +779,6 @@
 1A20D08B0ED384F20043FA9F /* QuartzCore.framework in Frameworks */,
 9398112F0824BF01008DF038 /* Security.framework in Frameworks */,
 9398112C0824BF01008DF038 /* WebCore.framework in Frameworks */,
-5D4DE0991479CBDF00EA3DF4 /* DiskArbitration.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -901,9 +901,9 @@
 			children = (
 5D7BF8120C2A1D90008CE06D /* WebInspector.h */,
 5D7BF8130C2A1D90008CE06D /* WebInspector.mm */,
-7A8FF0D01075024A00A80A08 /* WebInspectorPrivate.h */,
 B804176D1217A83100466BAE /* WebInspectorFrontend.h */,
 B804176E1217A83100466BAE /* WebInspectorFrontend.mm */,
+7A8FF0D01075024A00A80A08 /* WebInspectorPrivate.h */,
 1C68F663095B5FC100C2984E /* WebNodeHighlight.h */,
 1C68F664095B5FC100C2984E /* WebNodeHighlight.mm */,
 A5687BD8135B791A0074CBCB /* WebNodeHighlighter.h */,
@@ -935,9 +935,9 @@
 		254DC334016E1D3F0ECA149E /* Misc */ = {
 			isa = PBXGroup;
 			children = (
-29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
 A864B3E5123ED83D00C2A612 /* MailQuirksUserScript.js */,
 1CCFFD120B1F81F2002EE926 /* OldWebAssertions.c */,
+29AEF95D134C755400FE5096 /* OutlookQuirksUserScript.js */,
 5DE92FEE0BD7017E0059A5FD /* WebAssertions.h */,
 5241ADF30B1BC48A004012BD /* WebCache.h */,
 5241ADF40B1BC48A004012BD /* WebCache.mm */,
@@ -1062,8 +1062,8 @@
 511F3FD30CECC88F00852565 /* WebDatabaseTrackerClient.h */,
 511F3FD40CECC88F00852565 /* WebDatabaseTrackerClient.mm */,
 3AB02AF512C1319B00FBB694 /* WebStorageManager.mm */,
+3AE15D4F12DBDED4009323C8 /* WebStorageManagerInternal.h */,
 3AB02AFF12C132B200FBB694 /* WebStorageManagerPrivate.h */,
-3AE15D4F12DBDED4009323C8 /* WebStorageManagerInternal.h */,
 3ABB3C781309C3B500E93D94 /* WebStorageTrackerClient.h */,
 3ABB3C791309C3B500E93D94 /* WebStorageTrackerClient.mm */,
 			);
@@ -1168,13 +1168,13 @@
 39446072020F50ED0ECA1767 /* WebDataSourcePrivate.h */,
 BC542C400FD7766F00D8AB5D /* WebDelegateImplementationCaching.h */,
 BC542C410FD7766F00D8AB5D /* WebDelegateImplementationCaching.mm */,
+598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */,
+598AD9211201CF1000ABAE4E /* WebDeviceOrientation.mm */,
+598AD9231201CF1900ABAE4E /* WebDeviceOrientationInternal.h */,
 598ADA451202275000ABAE4E /* WebDeviceOrientationProvider.h */,
+598AD9251201CF2500ABAE4E /* WebDeviceOrientationProviderMock.h */,
+598AD9271201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm */,
 598AD9291201CF3B00ABAE4E /* WebDeviceOrientationProviderMockInternal.h */,
-598AD9271201CF3200ABAE4E /* WebDeviceOrientationProviderMock.mm */,
-598AD9251201CF2500ABAE4E /* WebDeviceOrientationProviderMock.h */,
-598AD9231201CF1900ABAE4E /* WebDeviceOrientationInternal.h */,
-598AD9211201CF1000ABAE4E /* WebDeviceOrientation.mm */,
-598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */,
 35081DAE02B6D4F50ACA2ACA /* WebDocument.h */,
 ED21B9810528F7AA003299AC /* WebDocumentInternal.h */,
 65FFB7FA0AD0B7D30048CD05 /* WebDocumentLoaderMac.h */,
@@ -1285,8 +1285,6 @@
 			children = (
 

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

2012-01-06 Thread commit-queue
Title: [104308] trunk/Source/WebCore








Revision 104308
Author commit-qu...@webkit.org
Date 2012-01-06 11:51:19 -0800 (Fri, 06 Jan 2012)


Log Message
Use VectorMath lib when possible to optimize the processing in WebAudio AudioBus
https://bugs.webkit.org/show_bug.cgi?id=75334

Patch by Wei James james@intel.com on 2012-01-06
Reviewed by Kenneth Russell.

* platform/audio/AudioBus.cpp:
(WebCore::AudioBus::processWithGainFromMonoStereo):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/audio/AudioBus.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (104307 => 104308)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 19:47:02 UTC (rev 104307)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 19:51:19 UTC (rev 104308)
@@ -1,3 +1,13 @@
+2012-01-06  Wei James  james@intel.com
+
+Use VectorMath lib when possible to optimize the processing in WebAudio AudioBus
+https://bugs.webkit.org/show_bug.cgi?id=75334
+
+Reviewed by Kenneth Russell.
+
+* platform/audio/AudioBus.cpp:
+(WebCore::AudioBus::processWithGainFromMonoStereo):
+
 2012-01-06  Jer Noble  jer.no...@apple.com
 
 Fullscreen video controller can't be dragged the first time I enter fullscreen


Modified: trunk/Source/WebCore/platform/audio/AudioBus.cpp (104307 => 104308)

--- trunk/Source/WebCore/platform/audio/AudioBus.cpp	2012-01-06 19:47:02 UTC (rev 104307)
+++ trunk/Source/WebCore/platform/audio/AudioBus.cpp	2012-01-06 19:51:19 UTC (rev 104308)
@@ -244,8 +244,7 @@
 GAIN_DEZIPPER \
 } \
 gain = totalDesiredGain; \
-for (; k  framesToProcess; ++k)  \
-OP
+OP##_V 
 
 #define STEREO_SUM \
 { \
@@ -255,6 +254,11 @@
 *destinationR++ = sumR; \
 }
 
+// FIXME: this can be optimized with additional VectorMath functions. 
+#define STEREO_SUM_V \
+for (; k  framesToProcess; ++k) \
+STEREO_SUM
+
 // Mono - stereo (mix equally into L and R)
 // FIXME: Really we should apply an equal-power scaling factor here, since we're effectively panning center...
 #define MONO2STEREO_SUM \
@@ -266,12 +270,20 @@
 *destinationR++ = sumR; \
 }
 
+#define MONO2STEREO_SUM_V \
+for (; k  framesToProcess; ++k) \
+MONO2STEREO_SUM 
+
 #define MONO_SUM \
 { \
 float sum = DenormalDisabler::flushDenormalFloatToZero(*destinationL + gain * *sourceL++); \
 *destinationL++ = sum; \
 }
 
+#define MONO_SUM_V \
+for (; k  framesToProcess; ++k) \
+MONO_SUM
+
 #define STEREO_NO_SUM \
 { \
 float sampleL = *sourceL++; \
@@ -280,6 +292,12 @@
 *destinationR++ = DenormalDisabler::flushDenormalFloatToZero(gain * sampleR); \
 }
 
+#define STEREO_NO_SUM_V \
+{ \
+vsmul(sourceL, 1, gain, destinationL, 1, framesToProcess - k); \
+vsmul(sourceR, 1, gain, destinationR, 1, framesToProcess - k); \
+}
+
 // Mono - stereo (mix equally into L and R)
 // FIXME: Really we should apply an equal-power scaling factor here, since we're effectively panning center...
 #define MONO2STEREO_NO_SUM \
@@ -289,18 +307,28 @@
 *destinationR++ = DenormalDisabler::flushDenormalFloatToZero(gain * sample); \
 }
 
+#define MONO2STEREO_NO_SUM_V \
+{ \
+vsmul(sourceL, 1, gain, destinationL, 1, framesToProcess - k); \
+vsmul(sourceL, 1, gain, destinationR, 1, framesToProcess - k); \
+}
+
 #define MONO_NO_SUM \
 { \
 float sampleL = *sourceL++; \
 *destinationL++ = DenormalDisabler::flushDenormalFloatToZero(gain * sampleL); \
 }
 
+#define MONO_NO_SUM_V \
+{ \
+vsmul(sourceL, 1, gain, destinationL, 1, framesToProcess - k); \
+} 
+
 void AudioBus::processWithGainFromMonoStereo(const AudioBus sourceBus, double* lastMixGain, double targetGain, bool sumToBus)
 {
 // We don't want to suddenly change the gain from mixing one time slice to the next,
 // so we de-zipper by slowly changing the gain each sample-frame until we've achieved the target gain.
 
-// FIXME: optimize this method (SSE, etc.)
 // FIXME: targetGain and lastMixGain should be changed to floats instead of doubles.
 
 // Take master bus gain into account as well as the targetGain.
@@ -351,8 +379,6 @@
 if (this == sourceBus  *lastMixGain == targetGain  targetGain == 1.0)
 return;
 
-// FIXME: if (framesToDezipper == 0) and DenormalDisabler::flushDenormalFloatToZero() is a NOP (gcc vs. Visual Studio) 
-// then we can further optimize the PROCESS_WITH_GAIN codepaths below using vsmul().
 if (sourceR  destinationR) {
 // Stereo
 PROCESS_WITH_GAIN(STEREO_NO_SUM)






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


[webkit-changes] [104310] branches/chromium/963

2012-01-06 Thread dgrogan
Title: [104310] branches/chromium/963








Revision 104310
Author dgro...@chromium.org
Date 2012-01-06 11:53:50 -0800 (Fri, 06 Jan 2012)


Log Message
Merge 104252 - Source/WebCore: IndexedDB: fix cursor prefetch crash
http://crbug.com/108071
https://bugs.webkit.org/show_bug.cgi?id=75596

Reviewed by Tony Chang.

Test: storage/indexeddb/prefetch-bugfix-108071.html
Note: DumpRenderTree doesn't exercise the bug, it only occurs in
multi-process chromium.  The layout test will soon be run as a
chromium ui test: http://codereview.chromium.org/9108004

* storage/IDBCursorBackendImpl.cpp:
(WebCore::IDBCursorBackendImpl::IDBCursorBackendImpl):
(WebCore::IDBCursorBackendImpl::~IDBCursorBackendImpl): Destroy
cursors before their objectstores.
(WebCore::IDBCursorBackendImpl::prefetchReset): Don't run continue if
the cursor is closed.
(WebCore::IDBCursorBackendImpl::close): Set a closed flag.
* storage/IDBCursorBackendImpl.h:

LayoutTests: IndexedDB: fix cursor prefetch crash
https://bugs.webkit.org/show_bug.cgi?id=75596

Reviewed by Tony Chang.

* storage/indexeddb/prefetch-bugfix-108071-expected.txt: Added.
* storage/indexeddb/prefetch-bugfix-108071.html: Added.


TBR=dgro...@chromium.org
Review URL: http://codereview.chromium.org/9121008

Modified Paths

branches/chromium/963/Source/WebCore/storage/IDBCursorBackendImpl.cpp
branches/chromium/963/Source/WebCore/storage/IDBCursorBackendImpl.h


Added Paths

branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071-expected.txt
branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071.html




Diff

Copied: branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071-expected.txt (from rev 104252, trunk/LayoutTests/storage/indexeddb/prefetch-bugfix-108071-expected.txt) (0 => 104310)

--- branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071-expected.txt	(rev 0)
+++ branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071-expected.txt	2012-01-06 19:53:50 UTC (rev 104310)
@@ -0,0 +1,54 @@
+Test for crbug.com/108071
+
+On success, you will see a series of PASS messages, followed by TEST COMPLETE.
+
+
+indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;
+PASS indexedDB == null is false
+indexedDB.deleteDatabase(DBNAME)
+indexedDB.open(DBNAME)
+db = event.target.result
+db.setVersion('new version')
+setVersionSuccess():
+trans = event.target.result
+PASS trans !== null is true
+objectStore = db.createObjectStore('store', {keyPath: 'id'})
+
+resetObjectStore():
+objectStore.clear()
+objectStore.add({id: 0, name: Alpha})
+objectStore.add({id: 1, name: Bravo})
+objectStore.add({id: 2, name: Charlie})
+objectStore.add({id: 3, name: Delta})
+objectStore.add({id: 4, name: Echo})
+
+iterateAndDeleteFirstElement():
+trans = db.transaction(['store'], webkitIDBTransaction.READ_WRITE)
+trans.objectStore('store').openCursor()
+0: Alpha
+trans.objectStore('store').delete(0)
+1: Bravo
+2: Charlie
+3: Delta
+4: Echo
+
+resetObjectStore():
+objectStore.clear()
+objectStore.add({id: 0, name: Alpha})
+objectStore.add({id: 1, name: Bravo})
+objectStore.add({id: 2, name: Charlie})
+objectStore.add({id: 3, name: Delta})
+objectStore.add({id: 4, name: Echo})
+
+prefetchAndAbort():
+trans.objectStore('store').openCursor()
+0: Alpha
+1: Bravo
+2: Charlie
+3: Delta
+trans.abort()
+PASS Transaction aborted as expected
+PASS successfullyParsed is true
+
+TEST COMPLETE
+


Copied: branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071.html (from rev 104252, trunk/LayoutTests/storage/indexeddb/prefetch-bugfix-108071.html) (0 => 104310)

--- branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071.html	(rev 0)
+++ branches/chromium/963/LayoutTests/storage/indexeddb/prefetch-bugfix-108071.html	2012-01-06 19:53:50 UTC (rev 104310)
@@ -0,0 +1,130 @@
+html
+head
+script src=""
+script src=""
+/head
+body
+p id=description/p
+div id=console/div
+script
+
+description(Test for crbug.com/108071);
+
+// Have to be at least 5 here: 1 initial, 3 continues to trigger prefetch and 1
+// post-abort outstanding continue.
+var names = ['Alpha', 'Bravo', 'Charlie', 'Delta', 'Echo'];
+
+function test()
+{
+indexedDB = evalAndLog(indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB;);
+shouldBeFalse(indexedDB == null);
+DBNAME = 'prefetch-bugfix-108071';
+request = evalAndLog(indexedDB.deleteDatabase(DBNAME));
+request._onerror_ = unexpectedErrorCallback;
+request._onblocked_ = unexpectedBlockedCallback;
+request._onsuccess_ = function (e) {
+request = evalAndLog(indexedDB.open(DBNAME));
+request._onsuccess_ = openSuccess;
+request._onerror_ = unexpectedErrorCallback;
+};
+}
+
+function openSuccess()
+{
+var db = evalAndLog(db = event.target.result);
+
+request = evalAndLog(db.setVersion('new version'));
+request._onsuccess_ = 

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

2012-01-06 Thread andersca
Title: [104312] trunk/Source/WebCore








Revision 104312
Author ander...@apple.com
Date 2012-01-06 12:01:55 -0800 (Fri, 06 Jan 2012)


Log Message
Add ScrollElasticityControllerClient::immediateScrollBy
https://bugs.webkit.org/show_bug.cgi?id=75720

Reviewed by Andreas Kling.

Add a new ScrollElasticityControllerClient::immediateScrollBy client member function.
Also, make ScrollAnimatorMac::smoothScrollWithEvent calls go through the ScrollElasticityController
in preparation for moving that function to ScrollElasticityController.

* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
* platform/mac/ScrollElasticityController.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
trunk/Source/WebCore/platform/mac/ScrollElasticityController.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104311 => 104312)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 20:00:06 UTC (rev 104311)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 20:01:55 UTC (rev 104312)
@@ -1,3 +1,19 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Add ScrollElasticityControllerClient::immediateScrollBy
+https://bugs.webkit.org/show_bug.cgi?id=75720
+
+Reviewed by Andreas Kling.
+
+Add a new ScrollElasticityControllerClient::immediateScrollBy client member function.
+Also, make ScrollAnimatorMac::smoothScrollWithEvent calls go through the ScrollElasticityController
+in preparation for moving that function to ScrollElasticityController.
+
+* platform/mac/ScrollAnimatorMac.h:
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
+* platform/mac/ScrollElasticityController.h:
+
 2012-01-06  Wei James  james@intel.com
 
 Use VectorMath lib when possible to optimize the processing in WebAudio AudioBus


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (104311 => 104312)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 20:00:06 UTC (rev 104311)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 20:01:55 UTC (rev 104312)
@@ -123,13 +123,13 @@
 FloatPoint adjustScrollPositionIfNecessary(const FloatPoint) const;
 
 void immediateScrollTo(const FloatPoint);
-void immediateScrollBy(const FloatSize);
 
 #if ENABLE(RUBBER_BANDING)
 /// ScrollElasticityControllerClient member functions.
 virtual IntSize stretchAmount() OVERRIDE;
 virtual bool pinnedInDirection(const FloatSize) OVERRIDE;
 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize) OVERRIDE;
+virtual void immediateScrollBy(const FloatSize) OVERRIDE;
 virtual void startSnapRubberbandTimer() OVERRIDE;
 virtual void stopSnapRubberbandTimer() OVERRIDE;
 


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104311 => 104312)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 20:00:06 UTC (rev 104311)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 20:01:55 UTC (rev 104312)
@@ -1144,7 +1144,7 @@
 bool isHorizontallyStretched = false;
 bool shouldStretch = false;
 
-IntSize stretchAmount = m_scrollableArea-overhangAmount();
+IntSize stretchAmount = m_scrollElasticityController.m_client-stretchAmount();
 
 isHorizontallyStretched = stretchAmount.width();
 isVerticallyStretched = stretchAmount.height();
@@ -1207,11 +1207,11 @@
 if (!(shouldStretch || isVerticallyStretched || isHorizontallyStretched)) {
 if (deltaY != 0) {
 deltaY *= scrollWheelMultiplier();
-immediateScrollBy(FloatSize(0, deltaY));
+m_scrollElasticityController.m_client-immediateScrollBy(FloatSize(0, deltaY));
 }
 if (deltaX != 0) {
 deltaX *= scrollWheelMultiplier();
-immediateScrollBy(FloatSize(deltaX, 0));
+m_scrollElasticityController.m_client-immediateScrollBy(FloatSize(deltaX, 0));
 }
 } else {
 if (!allowsHorizontalStretching()) {
@@ -1220,7 +1220,7 @@
 } else if ((deltaX != 0)  !isHorizontallyStretched  !pinnedInDirection(deltaX, 0)) {
 deltaX *= scrollWheelMultiplier();
 
-immediateScrollByWithoutContentEdgeConstraints(FloatSize(deltaX, 0));
+m_scrollElasticityController.m_client-immediateScrollByWithoutContentEdgeConstraints(FloatSize(deltaX, 0));
 deltaX = 0;
 }
 
@@ -1230,11 +1230,11 @@
 } else if ((deltaY != 0)  !isVerticallyStretched  !pinnedInDirection(0, deltaY)) {
 deltaY *= scrollWheelMultiplier();
 
-immediateScrollByWithoutContentEdgeConstraints(FloatSize(0, deltaY));
+

[webkit-changes] [104313] trunk

2012-01-06 Thread tony
Title: [104313] trunk








Revision 104313
Author t...@chromium.org
Date 2012-01-06 12:05:06 -0800 (Fri, 06 Jan 2012)


Log Message
Need to relayout when stretching the height of a flex item
https://bugs.webkit.org/show_bug.cgi?id=75661

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/flexbox/flex-align-stretch.html

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::computePreferredMainAxisExtent): Always clear the override size since
it may be set when aligning.
(WebCore::RenderFlexibleBox::alignChildren): Only relayout if the height changed.

LayoutTests:

* css3/flexbox/flex-align-stretch-expected.txt: Added.
* css3/flexbox/flex-align-stretch.html: Added.

Modified Paths

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


Added Paths

trunk/LayoutTests/css3/flexbox/flex-align-stretch-expected.txt
trunk/LayoutTests/css3/flexbox/flex-align-stretch.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104312 => 104313)

--- trunk/LayoutTests/ChangeLog	2012-01-06 20:01:55 UTC (rev 104312)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 20:05:06 UTC (rev 104313)
@@ -1,3 +1,13 @@
+2012-01-06  Tony Chang  t...@chromium.org
+
+Need to relayout when stretching the height of a flex item
+https://bugs.webkit.org/show_bug.cgi?id=75661
+
+Reviewed by Ojan Vafai.
+
+* css3/flexbox/flex-align-stretch-expected.txt: Added.
+* css3/flexbox/flex-align-stretch.html: Added.
+
 2012-01-06  Dmitry Lomov  dslo...@google.com
 
 Unreviewed: [Chromium] rebaselining IMAGE expectations after http://trac.webkit.org/changeset/104240/


Added: trunk/LayoutTests/css3/flexbox/flex-align-stretch-expected.txt (0 => 104313)

--- trunk/LayoutTests/css3/flexbox/flex-align-stretch-expected.txt	(rev 0)
+++ trunk/LayoutTests/css3/flexbox/flex-align-stretch-expected.txt	2012-01-06 20:05:06 UTC (rev 104313)
@@ -0,0 +1,4 @@
+PASS
+PASS
+PASS
+PASS


Added: trunk/LayoutTests/css3/flexbox/flex-align-stretch.html (0 => 104313)

--- trunk/LayoutTests/css3/flexbox/flex-align-stretch.html	(rev 0)
+++ trunk/LayoutTests/css3/flexbox/flex-align-stretch.html	2012-01-06 20:05:06 UTC (rev 104313)
@@ -0,0 +1,85 @@
+!DOCTYPE html
+html
+style
+body {
+margin: 0;
+}
+.flexbox {
+display: -webkit-flexbox;
+background-color: #aaa;
+position: relative;
+}
+.flexbox div {
+border: 0;
+}
+
+.flexbox  :nth-child(1) {
+background-color: blue;
+}
+.flexbox  :nth-child(2) {
+background-color: green;
+}
+.flexbox  :nth-child(3) {
+background-color: red;
+}
+
+.absolute {
+  position: absolute;
+  width: 50px;
+  height: 50px;
+  background-color: yellow !important;
+}
+/style
+script
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+/script
+script src=""
+body _onload_=checkFlexBoxen()
+div class=flexbox style=width: 600px
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=50 class=absolute style=bottom:0;/div
+  /div
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); height: 100px/div
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=50 class=absolute style=bottom:0;/div
+  /div
+/div
+
+div style=-webkit-writing-mode: horizontal-bt
+div class=flexbox style=width: 600px
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=0 class=absolute style=top:0;/div
+  /div
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); height: 100px/div
+  div data-expected-height=100 style=width: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=50 class=absolute style=bottom:0;/div
+  /div
+/div
+/div
+
+div style=-webkit-writing-mode: vertical-rl
+div class=flexbox style=height: 200px
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=0 class=absolute style=left:0;/div
+  /div
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); width: 100px/div
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=0 class=absolute style=left:0;/div
+  /div
+/div
+/div
+
+div style=-webkit-writing-mode: vertical-lr
+div class=flexbox style=height: 200px
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); position: relative
+div data-offset-x=50 data-offset-y=0 class=absolute style=right:0;/div
+  /div
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); width: 100px/div
+  div data-expected-width=100 style=height: -webkit-flex(1 0 0); position: relative
+div data-offset-x=0 data-offset-y=0 class=absolute style=left:0;/div
+  /div
+/div
+/div
+
+/html


Modified: trunk/Source/WebCore/ChangeLog (104312 => 104313)

--- 

[webkit-changes] [104314] trunk/LayoutTests

2012-01-06 Thread commit-queue
Title: [104314] trunk/LayoutTests








Revision 104314
Author commit-qu...@webkit.org
Date 2012-01-06 12:07:33 -0800 (Fri, 06 Jan 2012)


Log Message
Convert overflow-in-uniform-regions to a reftest
https://bugs.webkit.org/show_bug.cgi?id=74765

Replaced the bitmap version of the test with a reftest version.   Use of text
has been revised a little to mitigate the possibility that small differences in
the platform's default font will change the location of line breaks.

Patch by Hans Muller hmul...@adobe.com on 2012-01-06
Reviewed by Anders Carlsson.

* fast/regions/overflow-in-uniform-regions-expected.html: Added.
* fast/regions/overflow-in-uniform-regions.html:
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/efl/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
* platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/regions/overflow-in-uniform-regions.html


Added Paths

trunk/LayoutTests/fast/regions/overflow-in-uniform-regions-expected.html


Removed Paths

trunk/LayoutTests/platform/efl/fast/regions/overflow-in-uniform-regions-expected.png
trunk/LayoutTests/platform/efl/fast/regions/overflow-in-uniform-regions-expected.txt
trunk/LayoutTests/platform/mac/fast/regions/overflow-in-uniform-regions-expected.png
trunk/LayoutTests/platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104313 => 104314)

--- trunk/LayoutTests/ChangeLog	2012-01-06 20:05:06 UTC (rev 104313)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 20:07:33 UTC (rev 104314)
@@ -1,3 +1,21 @@
+2012-01-06  Hans Muller  hmul...@adobe.com
+
+Convert overflow-in-uniform-regions to a reftest
+https://bugs.webkit.org/show_bug.cgi?id=74765
+
+Replaced the bitmap version of the test with a reftest version.   Use of text 
+has been revised a little to mitigate the possibility that small differences in 
+the platform's default font will change the location of line breaks.
+
+Reviewed by Anders Carlsson.
+
+* fast/regions/overflow-in-uniform-regions-expected.html: Added.
+* fast/regions/overflow-in-uniform-regions.html:
+* platform/efl/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
+* platform/efl/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
+* platform/mac/fast/regions/overflow-in-uniform-regions-expected.png: Removed.
+* platform/mac/fast/regions/overflow-in-uniform-regions-expected.txt: Removed.
+
 2012-01-06  Tony Chang  t...@chromium.org
 
 Need to relayout when stretching the height of a flex item


Added: trunk/LayoutTests/fast/regions/overflow-in-uniform-regions-expected.html (0 => 104314)

--- trunk/LayoutTests/fast/regions/overflow-in-uniform-regions-expected.html	(rev 0)
+++ trunk/LayoutTests/fast/regions/overflow-in-uniform-regions-expected.html	2012-01-06 20:07:33 UTC (rev 104314)
@@ -0,0 +1,95 @@
+!doctype html
+
+ style
+ html {
+ line-height: 18px;
+ }
+
+#content {
+text-align: justify;
+padding: 5px;
+}
+
+#first-box {
+border: 1px solid blue;
+padding:5px;
+}
+
+#second-box {
+border: 1px solid green;
+overflow: hidden;
+}
+
+#content-two {
+text-align: justify;
+padding-left: 5px;
+padding-right: 5px;
+}
+
+#first-box-two {
+border: 1px solid blue;
+padding:5px;
+border-top: none;
+padding-top: 0;
+}
+
+#second-box-two {
+border: 1px solid green;
+height: 85px;
+border-top: none;
+padding-top: 0;
+}
+
+#region1, #region2, #region3 {
+border: 1px solid black;
+}
+
+#region1 {
+width: 400px;
+height: 143px;
+overflow:hidden; 
+}
+
+#region2 {
+width: 400px;
+height: 150px;
+overflow:hidden; 
+}
+
+#region3 {
+width: 400px;
+height: 150px;
+}
+
+.float { width:30px; height:50px; background-color: lime }
+.left { float: left }
+.right { float: right }
+/style
+
+body
+pThe first and last lines of text in the regions below should be clipped to the green box. The overflow
+section sizes itself and clips differently in each region. The green box should be even with the lime floats at the top of the first region./p
+
+div id=container
+div id=region1
+div id=content
+div id=first-box
+div class=float left/div div class=float right/div
+div id=second-box
+pThis is a paragraph that spans more than one line but less than three lines./p
+p1br2br3br
+/div
+ 

[webkit-changes] [104315] trunk/Source

2012-01-06 Thread weinig
Title: [104315] trunk/Source








Revision 104315
Author wei...@apple.com
Date 2012-01-06 12:09:26 -0800 (Fri, 06 Jan 2012)


Log Message
Remove unused OwnFastMallocPtr class.
https://bugs.webkit.org/show_bug.cgi?id=75722

Reviewed by Geoffrey Garen.

../_javascript_Core: 

* GNUmakefile.list.am:
* _javascript_Core.gypi:
* _javascript_Core.vcproj/WTF/WTF.vcproj:
* _javascript_Core.xcodeproj/project.pbxproj:
* wtf/CMakeLists.txt:
* wtf/OwnFastMallocPtr.h: Removed.
* wtf/text/StringImpl.h:
* wtf/wtf.pro:

../_javascript_Glue: 

* ForwardingHeaders/wtf/OwnFastMallocPtr.h: Removed.

../WebCore: 

* ForwardingHeaders/wtf/OwnFastMallocPtr.h: Removed.
* bindings/js/JSWebGLRenderingContextCustom.cpp:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/GNUmakefile.list.am
trunk/Source/_javascript_Core/_javascript_Core.gypi
trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/wtf/CMakeLists.txt
trunk/Source/_javascript_Core/wtf/text/StringImpl.h
trunk/Source/_javascript_Core/wtf/wtf.pro
trunk/Source/_javascript_Glue/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp


Removed Paths

trunk/Source/_javascript_Core/wtf/OwnFastMallocPtr.h
trunk/Source/_javascript_Glue/ForwardingHeaders/wtf/OwnFastMallocPtr.h
trunk/Source/WebCore/ForwardingHeaders/wtf/OwnFastMallocPtr.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104314 => 104315)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:07:33 UTC (rev 104314)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:09:26 UTC (rev 104315)
@@ -1,3 +1,19 @@
+2012-01-06  Sam Weinig  s...@webkit.org
+
+Remove unused OwnFastMallocPtr class.
+https://bugs.webkit.org/show_bug.cgi?id=75722
+
+Reviewed by Geoffrey Garen.
+
+* GNUmakefile.list.am:
+* _javascript_Core.gypi:
+* _javascript_Core.vcproj/WTF/WTF.vcproj:
+* _javascript_Core.xcodeproj/project.pbxproj:
+* wtf/CMakeLists.txt:
+* wtf/OwnFastMallocPtr.h: Removed.
+* wtf/text/StringImpl.h:
+* wtf/wtf.pro:
+
 2012-01-06  Benjamin Poulain  bpoul...@webkit.org
 
 [Mac] Sort the resources of _javascript_Core.xcodeproj and remove duplicates


Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (104314 => 104315)

--- trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-01-06 20:07:33 UTC (rev 104314)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-01-06 20:09:26 UTC (rev 104315)
@@ -607,7 +607,6 @@
 	Source/_javascript_Core/wtf/OSRandomSource.cpp \
 	Source/_javascript_Core/wtf/OSRandomSource.h \
 	Source/_javascript_Core/wtf/OwnArrayPtr.h \
-	Source/_javascript_Core/wtf/OwnFastMallocPtr.h \
 	Source/_javascript_Core/wtf/OwnPtr.h \
 	Source/_javascript_Core/wtf/OwnPtrCommon.h \
 	Source/_javascript_Core/wtf/PackedIntVector.h \


Modified: trunk/Source/_javascript_Core/_javascript_Core.gypi (104314 => 104315)

--- trunk/Source/_javascript_Core/_javascript_Core.gypi	2012-01-06 20:07:33 UTC (rev 104314)
+++ trunk/Source/_javascript_Core/_javascript_Core.gypi	2012-01-06 20:09:26 UTC (rev 104315)
@@ -182,7 +182,6 @@
 'wtf/NullPtr.h',
 'wtf/OSAllocator.h',
 'wtf/OwnArrayPtr.h',
-'wtf/OwnFastMallocPtr.h',
 'wtf/OwnPtr.h',
 'wtf/OwnPtrCommon.h',
 'wtf/PageAllocation.h',


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj (104314 => 104315)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj	2012-01-06 20:07:33 UTC (rev 104314)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/WTF/WTF.vcproj	2012-01-06 20:09:26 UTC (rev 104315)
@@ -965,10 +965,6 @@
 			
 		/File
 		File
-			RelativePath=..\..\wtf\OwnFastMallocPtr.h
-			
-		/File
-		File
 			RelativePath=..\..\wtf\OwnPtr.h
 			
 		/File


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (104314 => 104315)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 20:07:33 UTC (rev 104314)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 20:09:26 UTC (rev 104315)
@@ -47,7 +47,6 @@
 		0B4D7E630F319AC800AD7E58 /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B4D7E620F319AC800AD7E58 /* TypeTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0BAC94A01338728400CF135B /* ThreadRestrictionVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0BCD83571485845200EA2003 /* TemporaryChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCD83541485841200EA2003 /* TemporaryChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		0BDFFAE10FC6193100D69EF4 /* OwnFastMallocPtr.h in 

[webkit-changes] [104316] trunk/LayoutTests

2012-01-06 Thread dslomov
Title: [104316] trunk/LayoutTests








Revision 104316
Author dslo...@google.com
Date 2012-01-06 12:12:50 -0800 (Fri, 06 Jan 2012)


Log Message
Unreviewed; fixing expectation error.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104315 => 104316)

--- trunk/LayoutTests/ChangeLog	2012-01-06 20:09:26 UTC (rev 104315)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 20:12:50 UTC (rev 104316)
@@ -1,3 +1,9 @@
+2012-01-06  Dmitry Lomov  dslo...@google.com
+
+Unreviewed; fixing expectation error. 
+
+* platform/chromium/test_expectations.txt:
+
 2012-01-06  Hans Muller  hmul...@adobe.com
 
 Convert overflow-in-uniform-regions to a reftest


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104315 => 104316)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 20:09:26 UTC (rev 104315)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 20:12:50 UTC (rev 104316)
@@ -2704,8 +2704,10 @@
 // Accelerated 2d for mac isn't supported yet, so SKIP this test for now.
 BUGCR74979 SKIP MAC GPU GPU-CG : media/video-canvas-alpha.html = IMAGE
 
-BUGWK67760 GPU : media/media-document-audio-repaint.html = IMAGE PASS
+// Needs rebaseline after BUGWK74123 goes in.
+BUGWK67760 BUGWK75505: media/media-document-audio-repaint.html = IMAGE PASS
 
+
 BUGWK55968 MAC : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE IMAGE+TEXT
 BUGWK55968 WIN DEBUG : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE
 
@@ -3875,9 +3877,6 @@
 
 BUGWK75633 : fast/media/viewport-media-query.html = PASS IMAGE+TEXT
 
-// Needs rebaseline after BUGWK74123 goes in.
-BUGWK75505 : media/media-document-audio-repaint.html = IMAGE
-
 BUGWK75696 MAC LINUX DEBUG: svg/text/text-style-recalc-crash.html = PASS TIMEOUT
 
 BUGWK75716 : fullscreen/video-controls-drag.html = TEXT






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


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

2012-01-06 Thread caio . oliveira
Title: [104318] trunk/Source/_javascript_Core








Revision 104318
Author caio.olive...@openbossa.org
Date 2012-01-06 12:20:24 -0800 (Fri, 06 Jan 2012)


Log Message
Use HashMapOwnPtr for SourceProviderCache items
https://bugs.webkit.org/show_bug.cgi?id=75346

Reviewed by Daniel Bates.

* parser/Parser.cpp:
* parser/SourceProviderCache.cpp:
(JSC::SourceProviderCache::clear):
(JSC::SourceProviderCache::add):
* parser/SourceProviderCache.h:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/parser/Parser.cpp
trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp
trunk/Source/_javascript_Core/parser/SourceProviderCache.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104317 => 104318)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:20:24 UTC (rev 104318)
@@ -1,3 +1,16 @@
+2012-01-06  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
+
+Use HashMapOwnPtr for SourceProviderCache items
+https://bugs.webkit.org/show_bug.cgi?id=75346
+
+Reviewed by Daniel Bates.
+
+* parser/Parser.cpp:
+* parser/SourceProviderCache.cpp:
+(JSC::SourceProviderCache::clear):
+(JSC::SourceProviderCache::add):
+* parser/SourceProviderCache.h:
+
 2012-01-06  Sam Weinig  s...@webkit.org
 
 Remove unused OwnFastMallocPtr class.


Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (104317 => 104318)

--- trunk/Source/_javascript_Core/parser/Parser.cpp	2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp	2012-01-06 20:20:24 UTC (rev 104318)
@@ -30,7 +30,6 @@
 #include Lexer.h
 #include NodeInfo.h
 #include SourceProvider.h
-#include SourceProviderCacheItem.h
 #include utility
 #include wtf/HashFunctions.h
 #include wtf/OwnPtr.h


Modified: trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp (104317 => 104318)

--- trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp	2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp	2012-01-06 20:20:24 UTC (rev 104318)
@@ -26,8 +26,6 @@
 #include config.h
 #include SourceProviderCache.h
 
-#include SourceProviderCacheItem.h
-
 namespace JSC {
 
 SourceProviderCache::~SourceProviderCache()
@@ -37,7 +35,6 @@
 
 void SourceProviderCache::clear()
 {
-deleteAllValues(m_map);
 m_map.clear();
 m_contentByteSize = 0;
 }
@@ -49,7 +46,7 @@
 
 void SourceProviderCache::add(int sourcePosition, PassOwnPtrSourceProviderCacheItem item, unsigned size)
 {
-m_map.add(sourcePosition, item.leakPtr());
+m_map.add(sourcePosition, item);
 m_contentByteSize += size;
 }
 


Modified: trunk/Source/_javascript_Core/parser/SourceProviderCache.h (104317 => 104318)

--- trunk/Source/_javascript_Core/parser/SourceProviderCache.h	2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/SourceProviderCache.h	2012-01-06 20:20:24 UTC (rev 104318)
@@ -26,13 +26,13 @@
 #ifndef SourceProviderCache_h
 #define SourceProviderCache_h
 
+#include SourceProviderCacheItem.h
 #include wtf/HashMap.h
+#include wtf/OwnPtr.h
 #include wtf/PassOwnPtr.h
 
 namespace JSC {
 
-class SourceProviderCacheItem;
-
 class SourceProviderCache {
 public:
 SourceProviderCache() : m_contentByteSize(0) {}
@@ -44,7 +44,7 @@
 const SourceProviderCacheItem* get(int sourcePosition) const { return m_map.get(sourcePosition); }
 
 private:
-HashMapint, SourceProviderCacheItem* m_map;
+HashMapint, OwnPtrSourceProviderCacheItem  m_map;
 unsigned m_contentByteSize;
 };
 






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


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

2012-01-06 Thread ap
Title: [104319] trunk/Source/WebKit2








Revision 104319
Author a...@apple.com
Date 2012-01-06 12:21:23 -0800 (Fri, 06 Jan 2012)


Log Message
Need to allow SCNetworkReachability service in sandbox profile
https://bugs.webkit.org/show_bug.cgi?id=75724
rdar://problem/10652415

Reviewed by Mark Rowe.

* WebProcess/com.apple.WebProcess.sb:

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104318 => 104319)

--- trunk/Source/WebKit2/ChangeLog	2012-01-06 20:20:24 UTC (rev 104318)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-06 20:21:23 UTC (rev 104319)
@@ -1,3 +1,13 @@
+2012-01-06  Alexey Proskuryakov  a...@apple.com
+
+Need to allow SCNetworkReachability service in sandbox profile
+https://bugs.webkit.org/show_bug.cgi?id=75724
+rdar://problem/10652415
+
+Reviewed by Mark Rowe.
+
+* WebProcess/com.apple.WebProcess.sb:
+
 2012-01-06  Benjamin Poulain  bpoul...@apple.com
 
 [Mac] Sort the resources of WebKit2.xcodeproj


Modified: trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb (104318 => 104319)

--- trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb	2012-01-06 20:20:24 UTC (rev 104318)
+++ trunk/Source/WebKit2/WebProcess/com.apple.WebProcess.sb	2012-01-06 20:21:23 UTC (rev 104319)
@@ -151,6 +151,7 @@
(global-name com.apple.SecurityServer)
(global-name com.apple.SystemConfiguration.configd)
(global-name com.apple.SystemConfiguration.PPPController)
+   (global-name com.apple.SystemConfiguration.SCNetworkReachability)
(global-name com.apple.audio.VDCAssistant)
(global-name com.apple.audio.audiohald)
(global-name com.apple.audio.coreaudiod)






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


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

2012-01-06 Thread psolanki
Title: [104320] trunk/Source/WebCore








Revision 104320
Author psola...@apple.com
Date 2012-01-06 12:22:53 -0800 (Fri, 06 Jan 2012)


Log Message
WebKit1 fails to compile with USE(CFNETWORK) and HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
https://bugs.webkit.org/show_bug.cgi?id=75675

Reviewed by Oliver Hunt.

* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::willCacheResponse):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (104319 => 104320)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 20:21:23 UTC (rev 104319)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 20:22:53 UTC (rev 104320)
@@ -1,3 +1,13 @@
+2012-01-06  Pratik Solanki  psola...@apple.com
+
+WebKit1 fails to compile with USE(CFNETWORK) and HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+https://bugs.webkit.org/show_bug.cgi?id=75675
+
+Reviewed by Oliver Hunt.
+
+* platform/network/cf/ResourceHandleCFNet.cpp:
+(WebCore::willCacheResponse):
+
 2012-01-06  Abhishek Arya  infe...@chromium.org
 
 Crash with range selection across different documents.


Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (104319 => 104320)

--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2012-01-06 20:21:23 UTC (rev 104319)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp	2012-01-06 20:22:53 UTC (rev 104320)
@@ -333,11 +333,20 @@
 handle-client()-willCacheResponse(handle, policy);
 
 if (static_castCFURLCacheStoragePolicy(policy) != CFCachedURLResponseGetStoragePolicy(cachedResponse)) {
+#if HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)
+RetainPtrCFArrayRef receiverData(AdoptCF, CFCachedURLResponseCopyReceiverDataArray(cachedResponse));
+cachedResponse = CFCachedURLResponseCreateWithDataArray(kCFAllocatorDefault,
+CFCachedURLResponseGetWrappedResponse(cachedResponse),
+receiverData.get(),
+CFCachedURLResponseGetUserInfo(cachedResponse),
+static_castCFURLCacheStoragePolicy(policy));
+#else
 cachedResponse = CFCachedURLResponseCreateWithUserInfo(kCFAllocatorDefault, 
CFCachedURLResponseGetWrappedResponse(cachedResponse),
CFCachedURLResponseGetReceiverData(cachedResponse),
CFCachedURLResponseGetUserInfo(cachedResponse), 
static_castCFURLCacheStoragePolicy(policy));
+#endif
 } else
 CFRetain(cachedResponse);
 
@@ -1001,7 +1010,7 @@
 privateBrowsingStorageSessionIdentifierBase() = identifier;
 }
 
-#if PLATFORM(WIN)
+#if PLATFORM(WIN) || USE(CFNETWORK)
 
 String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
 {






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


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

2012-01-06 Thread andersca
Title: [104321] trunk/Source/WebCore








Revision 104321
Author ander...@apple.com
Date 2012-01-06 12:25:40 -0800 (Fri, 06 Jan 2012)


Log Message
Make ScrollAnimatorMac::snapRubberBandTimerFired use m_scrollElasticityController in more places
https://bugs.webkit.org/show_bug.cgi?id=75726

Reviewed by Sam Weinig.

* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::canScrollHorizontally):
(WebCore::ScrollAnimatorMac::canScrollVertically):
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
* platform/mac/ScrollElasticityController.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
trunk/Source/WebCore/platform/mac/ScrollElasticityController.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104320 => 104321)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 20:22:53 UTC (rev 104320)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 20:25:40 UTC (rev 104321)
@@ -1,3 +1,17 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Make ScrollAnimatorMac::snapRubberBandTimerFired use m_scrollElasticityController in more places
+https://bugs.webkit.org/show_bug.cgi?id=75726
+
+Reviewed by Sam Weinig.
+
+* platform/mac/ScrollAnimatorMac.h:
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::canScrollHorizontally):
+(WebCore::ScrollAnimatorMac::canScrollVertically):
+(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+* platform/mac/ScrollElasticityController.h:
+
 2012-01-06  Pratik Solanki  psola...@apple.com
 
 WebKit1 fails to compile with USE(CFNETWORK) and HAVE(NETWORK_CFDATA_ARRAY_CALLBACK)


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (104320 => 104321)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 20:22:53 UTC (rev 104320)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 20:25:40 UTC (rev 104321)
@@ -128,6 +128,8 @@
 /// ScrollElasticityControllerClient member functions.
 virtual IntSize stretchAmount() OVERRIDE;
 virtual bool pinnedInDirection(const FloatSize) OVERRIDE;
+virtual bool canScrollHorizontally() OVERRIDE;
+virtual bool canScrollVertically() OVERRIDE;
 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize) OVERRIDE;
 virtual void immediateScrollBy(const FloatSize) OVERRIDE;
 virtual void startSnapRubberbandTimer() OVERRIDE;


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104320 => 104321)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 20:22:53 UTC (rev 104320)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 20:25:40 UTC (rev 104321)
@@ -1065,6 +1065,22 @@
 return pinnedInDirection(direction.width(), direction.height());
 }
 
+bool ScrollAnimatorMac::canScrollHorizontally()
+{
+Scrollbar* scrollbar = m_scrollableArea-horizontalScrollbar();
+if (!scrollbar)
+return false;
+return scrollbar-enabled();
+}
+
+bool ScrollAnimatorMac::canScrollVertically()
+{
+Scrollbar* scrollbar = m_scrollableArea-verticalScrollbar();
+if (!scrollbar)
+return false;
+return scrollbar-enabled();
+}
+
 void ScrollAnimatorMac::immediateScrollByWithoutContentEdgeConstraints(const FloatSize delta)
 {
 m_scrollableArea-setConstrainsScrollingToContentEdge(false);
@@ -1320,9 +1336,9 @@
 CFTimeInterval timeDelta = [NSDate timeIntervalSinceReferenceDate] - m_scrollElasticityController.m_startTime;
 
 if (m_scrollElasticityController.m_startStretch == FloatSize()) {
-m_scrollElasticityController.m_startStretch = m_scrollableArea-overhangAmount();
-if (m_scrollElasticityController.m_startStretch == FloatSize()) {
-m_snapRubberBandTimer.stop();
+m_scrollElasticityController.m_startStretch = m_scrollElasticityController.m_client-stretchAmount();
+if (m_scrollElasticityController.m_startStretch == FloatSize()) {
+m_scrollElasticityController.m_client-stopSnapRubberbandTimer();
 
 m_scrollElasticityController.m_stretchScrollForce = FloatSize();
 m_scrollElasticityController.m_startTime = 0;
@@ -1342,13 +1358,11 @@
 m_scrollElasticityController.m_origVelocity.setWidth(0);
 
 // Don't rubber-band horizontally if it's not possible to scroll horizontally
-Scrollbar* hScroller = m_scrollableArea-horizontalScrollbar();
-if (!hScroller || !hScroller-enabled())
+if (!m_scrollElasticityController.m_client-canScrollHorizontally())
 m_scrollElasticityController.m_origVelocity.setWidth(0);
 
-// Don't rubber-band vertically if it's not possible to scroll horizontally
-Scrollbar* vScroller = 

[webkit-changes] [104322] trunk

2012-01-06 Thread commit-queue
Title: [104322] trunk








Revision 104322
Author commit-qu...@webkit.org
Date 2012-01-06 12:30:15 -0800 (Fri, 06 Jan 2012)


Log Message
ASSERT failure due to combine-text with preceding spaces
https://bugs.webkit.org/show_bug.cgi?id=65147

Patch by Ken Buchanan ke...@chromium.org on 2012-01-06
Reviewed by David Hyatt.

Source/WebCore:

A couple of ASSERTs were failing due to a parsing problem when
advancing an inline iterator to the next linebreak in a
RenderCombineText. skipLeadingWhitespace advances the iterator
over leading whitespace but when searching for the line break
nextLineBreak would call RenderCombineText::combineText(),
collapsing the text so that the iterator is pointing past the
end of it.

This patch causes combineText() to be called during
skipLeadingWhiteSpace before iteration over the RenderCombineText
begins.

* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::LineBreaker::nextLineBreak):
(WebCore::RenderBlock::LineBreaker::skipLeadingWhitespace):

LayoutTests:

New test with combine-text that begins with mutiple spaces,
showing ASSERT failures in bug 65147.

* fast/text/international/spaces-combined-in-vertical-text.html: Added
* fast/text/international/spaces-combined-in-vertical-text-expected.txt: Added

Modified Paths

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


Added Paths

trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt
trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html


Property Changed

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog




Diff

Modified: trunk/LayoutTests/ChangeLog (104321 => 104322)

--- trunk/LayoutTests/ChangeLog	2012-01-06 20:25:40 UTC (rev 104321)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 20:30:15 UTC (rev 104322)
@@ -1,3 +1,16 @@
+2012-01-06  Ken Buchanan  ke...@chromium.org
+
+ASSERT failure due to combine-text with preceding spaces
+https://bugs.webkit.org/show_bug.cgi?id=65147
+
+Reviewed by David Hyatt.
+
+New test with combine-text that begins with mutiple spaces,
+showing ASSERT failures in bug 65147.
+
+* fast/text/international/spaces-combined-in-vertical-text.html: Added
+* fast/text/international/spaces-combined-in-vertical-text-expected.txt: Added
+
 2012-01-06  Abhishek Arya  infe...@chromium.org
 
 Crash with range selection across different documents.
Property changes on: trunk/LayoutTests/ChangeLog
___


Added: svn:executable

Added: trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt (0 => 104322)

--- trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt	(rev 0)
+++ trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt	2012-01-06 20:30:15 UTC (rev 104322)
@@ -0,0 +1 @@
+
Property changes on: trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text-expected.txt
___


Added: svn:executable

Added: trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html (0 => 104322)

--- trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html	(rev 0)
+++ trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html	2012-01-06 20:30:15 UTC (rev 104322)
@@ -0,0 +1,9 @@
+body
+style=-webkit-columns: rosybrown; -webkit-writing-mode: vertical-lr; 
+div style=-webkit-hyphenate-character: floating; zoom: 900; -webkit-text-combine: horizontal; font-size: 600; 
+	PASS if no ASSERT fail or crash in debug build./div/body
+
+script
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+/script
Property changes on: trunk/LayoutTests/fast/text/international/spaces-combined-in-vertical-text.html
___


Added: svn:executable

Modified: trunk/Source/WebCore/ChangeLog (104321 => 104322)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 20:25:40 UTC (rev 104321)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 20:30:15 UTC (rev 104322)
@@ -1,3 +1,26 @@
+2012-01-06  Ken Buchanan  ke...@chromium.org
+
+ASSERT failure due to combine-text with preceding spaces
+https://bugs.webkit.org/show_bug.cgi?id=65147
+
+Reviewed by David Hyatt.
+
+A couple of ASSERTs were failing due to a parsing problem when
+advancing an inline iterator to the next linebreak in a
+RenderCombineText. skipLeadingWhitespace advances the iterator
+over leading whitespace but when searching for the line break
+nextLineBreak would call RenderCombineText::combineText(),
+collapsing the text so that the iterator is pointing past the
+end of it.
+
+This patch 

[webkit-changes] [104323] trunk/Source/WTF

2012-01-06 Thread benjamin
Title: [104323] trunk/Source/WTF








Revision 104323
Author benja...@webkit.org
Date 2012-01-06 12:31:05 -0800 (Fri, 06 Jan 2012)


Log Message
[Mac] Sort the resources of WTF.xcodeproj
https://bugs.webkit.org/show_bug.cgi?id=75639

Patch by Benjamin Poulain bpoul...@apple.com on 2012-01-06
Reviewed by Andreas Kling.

* WTF.xcodeproj/project.pbxproj:

Modified Paths

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




Diff

Modified: trunk/Source/WTF/ChangeLog (104322 => 104323)

--- trunk/Source/WTF/ChangeLog	2012-01-06 20:30:15 UTC (rev 104322)
+++ trunk/Source/WTF/ChangeLog	2012-01-06 20:31:05 UTC (rev 104323)
@@ -1,3 +1,12 @@
+2012-01-06  Benjamin Poulain  bpoul...@apple.com
+
+[Mac] Sort the resources of WTF.xcodeproj
+https://bugs.webkit.org/show_bug.cgi?id=75639
+
+Reviewed by Andreas Kling.
+
+* WTF.xcodeproj/project.pbxproj:
+
 2012-01-06  Eric Seidel  e...@webkit.org and Gustavo Noronha Silva  gustavo.noro...@collabora.com
 
 Make the new WTF module build on Gtk


Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (104322 => 104323)

--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2012-01-06 20:30:15 UTC (rev 104322)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj	2012-01-06 20:31:05 UTC (rev 104323)
@@ -36,9 +36,9 @@
 		5D247B5714689B8600E78B76 = {
 			isa = PBXGroup;
 			children = (
-5D247B7614689D7600E78B76 /* Source */,
 5D247B6D14689C4700E78B76 /* Configurations */,
 5D247B6314689B8600E78B76 /* Products */,
+5D247B7614689D7600E78B76 /* Source */,
 			);
 			sourceTree = group;
 		};
@@ -78,8 +78,8 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+5D247EB21468B01500E78B76 /* HeaderDetection.h in Headers */,
 5D247B7A14689D8900E78B76 /* Stub.h in Headers */,
-5D247EB21468B01500E78B76 /* HeaderDetection.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};






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


[webkit-changes] [104324] trunk/Source

2012-01-06 Thread oliver
Title: [104324] trunk/Source








Revision 104324
Author oli...@apple.com
Date 2012-01-06 12:38:42 -0800 (Fri, 06 Jan 2012)


Log Message
DFG no longer optimises CanvasPixelArray
https://bugs.webkit.org/show_bug.cgi?id=75729

Reviewed by Gavin Barraclough.

Source/_javascript_Core:

Rename ByteArray (in its ClassInfo) to Uint8ClampedArray to match
the future name when we switch over to the new typed-array based
ImageData specification.

* runtime/JSByteArray.cpp:

Source/WebCore:

Remove the custom ClassInfo for CanvasPixelArray as that is
defeating ByteArray optimisation, and is no longer needed
anyway as it was only there to change the visible name.

* bindings/js/JSImageDataCustom.cpp:
(WebCore::toJS):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/runtime/JSByteArray.cpp
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104323 => 104324)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:31:05 UTC (rev 104323)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:38:42 UTC (rev 104324)
@@ -1,3 +1,16 @@
+2012-01-06  Oliver Hunt  oli...@apple.com
+
+DFG no longer optimises CanvasPixelArray
+https://bugs.webkit.org/show_bug.cgi?id=75729
+
+Reviewed by Gavin Barraclough.
+
+Rename ByteArray (in its ClassInfo) to Uint8ClampedArray to match
+the future name when we switch over to the new typed-array based
+ImageData specification.
+
+* runtime/JSByteArray.cpp:
+
 2012-01-06  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
 
 Use HashMapOwnPtr for SourceProviderCache items


Modified: trunk/Source/_javascript_Core/runtime/JSByteArray.cpp (104323 => 104324)

--- trunk/Source/_javascript_Core/runtime/JSByteArray.cpp	2012-01-06 20:31:05 UTC (rev 104323)
+++ trunk/Source/_javascript_Core/runtime/JSByteArray.cpp	2012-01-06 20:38:42 UTC (rev 104324)
@@ -33,7 +33,7 @@
 
 namespace JSC {
 
-const ClassInfo JSByteArray::s_info = { ByteArray, Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSByteArray) };
+const ClassInfo JSByteArray::s_info = { Uint8ClampedArray, Base::s_info, 0, 0, CREATE_METHOD_TABLE(JSByteArray) };
 
 JSByteArray::JSByteArray(ExecState* exec, Structure* structure, ByteArray* storage)
 : JSNonFinalObject(exec-globalData(), structure)


Modified: trunk/Source/WebCore/ChangeLog (104323 => 104324)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 20:31:05 UTC (rev 104323)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 20:38:42 UTC (rev 104324)
@@ -1,3 +1,17 @@
+2012-01-06  Oliver Hunt  oli...@apple.com
+
+DFG no longer optimises CanvasPixelArray
+https://bugs.webkit.org/show_bug.cgi?id=75729
+
+Reviewed by Gavin Barraclough.
+
+Remove the custom ClassInfo for CanvasPixelArray as that is
+defeating ByteArray optimisation, and is no longer needed
+anyway as it was only there to change the visible name.
+
+* bindings/js/JSImageDataCustom.cpp:
+(WebCore::toJS):
+
 2012-01-06  Ken Buchanan  ke...@chromium.org
 
 ASSERT failure due to combine-text with preceding spaces


Modified: trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp (104323 => 104324)

--- trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp	2012-01-06 20:31:05 UTC (rev 104323)
+++ trunk/Source/WebCore/bindings/js/JSImageDataCustom.cpp	2012-01-06 20:38:42 UTC (rev 104324)
@@ -47,10 +47,9 @@
 
 wrapper = CREATE_DOM_WRAPPER(exec, globalObject, ImageData, imageData);
 Identifier dataName(exec, data);
-static const ClassInfo cpaClassInfo = { CanvasPixelArray, JSByteArray::s_info, 0, 0, CREATE_METHOD_TABLE(JSByteArray) };
-Structure* cpaStructure = getCachedDOMStructure(globalObject, cpaClassInfo);
+Structure* cpaStructure = getCachedDOMStructure(globalObject, JSByteArray::s_info);
 if (!cpaStructure)
-cpaStructure = cacheDOMStructure(globalObject, JSByteArray::createStructure(exec-globalData(), globalObject, jsNull(), cpaClassInfo), cpaClassInfo);
+cpaStructure = cacheDOMStructure(globalObject, JSByteArray::createStructure(exec-globalData(), globalObject, jsNull(), JSByteArray::s_info), JSByteArray::s_info);
 wrapper-putDirect(exec-globalData(), dataName, JSByteArray::create(exec, cpaStructure, imageData-data()-data()), DontDelete | ReadOnly);
 exec-heap()-reportExtraMemoryCost(imageData-data()-length());
 






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


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

2012-01-06 Thread fpizlo
Title: [104326] trunk/Source/_javascript_Core








Revision 104326
Author fpi...@apple.com
Date 2012-01-06 12:44:50 -0800 (Fri, 06 Jan 2012)


Log Message
Fix build.

* _javascript_Core.xcodeproj/project.pbxproj:

Modified Paths

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




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104325 => 104326)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:44:24 UTC (rev 104325)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 20:44:50 UTC (rev 104326)
@@ -1,3 +1,9 @@
+2012-01-06  Filip Pizlo  fpi...@apple.com
+
+Fix build.
+
+* _javascript_Core.xcodeproj/project.pbxproj:
+
 2012-01-06  Oliver Hunt  oli...@apple.com
 
 DFG no longer optimises CanvasPixelArray


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (104325 => 104326)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 20:44:24 UTC (rev 104325)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 20:44:50 UTC (rev 104326)
@@ -288,7 +288,7 @@
 		651122FE14046A4C002B101D /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; };
 		6511230714046B0A002B101D /* testRegExp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 651122E5140469BA002B101D /* testRegExp.cpp */; };
 		651DCA04136A6FEF00F74194 /* PassTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = 651DCA02136A6FAB00F74194 /* PassTraits.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		65303D641447B9E100D3F904 /* ParserTokens.h in Headers */ = {isa = PBXBuildFile; fileRef = 65303D631447B9E100D3F904 /* ParserTokens.h */; };
+		65303D641447B9E100D3F904 /* ParserTokens.h in Headers */ = {isa = PBXBuildFile; fileRef = 65303D631447B9E100D3F904 /* ParserTokens.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		655EB29B10CE2581001A990E /* NodesCodegen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 655EB29A10CE2581001A990E /* NodesCodegen.cpp */; };
 		65DFC93308EA173A00F7300B /* HashTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65DFC92D08EA173A00F7300B /* HashTable.cpp */; };
 		65E1A3DF122B894500B26097 /* NonCopyingSort.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1A2F4122B880D00B26097 /* NonCopyingSort.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -709,7 +709,7 @@
 		E48E0F2D0F82151700A8CA37 /* FastAllocBase.h in Headers */ = {isa = PBXBuildFile; fileRef = E48E0F2C0F82151700A8CA37 /* FastAllocBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E49DC16B12EF293E00184A1F /* SourceProviderCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E49DC15512EF277200184A1F /* SourceProviderCache.cpp */; };
 		E49DC16C12EF294E00184A1F /* SourceProviderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC15112EF272200184A1F /* SourceProviderCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
-		E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC14912EF261A00184A1F /* SourceProviderCacheItem.h */; };
+		E49DC16D12EF295300184A1F /* SourceProviderCacheItem.h in Headers */ = {isa = PBXBuildFile; fileRef = E49DC14912EF261A00184A1F /* SourceProviderCacheItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		E4D8CEFB12FC439600BC9F5A /* BloomFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D8CE9B12FC42E100BC9F5A /* BloomFilter.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		F3BD31ED126735770065467F /* TextPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = F3BD31D0126730180065467F /* TextPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		FDA15C1E12B0305C003A583A /* Complex.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA15C1612B03028003A583A /* Complex.h */; settings = {ATTRIBUTES = (Private, ); }; };






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


[webkit-changes] [104327] trunk

2012-01-06 Thread eric . carlson
Title: [104327] trunk








Revision 104327
Author eric.carl...@apple.com
Date 2012-01-06 13:12:40 -0800 (Fri, 06 Jan 2012)


Log Message
Make TextTrackCue more mutable
https://bugs.webkit.org/show_bug.cgi?id=72555

Reviewed by Anders Carlsson.

Source/WebCore: 

Test: media/track/track-cue-mutable.html

* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateActiveTextTrackCues): Do nothing if the ignore cue updates
flag is set
(WebCore::HTMLMediaElement::textTrackAddCues): Block cue updates until all of the new cues have
been added, then call updateActiveTextTrackCues so update the display if necessary.
(WebCore::HTMLMediaElement::textTrackRemoveCues): Block cue updates until all of the new cues have
been removed, then call updateActiveTextTrackCues so update the display if necessary.
(WebCore::HTMLMediaElement::textTrackAddCue): Call updateActiveTextTrackCues so update the display if necessary.
(WebCore::HTMLMediaElement::textTrackRemoveCue): Ditto.
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::ignoreTrackDisplayUpdateRequests):
(WebCore::HTMLMediaElement::beginIgnoringTrackDisplayUpdateRequests):
(WebCore::HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests):

* html/TextTrack.cpp:
(WebCore::TextTrack::cueWillChange): New, remove the cue from the media element because its
position in the interval tree is based on start and end times.
(WebCore::TextTrack::cueDidChange): Add the cue to the media element.
* html/TextTrack.h:

* html/TextTrackCue.cpp:
(WebCore::startKeyword): New, use a static String for the constant.
(WebCore::middleKeyword): Ditto.
(WebCore::endKeyword): Ditto.
(WebCore::horizontalKeyword): Ditto.
(WebCore::verticalKeyword): Ditto.
(WebCore::verticallrKeyword): Ditto.
(WebCore::TextTrackCue::cueWillChange): New, tell the track the cue is about to change.
(WebCore::TextTrackCue::cueDidChange): New, tell the track the cue has changed.
(WebCore::TextTrackCue::setId): New, attribute is mutable.
(WebCore::TextTrackCue::setStartTime): Ditto.
(WebCore::TextTrackCue::setEndTime): Ditto.
(WebCore::TextTrackCue::setPauseOnExit): Ditto.
(WebCore::TextTrackCue::direction): Ditto.
(WebCore::TextTrackCue::setDirection): Ditto.
(WebCore::TextTrackCue::setSnapToLines): Ditto.
(WebCore::TextTrackCue::setLinePosition): Ditto.
(WebCore::TextTrackCue::setTextPosition): Ditto.
(WebCore::TextTrackCue::setSize): Ditto.
(WebCore::TextTrackCue::alignment): Ditto.
(WebCore::TextTrackCue::setAlignment): Ditto.
(WebCore::TextTrackCue::parseSettings): Use the static strings.
* html/TextTrackCue.h:
(WebCore::TextTrackCue::id):
(WebCore::TextTrackCue::startTime):
(WebCore::TextTrackCue::endTime):
(WebCore::TextTrackCue::pauseOnExit):
* html/TextTrackCue.idl:

LayoutTests: 

* media/track/track-cue-mutable-expected.txt: Added.
* media/track/track-cue-mutable.html: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/HTMLMediaElement.cpp
trunk/Source/WebCore/html/HTMLMediaElement.h
trunk/Source/WebCore/html/TextTrack.cpp
trunk/Source/WebCore/html/TextTrack.h
trunk/Source/WebCore/html/TextTrackCue.cpp
trunk/Source/WebCore/html/TextTrackCue.h
trunk/Source/WebCore/html/TextTrackCue.idl


Added Paths

trunk/LayoutTests/media/track/track-cue-mutable-expected.txt
trunk/LayoutTests/media/track/track-cue-mutable.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104326 => 104327)

--- trunk/LayoutTests/ChangeLog	2012-01-06 20:44:50 UTC (rev 104326)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 21:12:40 UTC (rev 104327)
@@ -1,3 +1,13 @@
+2012-01-06  Eric Carlson  eric.carl...@apple.com
+
+Make TextTrackCue more mutable
+https://bugs.webkit.org/show_bug.cgi?id=72555
+
+Reviewed by Anders Carlsson.
+
+* media/track/track-cue-mutable-expected.txt: Added.
+* media/track/track-cue-mutable.html: Added.
+
 2012-01-06  Ken Buchanan  ke...@chromium.org
 
 ASSERT failure due to combine-text with preceding spaces


Added: trunk/LayoutTests/media/track/track-cue-mutable-expected.txt (0 => 104327)

--- trunk/LayoutTests/media/track/track-cue-mutable-expected.txt	(rev 0)
+++ trunk/LayoutTests/media/track/track-cue-mutable-expected.txt	2012-01-06 21:12:40 UTC (rev 104327)
@@ -0,0 +1,70 @@
+Tests modifying attributes of a TextTrackCue
+
+** Test initial values.
+RUN(textCue = cues.getCueById('1'))
+EXPECTED (textCue.startTime == '0') OK
+EXPECTED (textCue.endTime == '1') OK
+EXPECTED (textCue.pauseOnExit == 'false') OK
+EXPECTED (textCue.direction == 'horizontal') OK
+EXPECTED (textCue.snapToLines == 'true') OK
+EXPECTED (textCue.linePosition == '-1') OK
+EXPECTED (textCue.textPosition == '50') OK
+EXPECTED (textCue.size == '100') OK
+EXPECTED (textCue.alignment == 'middle') OK
+
+** Modify cue values.
+RUN(textCue.startTime = 1.1)
+EXPECTED (textCue.startTime == '1.1') OK
+
+RUN(textCue.endTime = 3.9)
+EXPECTED (textCue.endTime == '3.9') OK
+
+RUN(textCue.pauseOnExit = true)

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

2012-01-06 Thread oliver
Title: [104330] trunk/Source/_javascript_Core








Revision 104330
Author oli...@apple.com
Date 2012-01-06 13:19:54 -0800 (Fri, 06 Jan 2012)


Log Message
GetByteArrayLength is incorrect
https://bugs.webkit.org/show_bug.cgi?id=75735

Reviewed by Filip Pizlo.

Load the byte array length from the correct location.
This stops an existing test from hanging.

* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp
trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104329 => 104330)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 21:18:25 UTC (rev 104329)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 21:19:54 UTC (rev 104330)
@@ -1,3 +1,18 @@
+2012-01-06  Oliver Hunt  oli...@apple.com
+
+GetByteArrayLength is incorrect
+https://bugs.webkit.org/show_bug.cgi?id=75735
+
+Reviewed by Filip Pizlo.
+
+Load the byte array length from the correct location.
+This stops an existing test from hanging.
+
+* dfg/DFGSpeculativeJIT32_64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+* dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compile):
+
 2012-01-06  Filip Pizlo  fpi...@apple.com
 
 Fix build.


Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp (104329 => 104330)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2012-01-06 21:18:25 UTC (rev 104329)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT32_64.cpp	2012-01-06 21:19:54 UTC (rev 104330)
@@ -3203,7 +3203,7 @@
 GPRReg resultGPR = result.gpr();
 
 m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSByteArray::offsetOfStorage()), resultGPR);
-m_jit.load32(MacroAssembler::Address(baseGPR, ByteArray::offsetOfSize()), resultGPR);
+m_jit.load32(MacroAssembler::Address(resultGPR, ByteArray::offsetOfSize()), resultGPR);
 
 integerResult(resultGPR, m_compileIndex);
 break;


Modified: trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp (104329 => 104330)

--- trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2012-01-06 21:18:25 UTC (rev 104329)
+++ trunk/Source/_javascript_Core/dfg/DFGSpeculativeJIT64.cpp	2012-01-06 21:19:54 UTC (rev 104330)
@@ -3198,7 +3198,7 @@
 speculationCheck(BadType, JSValueRegs(baseGPR), node.child1(), m_jit.branchPtr(MacroAssembler::NotEqual, MacroAssembler::Address(baseGPR, JSCell::classInfoOffset()), MacroAssembler::TrustedImmPtr(JSByteArray::s_info)));
 
 m_jit.loadPtr(MacroAssembler::Address(baseGPR, JSByteArray::offsetOfStorage()), resultGPR);
-m_jit.load32(MacroAssembler::Address(baseGPR, ByteArray::offsetOfSize()), resultGPR);
+m_jit.load32(MacroAssembler::Address(resultGPR, ByteArray::offsetOfSize()), resultGPR);
 
 integerResult(resultGPR, m_compileIndex);
 break;






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


[webkit-changes] [104331] trunk

2012-01-06 Thread simon . fraser
Title: [104331] trunk








Revision 104331
Author simon.fra...@apple.com
Date 2012-01-06 13:44:50 -0800 (Fri, 06 Jan 2012)


Log Message
Mitigate scrollbar differences when running pixel tests
https://bugs.webkit.org/show_bug.cgi?id=67217

Source/WebCore:

Reviewed by Dan Bernstein.

Export WebCore::Settings::mockScrollbarsEnabled() for DRT.

* WebCore.exp.in:

Source/WebKit/mac:

Reviewed by Dan Bernstein.

Make it possible to register a custom NSScroller class, which
the WebDynamicScrollBarsView will use when mock scrollbars are enabled.

Also ensure that the WebPreferences mock scrollbars preference is
migrated into Settings.

* WebView/WebDynamicScrollBarsView.h:
* WebView/WebDynamicScrollBarsView.mm:
(+[WebDynamicScrollBarsView _horizontalScrollerClass]):
(+[WebDynamicScrollBarsView _verticalScrollerClass]):
(+[WebDynamicScrollBarsView setCustomScrollerClass:]):
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Tools:

Reviewed by Dan Bernstein.

Add an NSScroller subclass that draws mock scrollbars identically
to the WebCore mock scrollbar theme, and register it with the
WebDynamicScrollbarsView.

* DumpRenderTree/mac/DumpRenderTree.mm:
(-[DRTMockScroller rectForPart:]):
(-[DRTMockScroller drawKnob]):
(-[DRTMockScroller drawRect:]):
(registerMockScrollbars):
(prepareConsistentTestingEnvironment):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.exp.in
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h
trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm
trunk/Source/WebKit/mac/WebView/WebView.mm
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (104330 => 104331)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 21:19:54 UTC (rev 104330)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 21:44:50 UTC (rev 104331)
@@ -1,3 +1,14 @@
+2012-01-06  Simon Fraser  simon.fra...@apple.com
+
+Mitigate scrollbar differences when running pixel tests
+https://bugs.webkit.org/show_bug.cgi?id=67217
+
+Reviewed by Dan Bernstein.
+
+Export WebCore::Settings::mockScrollbarsEnabled() for DRT.
+
+* WebCore.exp.in:
+
 2012-01-06  Tom Sepez  tse...@chromium.org
 
 Pass Content-Security-Policy directives to worker threads.


Modified: trunk/Source/WebCore/WebCore.exp.in (104330 => 104331)

--- trunk/Source/WebCore/WebCore.exp.in	2012-01-06 21:19:54 UTC (rev 104330)
+++ trunk/Source/WebCore/WebCore.exp.in	2012-01-06 21:44:50 UTC (rev 104331)
@@ -943,6 +943,7 @@
 __ZN7WebCore8Settings20setCursiveFontFamilyERKN3WTF12AtomicStringE11UScriptCode
 __ZN7WebCore8Settings20setFantasyFontFamilyERKN3WTF12AtomicStringE11UScriptCode
 __ZN7WebCore8Settings20setXSSAuditorEnabledEb
+__ZN7WebCore8Settings21mockScrollbarsEnabledEv
 __ZN7WebCore8Settings21setShowRepaintCounterEb
 __ZN7WebCore8Settings21setStandardFontFamilyERKN3WTF12AtomicStringE11UScriptCode
 __ZN7WebCore8Settings21setWebSecurityEnabledEb


Modified: trunk/Source/WebKit/mac/ChangeLog (104330 => 104331)

--- trunk/Source/WebKit/mac/ChangeLog	2012-01-06 21:19:54 UTC (rev 104330)
+++ trunk/Source/WebKit/mac/ChangeLog	2012-01-06 21:44:50 UTC (rev 104331)
@@ -1,3 +1,24 @@
+2012-01-06  Simon Fraser  simon.fra...@apple.com
+
+Mitigate scrollbar differences when running pixel tests
+https://bugs.webkit.org/show_bug.cgi?id=67217
+
+Reviewed by Dan Bernstein.
+
+Make it possible to register a custom NSScroller class, which
+the WebDynamicScrollBarsView will use when mock scrollbars are enabled.
+
+Also ensure that the WebPreferences mock scrollbars preference is
+migrated into Settings.
+
+* WebView/WebDynamicScrollBarsView.h:
+* WebView/WebDynamicScrollBarsView.mm:
+(+[WebDynamicScrollBarsView _horizontalScrollerClass]):
+(+[WebDynamicScrollBarsView _verticalScrollerClass]):
+(+[WebDynamicScrollBarsView setCustomScrollerClass:]):
+* WebView/WebView.mm:
+(-[WebView _preferencesChanged:]):
+
 2012-01-05  Dan Bernstein  m...@apple.com
 
 rdar://problem/10633760 Update copyright strings


Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h (104330 => 104331)

--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h	2012-01-06 21:19:54 UTC (rev 104330)
+++ trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.h	2012-01-06 21:44:50 UTC (rev 104331)
@@ -42,6 +42,9 @@
 #endif
 }
 
+// For use by DumpRenderTree only.
++ (void)setCustomScrollerClass:(Class)scrollerClass;
+
 // This was originally added for Safari's benefit, but Safari has not used it for a long time.
 // Perhaps it can be removed.
 - (void)setAllowsHorizontalScrolling:(BOOL)flag;


Modified: trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm (104330 => 104331)

--- trunk/Source/WebKit/mac/WebView/WebDynamicScrollBarsView.mm	2012-01-06 21:19:54 UTC (rev 104330)

[webkit-changes] [104332] trunk

2012-01-06 Thread jonlee
Title: [104332] trunk








Revision 104332
Author jon...@apple.com
Date 2012-01-06 13:55:12 -0800 (Fri, 06 Jan 2012)


Log Message
Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
https://bugs.webkit.org/show_bug.cgi?id=69886
rdar://problem/10070187

Reviewed by Adele Peterson.

.:

* ManualTests/search-cancel-button.html: Added.

Source/WebCore:

Tests: ManualTests/search-cancel-button.html

* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSearchFieldCancelButton): If the input is readonly and/or disabled, force the cell to
render without highlight.

Modified Paths

trunk/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderThemeMac.mm


Added Paths

trunk/ManualTests/search-cancel-button.html




Diff

Modified: trunk/ChangeLog (104331 => 104332)

--- trunk/ChangeLog	2012-01-06 21:44:50 UTC (rev 104331)
+++ trunk/ChangeLog	2012-01-06 21:55:12 UTC (rev 104332)
@@ -1,3 +1,13 @@
+2012-01-04  Jon Lee  jon...@apple.com
+
+Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
+https://bugs.webkit.org/show_bug.cgi?id=69886
+rdar://problem/10070187
+
+Reviewed by Adele Peterson.
+
+* ManualTests/search-cancel-button.html: Added.
+
 2012-01-06  Simon Hausmann  simon.hausm...@nokia.com
 
 [Qt] Fix compilation of app code against QtWebKit master header file


Added: trunk/ManualTests/search-cancel-button.html (0 => 104332)

--- trunk/ManualTests/search-cancel-button.html	(rev 0)
+++ trunk/ManualTests/search-cancel-button.html	2012-01-06 21:55:12 UTC (rev 104332)
@@ -0,0 +1,11 @@
+!DOCTYPE html
+html
+body
+phttps://bugs.webkit.org/show_bug.cgi?id=69886 - Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable/p
+pClicking on the disabled/readonly search inputs should not render the cancel button dark when you click on them./p
+pNormal search:br/input type=search value=This is a string of long text. //p
+pDisabled search:br/input type=search value=This is a string of long text. disabled //p
+pReadonly search:br/input type=search value=This is a string of long text. readonly //p
+pDisabled and readonly search:br/input type=search value=This is a string of long text. disabled readonly //p
+/body
+/html
\ No newline at end of file


Modified: trunk/Source/WebCore/ChangeLog (104331 => 104332)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 21:44:50 UTC (rev 104331)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 21:55:12 UTC (rev 104332)
@@ -1,3 +1,17 @@
+2012-01-04  Jon Lee  jon...@apple.com
+
+Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable
+https://bugs.webkit.org/show_bug.cgi?id=69886
+rdar://problem/10070187
+
+Reviewed by Adele Peterson.
+
+Tests: ManualTests/search-cancel-button.html
+
+* rendering/RenderThemeMac.mm:
+(WebCore::RenderThemeMac::paintSearchFieldCancelButton): If the input is readonly and/or disabled, force the cell to
+render without highlight.
+
 2012-01-06  Simon Fraser  simon.fra...@apple.com
 
 Mitigate scrollbar differences when running pixel tests


Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (104331 => 104332)

--- trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-01-06 21:44:50 UTC (rev 104331)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm	2012-01-06 21:55:12 UTC (rev 104332)
@@ -1511,7 +1511,9 @@
 
 bool RenderThemeMac::paintSearchFieldCancelButton(RenderObject* o, const PaintInfo paintInfo, const IntRect r)
 {
-Node* input = o-node()-shadowAncestorNode();
+Element* input = toElement(o-node()-shadowAncestorNode());
+ASSERT(input);
+
 if (!input-renderer()-isBox())
 return false;
 
@@ -1520,8 +1522,12 @@
 
 NSSearchFieldCell* search = this-search();
 
-updateActiveState([search cancelButtonCell], o);
-updatePressedState([search cancelButtonCell], o);
+if (input-isEnabledFormControl()  !input-isReadOnlyFormControl()) {
+updateActiveState([search cancelButtonCell], o);
+updatePressedState([search cancelButtonCell], o);
+}
+else if ([[search cancelButtonCell] isHighlighted])
+[[search cancelButtonCell] setHighlighted:NO];
 
 GraphicsContextStateSaver stateSaver(*paintInfo.context);
 






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


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

2012-01-06 Thread weinig
Title: [104333] trunk/Source/_javascript_Core








Revision 104333
Author wei...@apple.com
Date 2012-01-06 13:57:22 -0800 (Fri, 06 Jan 2012)


Log Message
Add a DecayArray type trait as a first step towards merging OwnPtr and OwnArrayPtr
https://bugs.webkit.org/show_bug.cgi?id=75737

Reviewed by Anders Carlsson.

* wtf/TypeTraits.cpp:
* wtf/TypeTraits.h:
Added a DecayArray trait, that can convert T[] and T[3] - T*. DecayArray
is composed of some helpers which are also exposed, Conditional, which
can provide one type or another based on a boolean predicate, IsArray
which can deduce array types, and RemoveExtent, which removes the extent
from an array type. 

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/TypeTraits.cpp
trunk/Source/_javascript_Core/wtf/TypeTraits.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104332 => 104333)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 21:55:12 UTC (rev 104332)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 21:57:22 UTC (rev 104333)
@@ -1,3 +1,18 @@
+2012-01-06  Sam Weinig  s...@webkit.org
+
+Add a DecayArray type trait as a first step towards merging OwnPtr and OwnArrayPtr
+https://bugs.webkit.org/show_bug.cgi?id=75737
+
+Reviewed by Anders Carlsson.
+
+* wtf/TypeTraits.cpp:
+* wtf/TypeTraits.h:
+Added a DecayArray trait, that can convert T[] and T[3] - T*. DecayArray
+is composed of some helpers which are also exposed, Conditional, which
+can provide one type or another based on a boolean predicate, IsArray
+which can deduce array types, and RemoveExtent, which removes the extent
+from an array type. 
+
 2012-01-06  Oliver Hunt  oli...@apple.com
 
 GetByteArrayLength is incorrect


Modified: trunk/Source/_javascript_Core/wtf/TypeTraits.cpp (104332 => 104333)

--- trunk/Source/_javascript_Core/wtf/TypeTraits.cpp	2012-01-06 21:55:12 UTC (rev 104332)
+++ trunk/Source/_javascript_Core/wtf/TypeTraits.cpp	2012-01-06 21:57:22 UTC (rev 104333)
@@ -139,4 +139,20 @@
 COMPILE_ASSERT((IsSameTypeint, RemoveReferenceint::Type::value), WTF_Test_RemoveReference_int);
 COMPILE_ASSERT((IsSameTypeint, RemoveReferenceint::Type::value), WTF_Test_RemoveReference_int_reference);
 
+
+typedef int IntArray[];
+typedef int IntArraySized[4];
+
+COMPILE_ASSERT((IsArrayIntArray::value), WTF_Test_IsArray_int_array);
+COMPILE_ASSERT((IsArrayIntArraySized::value), WTF_Test_IsArray_int_sized_array);
+
+COMPILE_ASSERT((IsSameTypeint, RemoveExtentIntArray::Type::value), WTF_Test_RemoveExtent_int_array);
+COMPILE_ASSERT((IsSameTypeint, RemoveExtentIntArraySized::Type::value), WTF_Test_RemoveReference_int_sized_array);
+
+COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArray::Type::value), WTF_Test_DecayArray_int_array);
+COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArraySized::Type::value), WTF_Test_DecayArray_int_sized_array);
+
+COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArray::Type::value), WTF_Test_DecayArray_int_array_reference);
+COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArraySized::Type::value), WTF_Test_DecayArray_int_sized_array_reference);
+
 } // namespace WTF


Modified: trunk/Source/_javascript_Core/wtf/TypeTraits.h (104332 => 104333)

--- trunk/Source/_javascript_Core/wtf/TypeTraits.h	2012-01-06 21:55:12 UTC (rev 104332)
+++ trunk/Source/_javascript_Core/wtf/TypeTraits.h	2012-01-06 21:57:22 UTC (rev 104333)
@@ -35,10 +35,14 @@
 
 // The following are provided in this file:
 //
+//   ConditionalPredicate, If, Then::Type
+//
 //   IsIntegerT::value
 //   IsPodT::value, see the definition for a note about its limitations
 //   IsConvertibleToIntegerT::value
 //
+//   IsArrayT::value
+//
 //   IsSameTypeT, U::value
 //
 //   RemovePointerT::Type
@@ -46,9 +50,15 @@
 //   RemoveConstT::Type
 //   RemoveVolatileT::Type
 //   RemoveConstVolatileT::Type
+//   RemoveExtentT::Type
 //
+//   DecayArrayT::Type
+//
 //   COMPILE_ASSERT's in TypeTraits.cpp illustrate their usage and what they do.
 
+template bool Predicate, class If, class Then struct Conditional  { typedef If Type; };
+template class If, class Then struct Conditionalfalse, If, Then { typedef Then Type; };
+
 templatetypename T struct IsInteger   { static const bool value = false; };
 template struct IsIntegerbool   { static const bool value = true; };
 template struct IsIntegerchar   { static const bool value = true; };
@@ -104,6 +114,20 @@
 static const bool value = IsIntegerT::value || IsConvertibleToDouble!IsIntegerT::value, T::value;
 };
 
+
+template class T struct IsArray {
+static const bool value = false;
+};
+
+template class T struct IsArrayT[] {
+static const bool value = true;
+};
+
+template class T, size_t N struct IsArrayT[N] {
+static const bool value = true;
+

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

2012-01-06 Thread ap
Title: [104334] trunk/Source/WebKit2








Revision 104334
Author a...@apple.com
Date 2012-01-06 14:01:00 -0800 (Fri, 06 Jan 2012)


Log Message
[Mac] Thread verifier assertions when printing
https://bugs.webkit.org/show_bug.cgi?id=75738

Reviewed by Sam Weinig.

* UIProcess/API/mac/WKPrintingView.mm:
(-[WKPrintingView dealloc]): Dealloc in main thread, so that WebFrameProxy doesn't get
deref'ed from a secondary one.
(-[WKPrintingView _adjustPrintingMarginsForHeaderAndFooter]): This method calls out to client,
which only expects that on main thread.
(-[WKPrintingView knowsPageRange:]): Call _adjustPrintingMarginsForHeaderAndFooter on main
thread.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104333 => 104334)

--- trunk/Source/WebKit2/ChangeLog	2012-01-06 21:57:22 UTC (rev 104333)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-06 22:01:00 UTC (rev 104334)
@@ -1,5 +1,20 @@
 2012-01-06  Alexey Proskuryakov  a...@apple.com
 
+[Mac] Thread verifier assertions when printing
+https://bugs.webkit.org/show_bug.cgi?id=75738
+
+Reviewed by Sam Weinig.
+
+* UIProcess/API/mac/WKPrintingView.mm:
+(-[WKPrintingView dealloc]): Dealloc in main thread, so that WebFrameProxy doesn't get
+deref'ed from a secondary one.
+(-[WKPrintingView _adjustPrintingMarginsForHeaderAndFooter]): This method calls out to client,
+which only expects that on main thread.
+(-[WKPrintingView knowsPageRange:]): Call _adjustPrintingMarginsForHeaderAndFooter on main
+thread.
+
+2012-01-06  Alexey Proskuryakov  a...@apple.com
+
 Need to allow SCNetworkReachability service in sandbox profile
 https://bugs.webkit.org/show_bug.cgi?id=75724
 rdar://problem/10652415


Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (104333 => 104334)

--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm	2012-01-06 21:57:22 UTC (rev 104333)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm	2012-01-06 22:01:00 UTC (rev 104334)
@@ -30,6 +30,7 @@
 #import PrintInfo.h
 #import WebData.h
 #import WebPageProxy.h
+#import WebCore/WebCoreObjCExtras.h
 #import wtf/MainThread.h
 
 using namespace WebKit;
@@ -56,6 +57,14 @@
 return self;
 }
 
+- (void)dealloc
+{
+if (WebCoreObjCScheduleDeallocateOnMainThread([WKPrintingView class], self))
+return;
+
+[super dealloc];
+}
+
 - (BOOL)isFlipped
 {
 return YES;
@@ -110,6 +119,8 @@
 
 - (void)_adjustPrintingMarginsForHeaderAndFooter
 {
+ASSERT(isMainThread()); // This funciton calls the client, which should only be done on main thread.
+
 NSPrintInfo *info = [_printOperation printInfo];
 NSMutableDictionary *infoDictionary = [info dictionary];
 
@@ -364,7 +375,7 @@
 
 [self _suspendAutodisplay];
 
-[self _adjustPrintingMarginsForHeaderAndFooter];
+[self performSelectorOnMainThread:@selector(_adjustPrintingMarginsForHeaderAndFooter) withObject:nil waitUntilDone:YES];
 
 if ([self _hasPageRects])
 *range = NSMakeRange(1, _printingPageRects.size());






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


[webkit-changes] [104335] trunk/Source/ThirdParty

2012-01-06 Thread andersca
Title: [104335] trunk/Source/ThirdParty








Revision 104335
Author ander...@apple.com
Date 2012-01-06 14:08:13 -0800 (Fri, 06 Jan 2012)


Log Message
Make _javascript_Core.framework a reference and put it in a Frameworks group
https://bugs.webkit.org/show_bug.cgi?id=75740

Reviewed by Mark Rowe.

* gtest/xcode/gtest.xcodeproj/project.pbxproj:

Modified Paths

trunk/Source/ThirdParty/ChangeLog
trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj




Diff

Modified: trunk/Source/ThirdParty/ChangeLog (104334 => 104335)

--- trunk/Source/ThirdParty/ChangeLog	2012-01-06 22:01:00 UTC (rev 104334)
+++ trunk/Source/ThirdParty/ChangeLog	2012-01-06 22:08:13 UTC (rev 104335)
@@ -1,3 +1,12 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Make _javascript_Core.framework a reference and put it in a Frameworks group
+https://bugs.webkit.org/show_bug.cgi?id=75740
+
+Reviewed by Mark Rowe.
+
+* gtest/xcode/gtest.xcodeproj/project.pbxproj:
+
 2012-01-05  Dan Bernstein  m...@apple.com
 
 Made Debug/Release builds of gtest build only for the active architecture.


Modified: trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj (104334 => 104335)

--- trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj	2012-01-06 22:01:00 UTC (rev 104334)
+++ trunk/Source/ThirdParty/gtest/xcode/gtest.xcodeproj/project.pbxproj	2012-01-06 22:08:13 UTC (rev 104335)
@@ -37,6 +37,7 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		1A0A4C4514B7A3B500895135 /* _javascript_Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A0A4C4414B7A3B500895135 /* _javascript_Core.framework */; };
 		224A12A30E9EADCC00BD17FD /* gtest-test-part.h in Headers */ = {isa = PBXBuildFile; fileRef = 224A12A20E9EADCC00BD17FD /* gtest-test-part.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3BF6F2A00E79B5AD000F2EEE /* gtest-type-util.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 3BF6F29F0E79B5AD000F2EEE /* gtest-type-util.h */; };
 		3BF6F2A50E79B616000F2EEE /* gtest-typed-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 3BF6F2A40E79B616000F2EEE /* gtest-typed-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -74,7 +75,6 @@
 		40C84993101A36A60083642A /* libgtest_main.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C8490B101A217E0083642A /* libgtest_main.a */; };
 		40C849A2101A37050083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
 		40C849A4101A37150083642A /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4539C8FF0EC27F6400A70F4C /* gtest.framework */; };
-		444D117514A262FB009FEC3F /* _javascript_Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 444D117414A262FB009FEC3F /* _javascript_Core.framework */; };
 		4539C9340EC280AE00A70F4C /* gtest-param-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 4539C9330EC280AE00A70F4C /* gtest-param-test.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		4539C9380EC280E200A70F4C /* gtest-linked_ptr.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9350EC280E200A70F4C /* gtest-linked_ptr.h */; };
 		4539C9390EC280E200A70F4C /* gtest-param-util-generated.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 4539C9360EC280E200A70F4C /* gtest-param-util-generated.h */; };
@@ -199,6 +199,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1A0A4C4414B7A3B500895135 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		224A12A10E9EADA700BD17FD /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = gtest-all.cc; sourceTree = group; };
 		224A12A20E9EADCC00BD17FD /* gtest-test-part.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gtest-test-part.h; sourceTree = group; };
 		3B238C120E7FE13C00846E11 /* gtest_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_unittest.cc; sourceTree = group; };
@@ -238,7 +239,6 @@
 		40D4CDF30E30E07400294801 /* General.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = General.xcconfig; sourceTree = group; };
 		40D4CDF40E30E07400294801 /* ReleaseProject.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseProject.xcconfig; sourceTree = group; };
 		40D4CF510E30F5E200294801 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = group; };
-		444D117414A262FB009FEC3F /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = _javascript_Core.framework; sourceTree 

[webkit-changes] [104336] trunk/LayoutTests

2012-01-06 Thread dslomov
Title: [104336] trunk/LayoutTests








Revision 104336
Author dslo...@google.com
Date 2012-01-06 14:13:51 -0800 (Fri, 06 Jan 2012)


Log Message
Unreviewed: filed https://bugs.webkit.org/show_bug.cgi?id=75742
and updated chromium-mac expectations for fast/forms/input-disabled-color.html.

* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt




Diff

Modified: trunk/LayoutTests/ChangeLog (104335 => 104336)

--- trunk/LayoutTests/ChangeLog	2012-01-06 22:08:13 UTC (rev 104335)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 22:13:51 UTC (rev 104336)
@@ -1,3 +1,10 @@
+2012-01-06  Dmitry Lomov  dslo...@google.com
+
+Unreviewed: filed https://bugs.webkit.org/show_bug.cgi?id=75742 
+and updated chromium-mac expectations for fast/forms/input-disabled-color.html.
+
+* platform/chromium/test_expectations.txt:
+
 2012-01-06  Tom Sepez  tse...@chromium.org
 
 Pass Content-Security-Policy directives to worker threads.


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104335 => 104336)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 22:08:13 UTC (rev 104335)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 22:13:51 UTC (rev 104336)
@@ -3882,3 +3882,5 @@
 BUGWK75696 MAC LINUX DEBUG: svg/text/text-style-recalc-crash.html = PASS TIMEOUT
 
 BUGWK75716 : fullscreen/video-controls-drag.html = TEXT
+
+BUGWK75742 MAC : fast/forms/input-disabled-color.html = IMAGE 






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


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

2012-01-06 Thread msaboff
Title: [104338] trunk/Source/_javascript_Core








Revision 104338
Author msab...@apple.com
Date 2012-01-06 14:15:31 -0800 (Fri, 06 Jan 2012)


Log Message
Default HashTraits for Opcode don't work for Opcode = 0
https://bugs.webkit.org/show_bug.cgi?id=75595

Reviewed by Oliver Hunt.

Removed the populating of the m_opcodeIDTable table in the
case where the OpcodeID and Opcode are the same (m_enabled is false).
Instead we just cast the one type to the other.

* interpreter/Interpreter.cpp:
(JSC::Interpreter::initialize):
(JSC::Interpreter::isOpcode):
* interpreter/Interpreter.h:
(JSC::Interpreter::getOpcodeID):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/interpreter/Interpreter.cpp
trunk/Source/_javascript_Core/interpreter/Interpreter.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104337 => 104338)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 22:14:49 UTC (rev 104337)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 22:15:31 UTC (rev 104338)
@@ -1,3 +1,20 @@
+2012-01-05  Michael Saboff  msab...@apple.com
+
+Default HashTraits for Opcode don't work for Opcode = 0
+https://bugs.webkit.org/show_bug.cgi?id=75595
+
+Reviewed by Oliver Hunt.
+
+Removed the populating of the m_opcodeIDTable table in the
+case where the OpcodeID and Opcode are the same (m_enabled is false).
+Instead we just cast the one type to the other.
+
+* interpreter/Interpreter.cpp:
+(JSC::Interpreter::initialize):
+(JSC::Interpreter::isOpcode):
+* interpreter/Interpreter.h:
+(JSC::Interpreter::getOpcodeID):
+
 2012-01-06  Sam Weinig  s...@webkit.org
 
 Add a DecayArray type trait as a first step towards merging OwnPtr and OwnArrayPtr


Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.cpp (104337 => 104338)

--- trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2012-01-06 22:14:49 UTC (rev 104337)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.cpp	2012-01-06 22:15:31 UTC (rev 104338)
@@ -556,7 +556,6 @@
 for (int i = 0; i  numOpcodeIDs; ++i) {
 Opcode opcode = bitwise_castvoid*(static_castuintptr_t(i));
 m_opcodeTable[i] = opcode;
-m_opcodeIDTable.add(opcode, static_castOpcodeID(i));
 }
 } else {
 privateExecute(InitializeAndReturn, 0, 0);
@@ -669,6 +668,8 @@
 bool Interpreter::isOpcode(Opcode opcode)
 {
 #if ENABLE(COMPUTED_GOTO_INTERPRETER)
+if (!m_enabled)
+return opcode = 0  static_castOpcodeID(bitwise_castuintptr_t(opcode)) = op_end;
 return opcode != HashTraitsOpcode::emptyValue()
  !HashTraitsOpcode::isDeletedValue(opcode)
  m_opcodeIDTable.contains(opcode);


Modified: trunk/Source/_javascript_Core/interpreter/Interpreter.h (104337 => 104338)

--- trunk/Source/_javascript_Core/interpreter/Interpreter.h	2012-01-06 22:14:49 UTC (rev 104337)
+++ trunk/Source/_javascript_Core/interpreter/Interpreter.h	2012-01-06 22:15:31 UTC (rev 104338)
@@ -114,11 +114,9 @@
 ASSERT(m_initialized);
 #if ENABLE(COMPUTED_GOTO_INTERPRETER)
 ASSERT(isOpcode(opcode));
-if (!m_enabled) {
-OpcodeID result = static_castOpcodeID(bitwise_castuintptr_t(opcode));
-ASSERT(result == m_opcodeIDTable.get(opcode));
-return result;
-}
+if (!m_enabled)
+return static_castOpcodeID(bitwise_castuintptr_t(opcode));
+
 return m_opcodeIDTable.get(opcode);
 #else
 return opcode;






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


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

2012-01-06 Thread weinig
Title: [104339] trunk/Source/_javascript_Core








Revision 104339
Author wei...@apple.com
Date 2012-01-06 14:22:45 -0800 (Fri, 06 Jan 2012)


Log Message
Fix windows build.

* wtf/TypeTraits.cpp:

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/wtf/TypeTraits.cpp




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104338 => 104339)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 22:15:31 UTC (rev 104338)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 22:22:45 UTC (rev 104339)
@@ -1,3 +1,9 @@
+2012-01-06  Sam Weinig  s...@webkit.org
+
+Fix windows build.
+
+* wtf/TypeTraits.cpp:
+
 2012-01-05  Michael Saboff  msab...@apple.com
 
 Default HashTraits for Opcode don't work for Opcode = 0


Modified: trunk/Source/_javascript_Core/wtf/TypeTraits.cpp (104338 => 104339)

--- trunk/Source/_javascript_Core/wtf/TypeTraits.cpp	2012-01-06 22:15:31 UTC (rev 104338)
+++ trunk/Source/_javascript_Core/wtf/TypeTraits.cpp	2012-01-06 22:22:45 UTC (rev 104339)
@@ -152,7 +152,4 @@
 COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArray::Type::value), WTF_Test_DecayArray_int_array);
 COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArraySized::Type::value), WTF_Test_DecayArray_int_sized_array);
 
-COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArray::Type::value), WTF_Test_DecayArray_int_array_reference);
-COMPILE_ASSERT((IsSameTypeint*, DecayArrayIntArraySized::Type::value), WTF_Test_DecayArray_int_sized_array_reference);
-
 } // namespace WTF






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


[webkit-changes] [104340] trunk/Tools

2012-01-06 Thread dpranke
Title: [104340] trunk/Tools








Revision 104340
Author dpra...@chromium.org
Date 2012-01-06 14:27:18 -0800 (Fri, 06 Jan 2012)


Log Message
webkitpy: clean up test/uri conversion routines
https://bugs.webkit.org/show_bug.cgi?id=75648

Reviewed by Eric Seidel.

This change moves test_to_uri and uri_to_test from the Port
class to the Driver class (the routines were only being
called by the drivers), and removes a bunch of stale and/or
busted logic.

* Scripts/webkitpy/layout_tests/port/base.py:
* Scripts/webkitpy/layout_tests/port/base_unittest.py:
* Scripts/webkitpy/layout_tests/port/chromium.py:
* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
* Scripts/webkitpy/layout_tests/port/driver.py:
(is_http_test):
(test_to_uri):
(uri_to_test):
* Scripts/webkitpy/layout_tests/port/mock_drt.py:
(run_one_test):
* Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
(MockDRTTest.input_line):
(input_line):
(expected_output):
* Scripts/webkitpy/layout_tests/port/test.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
(_command_from_driver_input):

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py
trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py


Added Paths

trunk/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py




Diff

Modified: trunk/Tools/ChangeLog (104339 => 104340)

--- trunk/Tools/ChangeLog	2012-01-06 22:22:45 UTC (rev 104339)
+++ trunk/Tools/ChangeLog	2012-01-06 22:27:18 UTC (rev 104340)
@@ -1,3 +1,33 @@
+2012-01-05  Dirk Pranke  dpra...@chromium.org
+
+webkitpy: clean up test/uri conversion routines
+https://bugs.webkit.org/show_bug.cgi?id=75648
+
+Reviewed by Eric Seidel.
+
+This change moves test_to_uri and uri_to_test from the Port
+class to the Driver class (the routines were only being
+called by the drivers), and removes a bunch of stale and/or
+busted logic.
+
+* Scripts/webkitpy/layout_tests/port/base.py:
+* Scripts/webkitpy/layout_tests/port/base_unittest.py:
+* Scripts/webkitpy/layout_tests/port/chromium.py:
+* Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+* Scripts/webkitpy/layout_tests/port/driver.py:
+(is_http_test):
+(test_to_uri):
+(uri_to_test):
+* Scripts/webkitpy/layout_tests/port/mock_drt.py:
+(run_one_test):
+* Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+(MockDRTTest.input_line):
+(input_line):
+(expected_output):
+* Scripts/webkitpy/layout_tests/port/test.py:
+* Scripts/webkitpy/layout_tests/port/webkit.py:
+(_command_from_driver_input):
+
 2012-01-06  Simon Fraser  simon.fra...@apple.com
 
 Mitigate scrollbar differences when running pixel tests


Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (104339 => 104340)

--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2012-01-06 22:22:45 UTC (rev 104339)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py	2012-01-06 22:27:18 UTC (rev 104340)
@@ -39,6 +39,7 @@
 import re
 
 from webkitpy.common.memoized import memoized
+from webkitpy.common.system import path
 
 
 # Handle Python  2.6 where multiprocessing isn't available.
@@ -49,7 +50,6 @@
 
 from webkitpy.common import find_files
 from webkitpy.common.system import logutils
-from webkitpy.common.system import path
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.layout_tests import read_checksum_from_png
@@ -461,33 +461,6 @@
 filename = self._filesystem.join(self.layout_tests_dir(), test_name)
 return filename in reftest_list
 
-def test_to_uri(self, test_name):
-Convert a test name to a URI.
-LAYOUTTEST_HTTP_DIR = http/tests/
-LAYOUTTEST_WEBSOCKET_DIR = http/tests/websocket/tests/
-
-port = None
-
-relative_path = test_name
-if (relative_path.startswith(LAYOUTTEST_WEBSOCKET_DIR)
-or relative_path.startswith(LAYOUTTEST_HTTP_DIR)):
-relative_path = relative_path[len(LAYOUTTEST_HTTP_DIR):]
-port = 8000
-
-# Make http/tests/local run as local files. This is to mimic the
-# logic in run-webkit-tests.
-#
-# TODO(dpranke): remove the SSL reference?
-if (port and not relative_path.startswith(local/)):
-if relative_path.startswith(ssl/):
-port += 443
-protocol = https
-  

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

2012-01-06 Thread andersca
Title: [104341] trunk/Source/WebCore








Revision 104341
Author ander...@apple.com
Date 2012-01-06 14:27:45 -0800 (Fri, 06 Jan 2012)


Log Message
Fix Snow Leopard build.

* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::immediateScrollBy):
Move the function definition inside #if ENABLE(RUBBER_BANDING).

Modified Paths

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




Diff

Modified: trunk/Source/WebCore/ChangeLog (104340 => 104341)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 22:27:18 UTC (rev 104340)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 22:27:45 UTC (rev 104341)
@@ -1,3 +1,11 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Fix Snow Leopard build.
+
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::immediateScrollBy):
+Move the function definition inside #if ENABLE(RUBBER_BANDING).
+
 2012-01-04  Jon Lee  jon...@apple.com
 
 Clicking on the cancel button on readonly and disabled search fields darkens as if the search field was editable


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104340 => 104341)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 22:27:18 UTC (rev 104340)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 22:27:45 UTC (rev 104341)
@@ -690,19 +690,6 @@
 notifyPositionChanged();
 }
 
-void ScrollAnimatorMac::immediateScrollBy(const FloatSize delta)
-{
-float newPosX = adjustScrollXPositionIfNecessary(m_currentPosX + delta.width());
-float newPosY = adjustScrollYPositionIfNecessary(m_currentPosY + delta.height());
-
-if (newPosX == m_currentPosX  newPosY == m_currentPosY)
-return;
-
-m_currentPosX = newPosX;
-m_currentPosY = newPosY;
-notifyPositionChanged();
-}
-
 void ScrollAnimatorMac::immediateScrollToPointForScrollAnimation(const FloatPoint newPosition)
 {
 ASSERT(m_scrollAnimationHelper);
@@ -1088,6 +1075,19 @@
 m_scrollableArea-setConstrainsScrollingToContentEdge(true);
 }
 
+void ScrollAnimatorMac::immediateScrollBy(const FloatSize delta)
+{
+float newPosX = adjustScrollXPositionIfNecessary(m_currentPosX + delta.width());
+float newPosY = adjustScrollYPositionIfNecessary(m_currentPosY + delta.height());
+
+if (newPosX == m_currentPosX  newPosY == m_currentPosY)
+return;
+
+m_currentPosX = newPosX;
+m_currentPosY = newPosY;
+notifyPositionChanged();
+}
+
 void ScrollAnimatorMac::startSnapRubberbandTimer()
 {
 m_snapRubberBandTimer.startRepeating(1.0 / 60.0);






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


[webkit-changes] [104342] trunk/Tools

2012-01-06 Thread ddkilzer
Title: [104342] trunk/Tools








Revision 104342
Author ddkil...@apple.com
Date 2012-01-06 14:46:12 -0800 (Fri, 06 Jan 2012)


Log Message
run-api-tests: change internal representation of tests to array of SuiteName.TestName strings

Reviewed by Adam Roben.

Part of: http://webkit.org/b/75065 run-api-tests should be able to run individual suites and tests

* Scripts/run-api-tests:
(dumpTestsBySuite): Update to accept array of tests instead of
hash data structure.
(runTestsBySuite): Ditto.
(listAllTests): Rename from populateTests().  Update to return
an array of tests instad of the hash data structure.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-api-tests




Diff

Modified: trunk/Tools/ChangeLog (104341 => 104342)

--- trunk/Tools/ChangeLog	2012-01-06 22:27:45 UTC (rev 104341)
+++ trunk/Tools/ChangeLog	2012-01-06 22:46:12 UTC (rev 104342)
@@ -1,3 +1,18 @@
+2012-01-06  David Kilzer  ddkil...@apple.com
+
+run-api-tests: change internal representation of tests to array of SuiteName.TestName strings
+
+Reviewed by Adam Roben.
+
+Part of: http://webkit.org/b/75065 run-api-tests should be able to run individual suites and tests
+
+* Scripts/run-api-tests:
+(dumpTestsBySuite): Update to accept array of tests instead of
+hash data structure.
+(runTestsBySuite): Ditto.
+(listAllTests): Rename from populateTests().  Update to return
+an array of tests instad of the hash data structure.
+
 2012-01-05  Dirk Pranke  dpra...@chromium.org
 
 webkitpy: clean up test/uri conversion routines


Modified: trunk/Tools/Scripts/run-api-tests (104341 => 104342)

--- trunk/Tools/Scripts/run-api-tests	2012-01-06 22:27:45 UTC (rev 104341)
+++ trunk/Tools/Scripts/run-api-tests	2012-01-06 22:46:12 UTC (rev 104342)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2010, 2011, 2012 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,10 +39,10 @@
 use VCSUtils;
 
 sub buildTestTool();
-sub dumpTestsBySuite(\%);
-sub populateTests();
+sub dumpTestsBySuite(\@);
+sub listAllTests();
 sub runTest($$$);
-sub runTestsBySuite(\%$);
+sub runTestsBySuite(\@$);
 sub prepareEnvironmentForRunningTestTool();
 sub testToolPath();
 
@@ -85,14 +85,14 @@
 setConfiguration();
 buildTestTool() if $build;
 setPathForRunningWebKitApp(\%ENV);
-my %testsToRun = populateTests();
+my @testsToRun = listAllTests();
 
 if ($dumpTests) {
-dumpTestsBySuite(%testsToRun);
+dumpTestsBySuite(@testsToRun);
 exit 0;
 }
 
-if (runTestsBySuite(%testsToRun, $verbose)) {
+if (runTestsBySuite(@testsToRun, $verbose)) {
 exit 1;
 }
 
@@ -101,30 +101,36 @@
 return isAppleMacWebKit() || isAppleWinWebKit() || isChromium();
 }
 
-sub dumpTestsBySuite(\%)
+sub dumpTestsBySuite(\@)
 {
-my ($testsBySuite) = @_;
+my ($tests) = @_;
 print Dumping test cases\n;
 print --\n;
-for my $suite (sort keys %$testsBySuite) {
-print $suite . :\n;
-print map { . $_ . \n } sort @{ $testsBySuite-{$suite} };
+my $lastSuite = ;
+for my $suiteAndTest (sort @$tests) {
+my ($suite, $test) = split(/\./, $suiteAndTest);
+if ($lastSuite ne $suite) {
+$lastSuite = $suite;
+print $suite:\n;
+}
+print$test\n;
 }
 print --\n;
 }
 
-sub runTestsBySuite(\%$)
+sub runTestsBySuite(\@$)
 {
 my ($tests, $verbose) = @_;
 my $anyFailures = 0;
-for my $suite (sort keys %$tests) {
-print Suite: $suite\n unless $verbose;
-for my $test (sort @{$tests-{$suite}}) {
-my $failed = runTest($suite, $test, $verbose);
-if ($failed) {
-$anyFailures = 1;
-}
+my $lastSuite = ;
+for my $suiteAndTest (sort @$tests) {
+my ($suite, $test) = split(/\./, $suiteAndTest);
+if ($lastSuite ne $suite) {
+$lastSuite = $suite;
+print Suite: $suite\n unless $verbose;
 }
+my $failed = runTest($suite, $test, $verbose);
+$anyFailures ||= $failed;
 }
 
 if ($verbose) {
@@ -212,9 +218,9 @@
 return $timedOut || $result;
 }
 
-sub populateTests()
+sub listAllTests()
 {
-my @tests;
+my @toolOutput;
 my $timedOut;
 
 die run-api-tests is not supported on this platform.\n unless isSupportedPlatform();
@@ -238,7 +244,7 @@
 }
 
 close($childIn);
-@tests = $childOut;
+@toolOutput = $childOut;
 close($childOut);
 close($childErr);
 close(DEVNULL) unless ($verbose);
@@ -251,23 +257,21 @@
 exit exitStatus($result);
 }
 
-my %keyedTests = ();
+my @tests = ();
 my $suite;
-for my $test (@tests) {
-   $test =~ s/[\r\n]*$//;
-   if ($test =~ m/\.$/) {
-  $test 

[webkit-changes] [104343] trunk/Tools

2012-01-06 Thread ddkilzer
Title: [104343] trunk/Tools








Revision 104343
Author ddkil...@apple.com
Date 2012-01-06 14:46:20 -0800 (Fri, 06 Jan 2012)


Log Message
run-api-tests: specify individual suites and tests on the command-line

Reviewed by Adam Roben.

Fixes: http://webkit.org/b/75065 run-api-tests should be able to run individual suites and tests

The run-api-tests script will now accept a list of arguments on
the command-line that are used as prefix filters.  To run all
tests in a suite that starts with WTF (WTF and WTF_Vector)
use:

$ run-api-tests WTF

To run only the tests in the WTF suite, not the WTF_Vector
suite, use:

$ run-api-tests WTF.

* Scripts/run-api-tests: Filter tests if any prefix arguments
are passed on the command-line.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/Scripts/run-api-tests




Diff

Modified: trunk/Tools/ChangeLog (104342 => 104343)

--- trunk/Tools/ChangeLog	2012-01-06 22:46:12 UTC (rev 104342)
+++ trunk/Tools/ChangeLog	2012-01-06 22:46:20 UTC (rev 104343)
@@ -1,5 +1,28 @@
 2012-01-06  David Kilzer  ddkil...@apple.com
 
+run-api-tests: specify individual suites and tests on the command-line
+
+Reviewed by Adam Roben.
+
+Fixes: http://webkit.org/b/75065 run-api-tests should be able to run individual suites and tests
+
+The run-api-tests script will now accept a list of arguments on
+the command-line that are used as prefix filters.  To run all
+tests in a suite that starts with WTF (WTF and WTF_Vector)
+use:
+
+$ run-api-tests WTF
+
+To run only the tests in the WTF suite, not the WTF_Vector
+suite, use:
+
+$ run-api-tests WTF.
+
+* Scripts/run-api-tests: Filter tests if any prefix arguments
+are passed on the command-line.
+
+2012-01-06  David Kilzer  ddkil...@apple.com
+
 run-api-tests: change internal representation of tests to array of SuiteName.TestName strings
 
 Reviewed by Adam Roben.


Modified: trunk/Tools/Scripts/run-api-tests (104342 => 104343)

--- trunk/Tools/Scripts/run-api-tests	2012-01-06 22:46:12 UTC (rev 104342)
+++ trunk/Tools/Scripts/run-api-tests	2012-01-06 22:46:20 UTC (rev 104343)
@@ -23,10 +23,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-# Features to add:
-#   - Command line option to run a single test.
-#   - Command line option to run all tests in a suite.
-
 use strict;
 use warnings;
 
@@ -62,7 +58,7 @@
 
 my $programName = basename($0);
 my $usage = EOF;
-Usage: $programName [options]
+Usage: $programName [options] [suite or test prefixes]
   --helpShow this help message
   -v|--verbose  Verbose output
   -d|--dump-tests   Dump the names of testcases without running them
@@ -87,14 +83,14 @@
 setPathForRunningWebKitApp(\%ENV);
 my @testsToRun = listAllTests();
 
+@testsToRun = grep { my $test = $_; grep { $test =~ m/^\Q$_\E/ } @ARGV; } @testsToRun if @ARGV;
+
 if ($dumpTests) {
 dumpTestsBySuite(@testsToRun);
 exit 0;
 }
 
-if (runTestsBySuite(@testsToRun, $verbose)) {
-exit 1;
-}
+exit runTestsBySuite(@testsToRun, $verbose);
 
 sub isSupportedPlatform()
 {






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


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

2012-01-06 Thread abarth
Title: [104344] trunk/Source/WebCore








Revision 104344
Author aba...@webkit.org
Date 2012-01-06 14:54:54 -0800 (Fri, 06 Jan 2012)


Log Message
Move FrameDestructionObserver to its own file
https://bugs.webkit.org/show_bug.cgi?id=75693

Reviewed by Eric Seidel.

We should have one class per file, on general principles.  Also, this
make it possible to use this class in DOMWindow without introducing a
circular include dependency.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Target.pri:
* WebCore.gypi:
* WebCore.vcproj/WebCore.vcproj:
* page/Frame.cpp:
* page/Frame.h:
* page/FrameDestructionObserver.cpp: Added.
(WebCore::FrameDestructionObserver::FrameDestructionObserver):
(WebCore::FrameDestructionObserver::~FrameDestructionObserver):
(WebCore::FrameDestructionObserver::frameDestroyed):
* page/FrameDestructionObserver.h: Added.
(WebCore::FrameDestructionObserver::frame):
* plugins/DOMMimeType.h:
* plugins/DOMPlugin.h:

Modified Paths

trunk/Source/WebCore/CMakeLists.txt
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/GNUmakefile.list.am
trunk/Source/WebCore/Target.pri
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
trunk/Source/WebCore/page/Frame.cpp
trunk/Source/WebCore/page/Frame.h
trunk/Source/WebCore/plugins/DOMMimeType.h
trunk/Source/WebCore/plugins/DOMPlugin.h


Added Paths

trunk/Source/WebCore/page/FrameDestructionObserver.cpp
trunk/Source/WebCore/page/FrameDestructionObserver.h




Diff

Modified: trunk/Source/WebCore/CMakeLists.txt (104343 => 104344)

--- trunk/Source/WebCore/CMakeLists.txt	2012-01-06 22:46:20 UTC (rev 104343)
+++ trunk/Source/WebCore/CMakeLists.txt	2012-01-06 22:54:54 UTC (rev 104344)
@@ -995,6 +995,7 @@
 page/FocusController.cpp
 page/Frame.cpp
 page/FrameActionScheduler.cpp
+page/FrameDestructionObserver.cpp
 page/FrameTree.cpp
 page/FrameView.cpp
 page/Geolocation.cpp


Modified: trunk/Source/WebCore/ChangeLog (104343 => 104344)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 22:46:20 UTC (rev 104343)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 22:54:54 UTC (rev 104344)
@@ -1,3 +1,30 @@
+2012-01-06  Adam Barth  aba...@webkit.org
+
+Move FrameDestructionObserver to its own file
+https://bugs.webkit.org/show_bug.cgi?id=75693
+
+Reviewed by Eric Seidel.
+
+We should have one class per file, on general principles.  Also, this
+make it possible to use this class in DOMWindow without introducing a
+circular include dependency.
+
+* CMakeLists.txt:
+* GNUmakefile.list.am:
+* Target.pri:
+* WebCore.gypi:
+* WebCore.vcproj/WebCore.vcproj:
+* page/Frame.cpp:
+* page/Frame.h:
+* page/FrameDestructionObserver.cpp: Added.
+(WebCore::FrameDestructionObserver::FrameDestructionObserver):
+(WebCore::FrameDestructionObserver::~FrameDestructionObserver):
+(WebCore::FrameDestructionObserver::frameDestroyed):
+* page/FrameDestructionObserver.h: Added.
+(WebCore::FrameDestructionObserver::frame):
+* plugins/DOMMimeType.h:
+* plugins/DOMPlugin.h:
+
 2012-01-06  Anders Carlsson  ander...@apple.com
 
 Fix Snow Leopard build.


Modified: trunk/Source/WebCore/GNUmakefile.list.am (104343 => 104344)

--- trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 22:46:20 UTC (rev 104343)
+++ trunk/Source/WebCore/GNUmakefile.list.am	2012-01-06 22:54:54 UTC (rev 104344)
@@ -2664,6 +2664,8 @@
 	Source/WebCore/page/Frame.h \
 	Source/WebCore/page/FrameActionScheduler.cpp \
 	Source/WebCore/page/FrameActionScheduler.h \
+	Source/WebCore/page/FrameDestructionObserver.cpp \
+	Source/WebCore/page/FrameDestructionObserver.h \
 	Source/WebCore/page/FrameTree.cpp \
 	Source/WebCore/page/FrameTree.h \
 	Source/WebCore/page/FrameView.cpp \


Modified: trunk/Source/WebCore/Target.pri (104343 => 104344)

--- trunk/Source/WebCore/Target.pri	2012-01-06 22:46:20 UTC (rev 104343)
+++ trunk/Source/WebCore/Target.pri	2012-01-06 22:54:54 UTC (rev 104344)
@@ -973,6 +973,7 @@
 page/FocusController.cpp \
 page/Frame.cpp \
 page/FrameActionScheduler.cpp \
+page/FrameDestructionObserver.cpp \
 page/FrameTree.cpp \
 page/FrameView.cpp \
 page/Geolocation.cpp \


Modified: trunk/Source/WebCore/WebCore.gypi (104343 => 104344)

--- trunk/Source/WebCore/WebCore.gypi	2012-01-06 22:46:20 UTC (rev 104343)
+++ trunk/Source/WebCore/WebCore.gypi	2012-01-06 22:54:54 UTC (rev 104344)
@@ -2996,6 +2996,8 @@
 'page/Frame.cpp',
 'page/FrameActionScheduler.cpp',
 'page/FrameActionScheduler.h',
+'page/FrameDestructionObserver.cpp',
+'page/FrameDestructionObserver.h',
 'page/FrameTree.cpp',
 'page/FrameView.cpp',
 'page/Geolocation.cpp',


Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (104343 => 104344)

--- 

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

2012-01-06 Thread andersca
Title: [104345] trunk/Source/WebCore








Revision 104345
Author ander...@apple.com
Date 2012-01-06 14:58:50 -0800 (Fri, 06 Jan 2012)


Log Message
Add and use ScrollElasticityControllerClient::absoluteScrollPosition
https://bugs.webkit.org/show_bug.cgi?id=75744

Reviewed by Dan Bernstein.

* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::absoluteScrollPosition):
(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
* platform/mac/ScrollElasticityController.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm
trunk/Source/WebCore/platform/mac/ScrollElasticityController.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104344 => 104345)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 22:54:54 UTC (rev 104344)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 22:58:50 UTC (rev 104345)
@@ -1,3 +1,16 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Add and use ScrollElasticityControllerClient::absoluteScrollPosition
+https://bugs.webkit.org/show_bug.cgi?id=75744
+
+Reviewed by Dan Bernstein.
+
+* platform/mac/ScrollAnimatorMac.h:
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::absoluteScrollPosition):
+(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+* platform/mac/ScrollElasticityController.h:
+
 2012-01-06  Adam Barth  aba...@webkit.org
 
 Move FrameDestructionObserver to its own file


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (104344 => 104345)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 22:54:54 UTC (rev 104344)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-06 22:58:50 UTC (rev 104345)
@@ -130,6 +130,7 @@
 virtual bool pinnedInDirection(const FloatSize) OVERRIDE;
 virtual bool canScrollHorizontally() OVERRIDE;
 virtual bool canScrollVertically() OVERRIDE;
+virtual WebCore::IntPoint absoluteScrollPosition() OVERRIDE;
 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize) OVERRIDE;
 virtual void immediateScrollBy(const FloatSize) OVERRIDE;
 virtual void startSnapRubberbandTimer() OVERRIDE;


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104344 => 104345)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 22:54:54 UTC (rev 104344)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-06 22:58:50 UTC (rev 104345)
@@ -1068,6 +1068,11 @@
 return scrollbar-enabled();
 }
 
+IntPoint ScrollAnimatorMac::absoluteScrollPosition()
+{
+return m_scrollableArea-visibleContentRect().location() + m_scrollableArea-scrollOrigin();
+}
+
 void ScrollAnimatorMac::immediateScrollByWithoutContentEdgeConstraints(const FloatSize delta)
 {
 m_scrollableArea-setConstrainsScrollingToContentEdge(false);
@@ -1350,7 +1355,7 @@
 return;
 }
 
-m_scrollElasticityController.m_origOrigin = (m_scrollableArea-visibleContentRect().location() + m_scrollableArea-scrollOrigin()) - m_scrollElasticityController.m_startStretch;
+m_scrollElasticityController.m_origOrigin = m_scrollElasticityController.m_client-absoluteScrollPosition() - m_scrollElasticityController.m_startStretch;
 m_scrollElasticityController.m_origVelocity = m_scrollElasticityController.m_momentumVelocity;
 
 // Just like normal scrolling, prefer vertical rubberbanding


Modified: trunk/Source/WebCore/platform/mac/ScrollElasticityController.h (104344 => 104345)

--- trunk/Source/WebCore/platform/mac/ScrollElasticityController.h	2012-01-06 22:54:54 UTC (rev 104344)
+++ trunk/Source/WebCore/platform/mac/ScrollElasticityController.h	2012-01-06 22:58:50 UTC (rev 104345)
@@ -43,6 +43,10 @@
 virtual bool pinnedInDirection(const FloatSize) = 0;
 virtual bool canScrollHorizontally() = 0;
 virtual bool canScrollVertically() = 0;
+
+// Return the absolute scroll position, not relative to the scroll origin.
+virtual WebCore::IntPoint absoluteScrollPosition() = 0;
+
 virtual void immediateScrollBy(const FloatSize) = 0;
 virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize) = 0;
 virtual void startSnapRubberbandTimer() = 0;






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


[webkit-changes] [104346] trunk/LayoutTests

2012-01-06 Thread abarth
Title: [104346] trunk/LayoutTests








Revision 104346
Author aba...@webkit.org
Date 2012-01-06 15:01:21 -0800 (Fri, 06 Jan 2012)


Log Message
Rebaseline editing/input/caret-at-the-edge-of-input.html.

* platform/chromium-mac-leopard/editing/input/caret-at-the-edge-of-input-expected.png:
* platform/chromium-mac-snowleopard/editing/input/caret-at-the-edge-of-input-expected.png:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium-mac-leopard/editing/input/caret-at-the-edge-of-input-expected.png
trunk/LayoutTests/platform/chromium-mac-snowleopard/editing/input/caret-at-the-edge-of-input-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (104345 => 104346)

--- trunk/LayoutTests/ChangeLog	2012-01-06 22:58:50 UTC (rev 104345)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 23:01:21 UTC (rev 104346)
@@ -1,3 +1,10 @@
+2012-01-06  Adam Barth  aba...@webkit.org
+
+Rebaseline editing/input/caret-at-the-edge-of-input.html.
+
+* platform/chromium-mac-leopard/editing/input/caret-at-the-edge-of-input-expected.png:
+* platform/chromium-mac-snowleopard/editing/input/caret-at-the-edge-of-input-expected.png:
+
 2012-01-06  Dmitry Lomov  dslo...@google.com
 
 Unreviewed: filed https://bugs.webkit.org/show_bug.cgi?id=75742 


Modified: trunk/LayoutTests/platform/chromium-mac-leopard/editing/input/caret-at-the-edge-of-input-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/editing/input/caret-at-the-edge-of-input-expected.png

(Binary files differ)





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


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

2012-01-06 Thread noam . rosenthal
Title: [104347] trunk/Source/WebCore








Revision 104347
Author noam.rosent...@nokia.com
Date 2012-01-06 15:13:02 -0800 (Fri, 06 Jan 2012)


Log Message
Enable a compositing trigger for filters
https://bugs.webkit.org/show_bug.cgi?id=75658

This will enable forcing the compositing code path when filters exist for a RenderObject.

Reviewed by Simon Fraser.

No new functionality so no new tests.

* page/ChromeClient.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingLayer):
(WebCore::RenderLayerCompositor::requiresCompositingForFilters):
* rendering/RenderLayerCompositor.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/ChromeClient.h
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
trunk/Source/WebCore/rendering/RenderLayerCompositor.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104346 => 104347)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 23:01:21 UTC (rev 104346)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 23:13:02 UTC (rev 104347)
@@ -1,3 +1,20 @@
+2012-01-06  No'am Rosenthal  noam.rosent...@nokia.com
+
+Enable a compositing trigger for filters
+https://bugs.webkit.org/show_bug.cgi?id=75658
+
+This will enable forcing the compositing code path when filters exist for a RenderObject.
+
+Reviewed by Simon Fraser.
+
+No new functionality so no new tests.
+
+* page/ChromeClient.h:
+* rendering/RenderLayerCompositor.cpp:
+(WebCore::RenderLayerCompositor::requiresCompositingLayer):
+(WebCore::RenderLayerCompositor::requiresCompositingForFilters):
+* rendering/RenderLayerCompositor.h:
+
 2012-01-06  Anders Carlsson  ander...@apple.com
 
 Add and use ScrollElasticityControllerClient::absoluteScrollPosition


Modified: trunk/Source/WebCore/page/ChromeClient.h (104346 => 104347)

--- trunk/Source/WebCore/page/ChromeClient.h	2012-01-06 23:01:21 UTC (rev 104346)
+++ trunk/Source/WebCore/page/ChromeClient.h	2012-01-06 23:13:02 UTC (rev 104347)
@@ -258,6 +258,7 @@
 PluginTrigger = 1  2,
 CanvasTrigger = 1  3,
 AnimationTrigger = 1  4,
+FilterTrigger = 1  5,
 AllTriggers = 0x
 };
 typedef unsigned CompositingTriggerFlags;


Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (104346 => 104347)

--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2012-01-06 23:01:21 UTC (rev 104346)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2012-01-06 23:13:02 UTC (rev 104347)
@@ -1331,6 +1331,7 @@
  || clipsCompositingDescendants(layer)
  || requiresCompositingForAnimation(renderer)
  || requiresCompositingForFullScreen(renderer)
+ || requiresCompositingForFilters(renderer)
  || requiresCompositingForPosition(renderer, layer);
 }
 
@@ -1516,6 +1517,19 @@
 #endif
 }
 
+bool RenderLayerCompositor::requiresCompositingForFilters(RenderObject* renderer) const
+{
+#if ENABLE(CSS_FILTERS)
+if (!(m_compositingTriggers  ChromeClient::FilterTrigger))
+return false;
+
+return renderer-hasFilter();
+#else
+UNUSED_PARAM(renderer);
+return false;
+#endif
+}
+
 bool RenderLayerCompositor::requiresCompositingForPosition(RenderObject* renderer, const RenderLayer* layer) const
 {
 // position:fixed elements that create their own stacking context (e.g. have an explicit z-index,


Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (104346 => 104347)

--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h	2012-01-06 23:01:21 UTC (rev 104346)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h	2012-01-06 23:13:02 UTC (rev 104347)
@@ -285,6 +285,7 @@
 bool requiresCompositingForFrame(RenderObject*) const;
 bool requiresCompositingWhenDescendantsAreCompositing(RenderObject*) const;
 bool requiresCompositingForFullScreen(RenderObject*) const;
+bool requiresCompositingForFilters(RenderObject*) const;
 bool requiresCompositingForScrollableFrame() const;
 bool requiresCompositingForPosition(RenderObject*, const RenderLayer*) const;
 






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


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

2012-01-06 Thread fpizlo
Title: [104349] trunk/Source/_javascript_Core








Revision 104349
Author fpi...@apple.com
Date 2012-01-06 15:20:48 -0800 (Fri, 06 Jan 2012)


Log Message
JIT stub slow paths that would be identical to that of an interpreter should be factored out
https://bugs.webkit.org/show_bug.cgi?id=75743
rdar://problem/10657024

Reviewed by Geoff Garen.

* GNUmakefile.list.am:
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj:
* _javascript_Core.xcodeproj/project.pbxproj:
* jit/JITStubs.cpp:
(JSC::DEFINE_STUB_FUNCTION):
* runtime/CommonSlowPaths.h: Added.
(JSC::CommonSlowPaths::opInstanceOfSlow):
(JSC::CommonSlowPaths::opIn):
(JSC::CommonSlowPaths::opResolve):
(JSC::CommonSlowPaths::opResolveSkip):
(JSC::CommonSlowPaths::opResolveWithBase):
(JSC::CommonSlowPaths::opResolveWithThis):

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/GNUmakefile.list.am
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj
trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj
trunk/Source/_javascript_Core/jit/JITStubs.cpp


Added Paths

trunk/Source/_javascript_Core/runtime/CommonSlowPaths.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104348 => 104349)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-06 23:16:52 UTC (rev 104348)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-06 23:20:48 UTC (rev 104349)
@@ -1,3 +1,24 @@
+2012-01-06  Filip Pizlo  fpi...@apple.com
+
+JIT stub slow paths that would be identical to that of an interpreter should be factored out
+https://bugs.webkit.org/show_bug.cgi?id=75743
+rdar://problem/10657024
+
+Reviewed by Geoff Garen.
+
+* GNUmakefile.list.am:
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj:
+* _javascript_Core.xcodeproj/project.pbxproj:
+* jit/JITStubs.cpp:
+(JSC::DEFINE_STUB_FUNCTION):
+* runtime/CommonSlowPaths.h: Added.
+(JSC::CommonSlowPaths::opInstanceOfSlow):
+(JSC::CommonSlowPaths::opIn):
+(JSC::CommonSlowPaths::opResolve):
+(JSC::CommonSlowPaths::opResolveSkip):
+(JSC::CommonSlowPaths::opResolveWithBase):
+(JSC::CommonSlowPaths::opResolveWithThis):
+
 2012-01-06  Sam Weinig  s...@webkit.org
 
 Fix windows build.


Modified: trunk/Source/_javascript_Core/GNUmakefile.list.am (104348 => 104349)

--- trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-01-06 23:16:52 UTC (rev 104348)
+++ trunk/Source/_javascript_Core/GNUmakefile.list.am	2012-01-06 23:20:48 UTC (rev 104349)
@@ -325,6 +325,7 @@
 	Source/_javascript_Core/runtime/ClassInfo.h \
 	Source/_javascript_Core/runtime/CommonIdentifiers.cpp \
 	Source/_javascript_Core/runtime/CommonIdentifiers.h \
+	Source/_javascript_Core/runtime/CommonSlowPaths.h \
 	Source/_javascript_Core/runtime/Completion.cpp \
 	Source/_javascript_Core/runtime/Completion.h \
 	Source/_javascript_Core/runtime/ConstructData.cpp \


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj (104348 => 104349)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj	2012-01-06 23:16:52 UTC (rev 104348)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.vcproj	2012-01-06 23:20:48 UTC (rev 104349)
@@ -594,6 +594,10 @@
 
 			/File
 			File
+RelativePath=..\..\runtime\CommonSlowPaths.h
+
+			/File
+			File
 RelativePath=..\..\runtime\Completion.cpp
 
 			/File


Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (104348 => 104349)

--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 23:16:52 UTC (rev 104348)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2012-01-06 23:20:48 UTC (rev 104349)
@@ -48,6 +48,7 @@
 		0BAC94A01338728400CF135B /* ThreadRestrictionVerifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BAC949E1338728400CF135B /* ThreadRestrictionVerifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0BCD83571485845200EA2003 /* TemporaryChange.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BCD83541485841200EA2003 /* TemporaryChange.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0BF28A2911A33DC300638F84 /* SizeLimits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0BF28A2811A33DC300638F84 /* SizeLimits.cpp */; };
+		0F15F15F14B7A73E005DE37D /* CommonSlowPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0F16D726142C39C000CF784A /* BitVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F16D724142C39A200CF784A /* BitVector.cpp */; };
 		0F242DA713F3B1E8007ADD4C /* WeakReferenceHarvester.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F242DA513F3B1BB007ADD4C /* WeakReferenceHarvester.h */; settings = 

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

2012-01-06 Thread rniwa
Title: [104350] trunk/Source/WebCore








Revision 104350
Author rn...@webkit.org
Date 2012-01-06 15:28:47 -0800 (Fri, 06 Jan 2012)


Log Message
Touch a bunch of files in an attempt to fix Mac release builds.

* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::get):
* accessibility/AccessibilityAllInOne.cpp:
* editing/visible_units.cpp:
(WebCore::previousBoundary):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AXObjectCache.cpp
trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp
trunk/Source/WebCore/editing/visible_units.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (104349 => 104350)

--- trunk/Source/WebCore/ChangeLog	2012-01-06 23:20:48 UTC (rev 104349)
+++ trunk/Source/WebCore/ChangeLog	2012-01-06 23:28:47 UTC (rev 104350)
@@ -1,3 +1,13 @@
+2012-01-06  Ryosuke Niwa  rn...@webkit.org
+
+Touch a bunch of files in an attempt to fix Mac release builds.
+
+* accessibility/AXObjectCache.cpp:
+(WebCore::AXObjectCache::get):
+* accessibility/AccessibilityAllInOne.cpp:
+* editing/visible_units.cpp:
+(WebCore::previousBoundary):
+
 2012-01-06  No'am Rosenthal  noam.rosent...@nokia.com
 
 Enable a compositing trigger for filters


Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (104349 => 104350)

--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2012-01-06 23:20:48 UTC (rev 104349)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp	2012-01-06 23:28:47 UTC (rev 104350)
@@ -178,7 +178,7 @@
 ASSERT(!HashTraitsAXID::isDeletedValue(axID));
 if (!axID)
 return 0;
-
+
 return m_objects.get(axID).get();
 }
 


Modified: trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp (104349 => 104350)

--- trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp	2012-01-06 23:20:48 UTC (rev 104349)
+++ trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp	2012-01-06 23:28:47 UTC (rev 104350)
@@ -44,3 +44,4 @@
 #include AccessibilityTableColumn.cpp
 #include AccessibilityTableHeaderContainer.cpp
 #include AccessibilityTableRow.cpp
+


Modified: trunk/Source/WebCore/editing/visible_units.cpp (104349 => 104350)

--- trunk/Source/WebCore/editing/visible_units.cpp	2012-01-06 23:20:48 UTC (rev 104349)
+++ trunk/Source/WebCore/editing/visible_units.cpp	2012-01-06 23:28:47 UTC (rev 104350)
@@ -88,7 +88,7 @@
 
 searchRange-setStart(start.deprecatedNode(), start.deprecatedEditingOffset(), ec);
 searchRange-setEnd(end.deprecatedNode(), end.deprecatedEditingOffset(), ec);
-
+
 ASSERT(!ec);
 if (ec)
 return VisiblePosition();






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


[webkit-changes] [104351] trunk/Tools

2012-01-06 Thread simon . fraser
Title: [104351] trunk/Tools








Revision 104351
Author simon.fra...@apple.com
Date 2012-01-06 15:34:53 -0800 (Fri, 06 Jan 2012)


Log Message
Pixel results from DumpRenderTree and WebKitTestRunner don't match because of colorspace issues
https://bugs.webkit.org/show_bug.cgi?id=75662

Reviewed by Dan Bernstein.

The pixel results generated by DumpRenderTree and WebKitTestRunner differed because
of color profile issues. Fix by keeping everything in device RGB and ensuring that the
test window uses the main display's color space, so that the pixel values in the bitmap
that gets checksummed are identical to the CSS colors.

Removed the code that switches the display profile in DRT, since that is no longer required.

* DumpRenderTree/PixelDumpSupport.h: Remove unused function declarations.
* DumpRenderTree/mac/DumpRenderTree.mm:
(crashHandler): Remove code that switches display profiles.
(prepareConsistentTestingEnvironment): Ditto.
(dumpRenderTree): Ditto.
* DumpRenderTree/mac/PixelDumpSupportMac.mm: Ditto.
(createBitmapContext): Use DeviceRGB for the bitmap colorspace.
(createBitmapContextFromWebView): Add comment about the colorspace handling.
* WebKitTestRunner/cg/TestInvocationCG.cpp:
(WTR::createCGContextFromImage): Use a RetainPtr, add comment.
(WTR::computeMD5HashStringForContext): Simplify the #ifdefs around the braces.
* WebKitTestRunner/mac/PlatformWebViewMac.mm:
(WTR::PlatformWebView::PlatformWebView): Set the window's colorspace to that of the main display.
(WTR::PlatformWebView::windowSnapshotImage): Add comment about colorspaces.

Modified Paths

trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/PixelDumpSupport.h
trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm
trunk/Tools/DumpRenderTree/mac/PixelDumpSupportMac.mm
trunk/Tools/WebKitTestRunner/cg/TestInvocationCG.cpp
trunk/Tools/WebKitTestRunner/mac/PlatformWebViewMac.mm




Diff

Modified: trunk/Tools/ChangeLog (104350 => 104351)

--- trunk/Tools/ChangeLog	2012-01-06 23:28:47 UTC (rev 104350)
+++ trunk/Tools/ChangeLog	2012-01-06 23:34:53 UTC (rev 104351)
@@ -1,3 +1,32 @@
+2012-01-06  Simon Fraser  simon.fra...@apple.com
+
+Pixel results from DumpRenderTree and WebKitTestRunner don't match because of colorspace issues
+https://bugs.webkit.org/show_bug.cgi?id=75662
+
+Reviewed by Dan Bernstein.
+
+The pixel results generated by DumpRenderTree and WebKitTestRunner differed because
+of color profile issues. Fix by keeping everything in device RGB and ensuring that the
+test window uses the main display's color space, so that the pixel values in the bitmap
+that gets checksummed are identical to the CSS colors.
+
+Removed the code that switches the display profile in DRT, since that is no longer required.
+
+* DumpRenderTree/PixelDumpSupport.h: Remove unused function declarations.
+* DumpRenderTree/mac/DumpRenderTree.mm:
+(crashHandler): Remove code that switches display profiles.
+(prepareConsistentTestingEnvironment): Ditto.
+(dumpRenderTree): Ditto.
+* DumpRenderTree/mac/PixelDumpSupportMac.mm: Ditto.
+(createBitmapContext): Use DeviceRGB for the bitmap colorspace.
+(createBitmapContextFromWebView): Add comment about the colorspace handling.
+* WebKitTestRunner/cg/TestInvocationCG.cpp:
+(WTR::createCGContextFromImage): Use a RetainPtr, add comment.
+(WTR::computeMD5HashStringForContext): Simplify the #ifdefs around the braces.
+* WebKitTestRunner/mac/PlatformWebViewMac.mm:
+(WTR::PlatformWebView::PlatformWebView): Set the window's colorspace to that of the main display.
+(WTR::PlatformWebView::windowSnapshotImage): Add comment about colorspaces.
+
 2012-01-06  David Kilzer  ddkil...@apple.com
 
 run-api-tests: specify individual suites and tests on the command-line


Modified: trunk/Tools/DumpRenderTree/PixelDumpSupport.h (104350 => 104351)

--- trunk/Tools/DumpRenderTree/PixelDumpSupport.h	2012-01-06 23:28:47 UTC (rev 104350)
+++ trunk/Tools/DumpRenderTree/PixelDumpSupport.h	2012-01-06 23:34:53 UTC (rev 104351)
@@ -42,14 +42,4 @@
 void dumpWebViewAsPixelsAndCompareWithExpected(const std::string expectedHash);
 void printPNG(const unsigned char* data, const size_t dataLength, const char* checksum);
 
-#if PLATFORM(MAC)
-
-// Can be used as a signal handler
-void restoreMainDisplayColorProfile(int ignored);
-
-// May change your color space, requiring a call to restoreMainDisplayColorProfile
-void setupMainDisplayColorProfile();
-
-#endif
-
 #endif // PixelDumpSupport_h


Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (104350 => 104351)

--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-01-06 23:28:47 UTC (rev 104350)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-01-06 23:34:53 UTC (rev 104351)
@@ -699,7 +699,6 @@
 char *signalName = strsignal(sig);
 write(STDERR_FILENO, signalName, strlen(signalName));
 

[webkit-changes] [104353] trunk/LayoutTests

2012-01-06 Thread commit-queue
Title: [104353] trunk/LayoutTests








Revision 104353
Author commit-qu...@webkit.org
Date 2012-01-06 15:41:30 -0800 (Fri, 06 Jan 2012)


Log Message
LayoutTests/platform/chromium/fast/events/intercept-postmessage.html failing
https://bugs.webkit.org/show_bug.cgi?id=75718

Patch by Charlie Reis cr...@chromium.org on 2012-01-06
Reviewed by Adam Barth.

Removing unnecessary log messages.

* platform/chromium/fast/events/intercept-postmessage-expected.txt:
* platform/chromium/fast/events/intercept-postmessage.html:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage-expected.txt
trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage.html




Diff

Modified: trunk/LayoutTests/ChangeLog (104352 => 104353)

--- trunk/LayoutTests/ChangeLog	2012-01-06 23:39:07 UTC (rev 104352)
+++ trunk/LayoutTests/ChangeLog	2012-01-06 23:41:30 UTC (rev 104353)
@@ -1,3 +1,15 @@
+2012-01-06  Charlie Reis  cr...@chromium.org
+
+LayoutTests/platform/chromium/fast/events/intercept-postmessage.html failing
+https://bugs.webkit.org/show_bug.cgi?id=75718
+
+Reviewed by Adam Barth.
+
+Removing unnecessary log messages.
+
+* platform/chromium/fast/events/intercept-postmessage-expected.txt:
+* platform/chromium/fast/events/intercept-postmessage.html:
+
 2012-01-05  Simon Fraser  simon.fra...@apple.com
 
 Avoid falling into tiled layers more often when the device scale factor is  1


Modified: trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage-expected.txt (104352 => 104353)

--- trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage-expected.txt	2012-01-06 23:39:07 UTC (rev 104352)
+++ trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage-expected.txt	2012-01-06 23:41:30 UTC (rev 104353)
@@ -1,6 +1,3 @@
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 intercepted postMessage
 intercepted postMessage
 RECV1


Modified: trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage.html (104352 => 104353)

--- trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage.html	2012-01-06 23:39:07 UTC (rev 104352)
+++ trunk/LayoutTests/platform/chromium/fast/events/intercept-postmessage.html	2012-01-06 23:41:30 UTC (rev 104353)
@@ -37,7 +37,6 @@
   window.addEventListener(message, recvMsg1, false);
 
   if (window.layoutTestController) {
-window.layoutTestController.dumpFrameLoadCallbacks();
 window.layoutTestController.dumpAsText();
 window.layoutTestController.waitUntilDone();
   }






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


[webkit-changes] [104354] trunk/LayoutTests

2012-01-06 Thread commit-queue
Title: [104354] trunk/LayoutTests








Revision 104354
Author commit-qu...@webkit.org
Date 2012-01-06 16:14:51 -0800 (Fri, 06 Jan 2012)


Log Message
[chromium] Rebaseline media/media-document-audio-repaint after 74123 goes in.
https://bugs.webkit.org/show_bug.cgi?id=75505

Patch by Dale Curtis dalecur...@chromium.org on 2012-01-06
Reviewed by Dimitri Glazkov.

* platform/chromium-cg-mac-leopard/media/media-document-audio-repaint-expected.png:
* platform/chromium-cg-mac-snowleopard/media/media-document-audio-repaint-expected.png:
* platform/chromium-gpu-cg-mac/media/media-document-audio-repaint-expected.png:
* platform/chromium-gpu-win/media/media-document-audio-repaint-expected.png:
* platform/chromium-linux/media/media-document-audio-repaint-expected.png:
* platform/chromium-mac-leopard/media/media-document-audio-repaint-expected.png:
* platform/chromium-mac-snowleopard/media/media-document-audio-repaint-expected.png:
* platform/chromium-win/media/media-document-audio-repaint-expected.png:
* platform/chromium/test_expectations.txt:

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/LayoutTests/platform/chromium-cg-mac-leopard/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-gpu-cg-mac/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-gpu-win/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-mac-leopard/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-mac-snowleopard/media/media-document-audio-repaint-expected.png
trunk/LayoutTests/platform/chromium-win/media/media-document-audio-repaint-expected.png




Diff

Modified: trunk/LayoutTests/ChangeLog (104353 => 104354)

--- trunk/LayoutTests/ChangeLog	2012-01-06 23:41:30 UTC (rev 104353)
+++ trunk/LayoutTests/ChangeLog	2012-01-07 00:14:51 UTC (rev 104354)
@@ -1,3 +1,20 @@
+2012-01-06  Dale Curtis  dalecur...@chromium.org
+
+[chromium] Rebaseline media/media-document-audio-repaint after 74123 goes in.
+https://bugs.webkit.org/show_bug.cgi?id=75505
+
+Reviewed by Dimitri Glazkov.
+
+* platform/chromium-cg-mac-leopard/media/media-document-audio-repaint-expected.png:
+* platform/chromium-cg-mac-snowleopard/media/media-document-audio-repaint-expected.png:
+* platform/chromium-gpu-cg-mac/media/media-document-audio-repaint-expected.png:
+* platform/chromium-gpu-win/media/media-document-audio-repaint-expected.png:
+* platform/chromium-linux/media/media-document-audio-repaint-expected.png:
+* platform/chromium-mac-leopard/media/media-document-audio-repaint-expected.png:
+* platform/chromium-mac-snowleopard/media/media-document-audio-repaint-expected.png:
+* platform/chromium-win/media/media-document-audio-repaint-expected.png:
+* platform/chromium/test_expectations.txt:
+
 2012-01-06  Charlie Reis  cr...@chromium.org
 
 LayoutTests/platform/chromium/fast/events/intercept-postmessage.html failing


Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104353 => 104354)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-06 23:41:30 UTC (rev 104353)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-07 00:14:51 UTC (rev 104354)
@@ -2706,10 +2706,6 @@
 // Accelerated 2d for mac isn't supported yet, so SKIP this test for now.
 BUGCR74979 SKIP MAC GPU GPU-CG : media/video-canvas-alpha.html = IMAGE
 
-// Needs rebaseline after BUGWK74123 goes in.
-BUGWK67760 BUGWK75505: media/media-document-audio-repaint.html = IMAGE PASS
-
-
 BUGWK55968 MAC : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE IMAGE+TEXT
 BUGWK55968 WIN DEBUG : compositing/webgl/webgl-nonpremultiplied-blend.html = IMAGE
 


Modified: trunk/LayoutTests/platform/chromium-cg-mac-leopard/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-cg-mac-snowleopard/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-gpu-cg-mac/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-gpu-win/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-linux/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-mac-leopard/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: trunk/LayoutTests/platform/chromium-mac-snowleopard/media/media-document-audio-repaint-expected.png

(Binary files differ)


Modified: 

[webkit-changes] [104356] trunk

2012-01-06 Thread timothy_horton
Title: [104356] trunk








Revision 104356
Author timothy_hor...@apple.com
Date 2012-01-06 16:29:37 -0800 (Fri, 06 Jan 2012)


Log Message
[cg] userSpaceOnUse SVG Patterns have the wrong origin
https://bugs.webkit.org/show_bug.cgi?id=75741
rdar://problem/9383222

Reviewed by Simon Fraser.

The transformation from pattern space to user space should use the userToBase CTM,
not the current CTM.

Test: svg/custom/pattern-userSpaceOnUse-userToBaseTransform.xhtml

* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::applyStrokePattern):
(WebCore::GraphicsContext::applyFillPattern):
(WebCore::GraphicsContext::getCTM):
* platform/graphics/cg/TransformationMatrixCG.cpp:
(WebCore::AffineTransform::AffineTransform): Add a AffineTransform(CGAffineTransform) constructor
* platform/graphics/transforms/AffineTransform.h:

Add a test that ensures that userSpaceOnUse patterns are rendered in the
correct orientation and location in both the accelerated compositing and
regular cases, as well as with SVG translation.

* platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.png: Added.
* platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt: Added.
* svg/custom/pattern-userSpaceOnUse-userToBaseTransform.xhtml: Added.

Modified Paths

trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
trunk/Source/WebCore/platform/graphics/cg/TransformationMatrixCG.cpp
trunk/Source/WebCore/platform/graphics/transforms/AffineTransform.h


Added Paths

trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.png
trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt
trunk/LayoutTests/svg/custom/pattern-userSpaceOnUse-userToBaseTransform.xhtml




Diff

Modified: trunk/LayoutTests/ChangeLog (104355 => 104356)

--- trunk/LayoutTests/ChangeLog	2012-01-07 00:27:48 UTC (rev 104355)
+++ trunk/LayoutTests/ChangeLog	2012-01-07 00:29:37 UTC (rev 104356)
@@ -1,3 +1,19 @@
+2012-01-06  Tim Horton  timothy_hor...@apple.com
+
+[cg] userSpaceOnUse SVG Patterns have the wrong origin
+https://bugs.webkit.org/show_bug.cgi?id=75741
+rdar://problem/9383222
+
+Reviewed by Simon Fraser.
+
+Add a test that ensures that userSpaceOnUse patterns are rendered in the
+correct orientation and location in both the accelerated compositing and
+regular cases, as well as with SVG translation.
+
+* platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.png: Added.
+* platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt: Added.
+* svg/custom/pattern-userSpaceOnUse-userToBaseTransform.xhtml: Added.
+
 2012-01-06  Dale Curtis  dalecur...@chromium.org
 
 [chromium] Rebaseline media/media-document-audio-repaint after 74123 goes in.


Added: trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.png

(Binary files differ)

Property changes on: trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.png
___

Added: svn:mime-type

Added: trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt (0 => 104356)

--- trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt	(rev 0)
+++ trunk/LayoutTests/platform/mac/svg/custom/pattern-userSpaceOnUse-userToBaseTransform-expected.txt	2012-01-07 00:29:37 UTC (rev 104356)
@@ -0,0 +1,42 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x358
+  RenderBlock {html} at (0,0) size 800x358
+RenderBody {body} at (8,8) size 784x342
+  RenderText {#text} at (0,0) size 762x18
+text run at (0,0) width 762: There should be no red displayed on the screen, and the patterns should not change when the browser window is resized.
+  RenderBR {br} at (762,0) size 0x18
+  RenderBR {br} at (0,18) size 0x18
+  RenderSVGRoot {svg} at (8,44) size 202x203
+RenderSVGContainer {g} at (9,45) size 200x200
+  RenderSVGRect {rect} at (9,145) size 100x50 [fill={[type=SOLID] [color=#FF]}] [x=0.00] [y=100.00] [width=100.00] [height=50.00]
+  RenderSVGRect {rect} at (109,45) size 100x50 [fill={[type=SOLID] [color=#FF]}] [x=100.00] [y=0.00] [width=100.00] [height=50.00]
+  RenderSVGRect {rect} at (9,145) size 100x100 [fill={[type=PATTERN] [id=pattern]}] [x=0.00] [y=100.00] [width=100.00] [height=100.00]
+  RenderSVGRect {rect} at (109,45) size 100x100 [fill={[type=PATTERN] [id=pattern]}] [x=100.00] [y=0.00] [width=100.00] [height=100.00]
+  RenderText {#text} at (202,324) size 4x18
+text run at (202,324) width 4:  
+  RenderSVGRoot {svg} at (214,44) size 

[webkit-changes] [104357] branches/subpixellayout

2012-01-06 Thread eae
Title: [104357] branches/subpixellayout








Revision 104357
Author e...@chromium.org
Date 2012-01-06 16:49:32 -0800 (Fri, 06 Jan 2012)


Log Message
Fix overflow in SpatialNavigation::distanceDataForNode.

Modified Paths

branches/subpixellayout/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html
branches/subpixellayout/LayoutTests/platform/mac/fast/table/040-expected.txt
branches/subpixellayout/LayoutTests/platform/mac/fast/table/040-vertical-expected.txt
branches/subpixellayout/Source/WebCore/page/SpatialNavigation.cpp




Diff

Modified: branches/subpixellayout/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html (104356 => 104357)

--- branches/subpixellayout/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html	2012-01-07 00:29:37 UTC (rev 104356)
+++ branches/subpixellayout/LayoutTests/fast/spatial-navigation/snav-unit-overflow-and-scroll-in-direction.html	2012-01-07 00:49:32 UTC (rev 104357)
@@ -5,7 +5,7 @@
 
 1) There is no unit overflow in the Spatial Navigation algorithm while
calculating the best node candidate to move focus to. To test that this
-   page positions some elements 1000 pixels far from each other (distance
+   page positions some elements 100 pixels far from each other (distance
that can considered large enough for most of the Web Pages on the
Internet).
 
@@ -92,7 +92,7 @@
   /head
   body id=some-content xmlns=http://www.w3.org/1999/xhtml
 a id=start href=""
-div style='margin-top:1px'
+div style='margin-top:1000px'
 a id=end href=""
 /div
 div id=console/div


Modified: branches/subpixellayout/LayoutTests/platform/mac/fast/table/040-expected.txt (104356 => 104357)

--- branches/subpixellayout/LayoutTests/platform/mac/fast/table/040-expected.txt	2012-01-07 00:29:37 UTC (rev 104356)
+++ branches/subpixellayout/LayoutTests/platform/mac/fast/table/040-expected.txt	2012-01-07 00:49:32 UTC (rev 104357)
@@ -1,8 +1,8 @@
 layer at (0,0) size 785x626
   RenderView at (0,0) size 785x600
 layer at (0,0) size 785x626
-  RenderBlock {HTML} at (0,0) size 785x626
-RenderBody {BODY} at (8,8) size 769x610
+  RenderBlock {HTML} at (0,0) size 785x627
+RenderBody {BODY} at (8,8) size 769x611
   RenderBlock {H1} at (0,0) size 769x37
 RenderText {#text} at (0,0) size 608x37
   text run at (0,0) width 608: Fixed Columns, Auto Span, Minwidth Table
@@ -14,7 +14,7 @@
   RenderTableRow {TR} at (0,20) size 100x20
 RenderTableCell {TD} at (0,30) size 100x0 [bgcolor=#FFC0CB] [r=1 c=0 rs=1 cs=2]
   RenderBlock {DIV} at (0,0) size 100x0
-  RenderBlock {P} at (0,114) size 769x54
+  RenderBlock {P} at (0,114) size 769x55
 RenderText {#text} at (0,0) size 145x18
   text run at (0,0) width 145: The table width is: 100
 RenderBR {BR} at (145,14) size 0x0
@@ -23,7 +23,7 @@
 RenderBR {BR} at (133,32) size 0x0
 RenderText {#text} at (0,36) size 136x18
   text run at (0,36) width 136: Column Two is: 67%
-  RenderBlock {HR} at (0,184) size 769x2 [border: (1px inset #00)]
+  RenderBlock {HR} at (0,184) size 769x3 [border: (1px inset #00)]
   RenderTable {TABLE} at (0,194) size 600x40
 RenderTableSection {TBODY} at (0,0) size 600x40
   RenderTableRow {TR} at (0,0) size 600x20
@@ -32,7 +32,7 @@
   RenderTableRow {TR} at (0,20) size 600x20
 RenderTableCell {TD} at (0,30) size 600x0 [bgcolor=#FFC0CB] [r=1 c=0 rs=1 cs=2]
   RenderBlock {DIV} at (0,0) size 600x0
-  RenderBlock {P} at (0,250) size 769x54
+  RenderBlock {P} at (0,250) size 769x55
 RenderText {#text} at (0,0) size 145x18
   text run at (0,0) width 145: The table width is: 600
 RenderBR {BR} at (145,14) size 0x0
@@ -41,7 +41,7 @@
 RenderBR {BR} at (133,32) size 0x0
 RenderText {#text} at (0,36) size 136x18
   text run at (0,36) width 136: Column Two is: 67%
-  RenderBlock {HR} at (0,320) size 769x2 [border: (1px inset #00)]
+  RenderBlock {HR} at (0,320) size 769x3 [border: (1px inset #00)]
   RenderTable {TABLE} at (0,330) size 600x56
 RenderTableSection {TBODY} at (0,0) size 600x56
   RenderTableRow {TR} at (0,0) size 600x36
@@ -56,7 +56,7 @@
   RenderTableRow {TR} at (0,36) size 600x20
 RenderTableCell {TD} at (0,46) size 600x0 [bgcolor=#FFC0CB] [r=1 c=0 rs=1 cs=2]
   RenderBlock {DIV} at (0,0) size 600x0
-  RenderBlock {P} at (0,402) size 769x54
+  RenderBlock {P} at (0,402) size 769x55
 RenderText {#text} at (0,0) size 145x18
   text run at (0,0) width 145: The table width is: 600
 RenderBR {BR} at (145,14) size 0x0
@@ -65,7 +65,7 @@
 RenderBR {BR} at (133,32) size 0x0
 RenderText {#text} at (0,36) size 136x18
   text run at 

[webkit-changes] [104358] trunk

2012-01-06 Thread abarth
Title: [104358] trunk








Revision 104358
Author aba...@webkit.org
Date 2012-01-06 16:53:44 -0800 (Fri, 06 Jan 2012)


Log Message
Source/WebCore: WebCore implementation of the Intent object
See http://dvcs.w3.org/hg/web-intents/raw-file/tip/spec/Overview.html
for draft spec.

https://bugs.webkit.org/show_bug.cgi?id=73051

Patch by Greg Billock gbill...@google.com on 2012-01-06
Reviewed by Adam Barth.

Test: web-intents/web-intents-api.html

* WebCore.gypi:
* page/DOMWindow.idl:
* Modules/intents/Intent.cpp: Added.
(WebCore::Intent::Intent):
(WebCore::Intent::action):
(WebCore::Intent::setAction):
(WebCore::Intent::type):
(WebCore::Intent::setType):
(WebCore::Intent::data):
(WebCore::Intent::setData):
(WebCore::Intent::create):
* Modules/intents/Intent.h: Added.
* Modules/intents/Intent.idl: Added.

Source/WebKit/chromium: [Web Intents] Flagged-off WebCore implementation of navigator.startActivity
https://bugs.webkit.org/show_bug.cgi?id=73051

Patch by Greg Billock gbill...@google.com on 2012-01-06
Reviewed by Adam Barth.

* features.gypi:

Modified Paths

trunk/LayoutTests/platform/chromium/test_expectations.txt
trunk/LayoutTests/platform/efl/Skipped
trunk/LayoutTests/platform/gtk/Skipped
trunk/LayoutTests/platform/mac/Skipped
trunk/LayoutTests/platform/qt/Skipped
trunk/LayoutTests/platform/win/Skipped
trunk/LayoutTests/platform/wincairo/Skipped
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/page/DOMWindow.idl
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/features.gypi


Added Paths

trunk/LayoutTests/webintents/
trunk/LayoutTests/webintents/web-intents-api-expected.txt
trunk/LayoutTests/webintents/web-intents-api.html
trunk/Source/WebCore/Modules/intents/
trunk/Source/WebCore/Modules/intents/Intent.cpp
trunk/Source/WebCore/Modules/intents/Intent.h
trunk/Source/WebCore/Modules/intents/Intent.idl




Diff

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (104357 => 104358)

--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-01-07 00:53:44 UTC (rev 104358)
@@ -91,6 +91,10 @@
 // Unskip after changes on both sides have landed and rolled together.
 BUGCR103939 SKIP : http/tests/appcache/wrong-content-type.html = TEXT
 
+// Currently Web Intents is disabled. Tests pass with the proper
+// build flag turned on.
+BUGGBILLOCK SKIP : webintents = FAIL
+
 // -
 // WONTFIX TESTS
 // -


Modified: trunk/LayoutTests/platform/efl/Skipped (104357 => 104358)

--- trunk/LayoutTests/platform/efl/Skipped	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/efl/Skipped	2012-01-07 00:53:44 UTC (rev 104358)
@@ -1928,6 +1928,9 @@
 # Microdata DOM API is not yet enabled.
 fast/dom/MicroData
 
+# Web Intents is not yet enabled.
+webintents/
+
 # Pointer Lock is not implemented.
 pointer-lock/
 


Modified: trunk/LayoutTests/platform/gtk/Skipped (104357 => 104358)

--- trunk/LayoutTests/platform/gtk/Skipped	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/gtk/Skipped	2012-01-07 00:53:44 UTC (rev 104358)
@@ -1435,6 +1435,9 @@
 # https://bugs.webkit.org/show_bug.cgi?id=72248
 editing/spelling/spelling-unified-emulation.html
 
+# Web Intents is not yet enabled.
+webintents/
+
 # Pointer Lock is not implemented.
 pointer-lock/
 


Modified: trunk/LayoutTests/platform/mac/Skipped (104357 => 104358)

--- trunk/LayoutTests/platform/mac/Skipped	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/mac/Skipped	2012-01-07 00:53:44 UTC (rev 104358)
@@ -488,6 +488,9 @@
 # DRT doesn't support overridePreference(WebKit*FontMap...)
 fast/text/international/locale-sensitive-fonts.html
 
+# Web Intents is not yet enabled.
+webintents/
+
 # Pointer Lock is not implemented.
 pointer-lock/
 


Modified: trunk/LayoutTests/platform/qt/Skipped (104357 => 104358)

--- trunk/LayoutTests/platform/qt/Skipped	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/qt/Skipped	2012-01-07 00:53:44 UTC (rev 104358)
@@ -2484,6 +2484,9 @@
 # https://bugs.webkit.org/show_bug.cgi?id=72491
 http/tests/misc/onload-remove-iframe-crash-2.html
 
+# Web Intents is not yet enabled.
+webintents/
+
 # Pointer Lock is not implemented.
 pointer-lock/
 


Modified: trunk/LayoutTests/platform/win/Skipped (104357 => 104358)

--- trunk/LayoutTests/platform/win/Skipped	2012-01-07 00:49:32 UTC (rev 104357)
+++ trunk/LayoutTests/platform/win/Skipped	2012-01-07 00:53:44 UTC (rev 104358)
@@ -1483,6 +1483,9 @@
 # DRT doesn't support overridePreference(WebKit*FontMap...)
 fast/text/international/locale-sensitive-fonts.html
 
+# Web Intents is not yet enabled.
+webintents/
+
 # Pointer Lock is not implemented.
 pointer-lock/
 


Modified: 

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

2012-01-06 Thread commit-queue
Title: [104359] trunk/Source/_javascript_Core








Revision 104359
Author commit-qu...@webkit.org
Date 2012-01-06 16:54:54 -0800 (Fri, 06 Jan 2012)


Log Message
https://bugs.webkit.org/show_bug.cgi?id=75296
JSString should not have JS_EXPORTCLASS annotation

Patch by Hajime Morrita morr...@chromium.org on 2012-01-06
Reviewed by Kevin Ollivier.

* runtime/JSString.h: Removed JS_EXPORTCLASS annotation.
* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
Added missing symbols which were hidden by JS_EXPORTCLASS.

Modified Paths

trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def
trunk/Source/_javascript_Core/runtime/JSString.h




Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (104358 => 104359)

--- trunk/Source/_javascript_Core/ChangeLog	2012-01-07 00:53:44 UTC (rev 104358)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-01-07 00:54:54 UTC (rev 104359)
@@ -1,3 +1,14 @@
+2012-01-06  Hajime Morrita  morr...@chromium.org
+
+https://bugs.webkit.org/show_bug.cgi?id=75296
+JSString should not have JS_EXPORTCLASS annotation
+
+Reviewed by Kevin Ollivier.
+
+* runtime/JSString.h: Removed JS_EXPORTCLASS annotation.
+* _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+Added missing symbols which were hidden by JS_EXPORTCLASS.
+
 2012-01-06  Michael Saboff  msab...@apple.com
 
 JSArray::pop() should compare SparseArrayValueMap::find() to SparseArrayValueMap::notFound()


Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (104358 => 104359)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-01-07 00:53:44 UTC (rev 104358)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def	2012-01-07 00:54:54 UTC (rev 104359)
@@ -296,6 +296,7 @@
 ?retrieveLastCaller@Interpreter@JSC@@QBEXPAVExecState@2@AAH1AAVUString@2@AAVJSValue@2@@Z
 ?s_globalObjectMethodTable@JSGlobalObject@JSC@@1UGlobalObjectMethodTable@2@B
 ?s_info@ExecutableBase@JSC@@2UClassInfo@2@B
+?s_info@JSString@JSC@@2UClassInfo@2@B
 ?setConfigurable@PropertyDescriptor@JSC@@QAEX_N@Z
 ?setDescriptor@PropertyDescriptor@JSC@@QAEXVJSValue@2@I@Z
 ?setDumpsGeneratedCode@BytecodeGenerator@JSC@@SAX_N@Z
@@ -336,6 +337,7 @@
 ?timedWait@ThreadCondition@WTF@@QAE_NAAVMutex@2@N@Z
 ?tlsKeyCount@WTF@@YAAAJXZ
 ?tlsKeys@WTF@@YAPAKXZ
+?toBoolean@JSString@JSC@@QBE_NPAVExecState@2@@Z
 ?toInt32@JSC@@YAHN@Z
 ?toInteger@JSValue@JSC@@QBENPAVExecState@2@@Z
 ?toNumberSlowCase@JSValue@JSC@@ABENPAVExecState@2@@Z


Modified: trunk/Source/_javascript_Core/runtime/JSString.h (104358 => 104359)

--- trunk/Source/_javascript_Core/runtime/JSString.h	2012-01-07 00:53:44 UTC (rev 104358)
+++ trunk/Source/_javascript_Core/runtime/JSString.h	2012-01-07 00:54:54 UTC (rev 104359)
@@ -59,7 +59,7 @@
 
 JSString* jsStringBuilder(JSGlobalData*);
 
-class JS_EXPORTCLASS JSString : public JSCell {
+class JSString : public JSCell {
 public:
 friend class JIT;
 friend class JSGlobalData;






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


[webkit-changes] [104360] trunk/Tools

2012-01-06 Thread simon . fraser
Title: [104360] trunk/Tools








Revision 104360
Author simon.fra...@apple.com
Date 2012-01-06 17:02:05 -0800 (Fri, 06 Jan 2012)


Log Message
Fix DRT build on case-sensitive file systems.

Fix case of include of WebDynamicScrollBarsView.h

* DumpRenderTree/mac/DumpRenderTree.mm:

Modified Paths

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




Diff

Modified: trunk/Tools/ChangeLog (104359 => 104360)

--- trunk/Tools/ChangeLog	2012-01-07 00:54:54 UTC (rev 104359)
+++ trunk/Tools/ChangeLog	2012-01-07 01:02:05 UTC (rev 104360)
@@ -1,5 +1,13 @@
 2012-01-06  Simon Fraser  simon.fra...@apple.com
 
+Fix DRT build on case-sensitive file systems.
+
+Fix case of include of WebDynamicScrollBarsView.h
+
+* DumpRenderTree/mac/DumpRenderTree.mm:
+
+2012-01-06  Simon Fraser  simon.fra...@apple.com
+
 Pixel results from DumpRenderTree and WebKitTestRunner don't match because of colorspace issues
 https://bugs.webkit.org/show_bug.cgi?id=75662
 


Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (104359 => 104360)

--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-01-07 00:54:54 UTC (rev 104359)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm	2012-01-07 01:02:05 UTC (rev 104360)
@@ -68,7 +68,7 @@
 #import WebKit/WebDatabaseManagerPrivate.h
 #import WebKit/WebDocumentPrivate.h
 #import WebKit/WebDeviceOrientationProviderMock.h
-#import WebKit/WebDynamicScrollbarsView.h
+#import WebKit/WebDynamicScrollBarsView.h
 #import WebKit/WebEditingDelegate.h
 #import WebKit/WebFrameView.h
 #import WebKit/WebHistory.h






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


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

2012-01-06 Thread caio . oliveira
Title: [104362] trunk/Source/WebCore








Revision 104362
Author caio.olive...@openbossa.org
Date 2012-01-06 17:23:41 -0800 (Fri, 06 Jan 2012)


Log Message
Use HashMapOwnPtr in SVGAttributeToPropertyMap
https://bugs.webkit.org/show_bug.cgi?id=75734

Reviewed by Daniel Bates.

* svg/properties/SVGAttributeToPropertyMap.cpp:
(WebCore::SVGAttributeToPropertyMap::addProperties):
(WebCore::SVGAttributeToPropertyMap::addProperty): use HashMap::add() to avoid an
extra hash lookup to set a new PropertiesVector.
(WebCore::SVGAttributeToPropertyMap::synchronizeProperties):
* svg/properties/SVGAttributeToPropertyMap.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp
trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104361 => 104362)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 01:22:47 UTC (rev 104361)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 01:23:41 UTC (rev 104362)
@@ -1,3 +1,17 @@
+2012-01-06  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
+
+Use HashMapOwnPtr in SVGAttributeToPropertyMap
+https://bugs.webkit.org/show_bug.cgi?id=75734
+
+Reviewed by Daniel Bates.
+
+* svg/properties/SVGAttributeToPropertyMap.cpp:
+(WebCore::SVGAttributeToPropertyMap::addProperties):
+(WebCore::SVGAttributeToPropertyMap::addProperty): use HashMap::add() to avoid an
+extra hash lookup to set a new PropertiesVector.
+(WebCore::SVGAttributeToPropertyMap::synchronizeProperties):
+* svg/properties/SVGAttributeToPropertyMap.h:
+
 2012-01-06  Greg Billock  gbill...@google.com
 
 WebCore implementation of the Intent object


Modified: trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp (104361 => 104362)

--- trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp	2012-01-07 01:22:47 UTC (rev 104361)
+++ trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp	2012-01-07 01:23:41 UTC (rev 104362)
@@ -31,7 +31,7 @@
 {
 AttributeToPropertiesMap::iterator end = map.m_map.end();
 for (AttributeToPropertiesMap::iterator it = map.m_map.begin(); it != end; ++it) {
-PropertiesVector* vector = it-second;
+PropertiesVector* vector = it-second.get();
 ASSERT(vector);
 
 PropertiesVector::iterator vectorEnd = vector-end();
@@ -44,13 +44,10 @@
 {
 ASSERT(info);
 ASSERT(info-attributeName != anyQName());
-if (PropertiesVector* vector = m_map.get(info-attributeName)) {
-vector-append(info);
-return;
-}
-PropertiesVector* vector = new PropertiesVector;
+OwnPtrPropertiesVector vector = m_map.add(info-attributeName, nullptr).first-second;
+if (!vector)
+vector = adoptPtr(new PropertiesVector);
 vector-append(info);
-m_map.set(info-attributeName, vector);
 }
 
 void SVGAttributeToPropertyMap::animatedPropertiesForAttribute(SVGElement* ownerType, const QualifiedName attributeName, VectorRefPtrSVGAnimatedProperty  properties)
@@ -81,7 +78,7 @@
 ASSERT(contextElement);
 AttributeToPropertiesMap::iterator end = m_map.end();
 for (AttributeToPropertiesMap::iterator it = m_map.begin(); it != end; ++it) {
-PropertiesVector* vector = it-second;
+PropertiesVector* vector = it-second.get();
 ASSERT(vector);
 
 PropertiesVector::iterator vectorEnd = vector-end();


Modified: trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h (104361 => 104362)

--- trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h	2012-01-07 01:22:47 UTC (rev 104361)
+++ trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h	2012-01-07 01:23:41 UTC (rev 104362)
@@ -33,9 +33,6 @@
 
 class SVGAttributeToPropertyMap {
 public:
-SVGAttributeToPropertyMap() { }
-~SVGAttributeToPropertyMap() { deleteAllValues(m_map); }
-
 bool isEmpty() const { return m_map.isEmpty(); }
 
 void addProperties(SVGAttributeToPropertyMap);
@@ -52,7 +49,7 @@
 PassRefPtrSVGAnimatedProperty animatedProperty(SVGElement* contextElement, const QualifiedName attributeName, const SVGPropertyInfo*);
 
 typedef Vectorconst SVGPropertyInfo* PropertiesVector;
-typedef HashMapQualifiedName, PropertiesVector* AttributeToPropertiesMap;
+typedef HashMapQualifiedName, OwnPtrPropertiesVector  AttributeToPropertiesMap;
 AttributeToPropertiesMap m_map;
 };
 






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


[webkit-changes] [104364] branches/safari-534.54-branch/Source/WebKit/win

2012-01-06 Thread lforschler
Title: [104364] branches/safari-534.54-branch/Source/WebKit/win








Revision 104364
Author lforsch...@apple.com
Date 2012-01-06 17:40:56 -0800 (Fri, 06 Jan 2012)


Log Message
Merged r91145.

Modified Paths

branches/safari-534.54-branch/Source/WebKit/win/ChangeLog
branches/safari-534.54-branch/Source/WebKit/win/WebView.h




Diff

Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (104363 => 104364)

--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:40:13 UTC (rev 104363)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:40:56 UTC (rev 104364)
@@ -1,5 +1,17 @@
 2011-1-6  Lucas Forschler  lforsch...@apple.com
 
+Merge 91145
+
+2011-07-15  Simon Fraser  simon.fra...@apple.com
+
+Fix Windows build.
+
+* WebView.h:
+(WebView::backingScaleFactor):
+(WebView::pageScaleFactor):
+
+2011-1-6  Lucas Forschler  lforsch...@apple.com
+
 Merge 104296
 
 2012-01-06  Jessie Berlin  jber...@apple.com


Modified: branches/safari-534.54-branch/Source/WebKit/win/WebView.h (104363 => 104364)

--- branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:40:13 UTC (rev 104363)
+++ branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:40:56 UTC (rev 104364)
@@ -994,6 +994,8 @@
 virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
 virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect inClip);
+virtual float backingScaleFactor() const { return 1; }
+virtual float pageScaleFactor() const { return 1; }
 virtual bool showDebugBorders() const;
 virtual bool showRepaintCounter() const;
 






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


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

2012-01-06 Thread andersca
Title: [104366] trunk/Source/WebCore








Revision 104366
Author ander...@apple.com
Date 2012-01-06 17:56:54 -0800 (Fri, 06 Jan 2012)


Log Message
Move more rubberbanding code into ScrollAnimatorMac::smoothScrollWithEvent
https://bugs.webkit.org/show_bug.cgi?id=75750

Reviewed by Sam Weinig.

* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::handleWheelEvent):
Move rubberbanding related code into smoothScrollWithEvent.

(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
Move code here from handleWheelEvent and made the function return a boolean.

(WebCore::ScrollAnimatorMac::snapRubberBand):
Call the client.

(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
Ditto.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm




Diff

Modified: trunk/Source/WebCore/ChangeLog (104365 => 104366)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 01:55:18 UTC (rev 104365)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 01:56:54 UTC (rev 104366)
@@ -1,3 +1,24 @@
+2012-01-06  Anders Carlsson  ander...@apple.com
+
+Move more rubberbanding code into ScrollAnimatorMac::smoothScrollWithEvent
+https://bugs.webkit.org/show_bug.cgi?id=75750
+
+Reviewed by Sam Weinig.
+
+* platform/mac/ScrollAnimatorMac.h:
+* platform/mac/ScrollAnimatorMac.mm:
+(WebCore::ScrollAnimatorMac::handleWheelEvent):
+Move rubberbanding related code into smoothScrollWithEvent.
+
+(WebCore::ScrollAnimatorMac::smoothScrollWithEvent):
+Move code here from handleWheelEvent and made the function return a boolean.
+
+(WebCore::ScrollAnimatorMac::snapRubberBand):
+Call the client.
+
+(WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
+Ditto.
+
 2012-01-06  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
 
 Use HashMapOwnPtr in SVGAttributeToPropertyMap


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (104365 => 104366)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-07 01:55:18 UTC (rev 104365)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h	2012-01-07 01:56:54 UTC (rev 104366)
@@ -141,7 +141,7 @@
 bool pinnedInDirection(float deltaX, float deltaY);
 void snapRubberBand();
 void snapRubberBandTimerFired(TimerScrollAnimatorMac*);
-void smoothScrollWithEvent(const PlatformWheelEvent);
+bool smoothScrollWithEvent(const PlatformWheelEvent);
 void beginScrollGesture();
 void endScrollGesture();
 


Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (104365 => 104366)

--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-07 01:55:18 UTC (rev 104365)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2012-01-07 01:56:54 UTC (rev 104366)
@@ -995,17 +995,7 @@
 }
 }
 
-bool isMomentumScrollEvent = (wheelEvent.momentumPhase() != PlatformWheelEventPhaseNone);
-if (m_scrollElasticityController.m_ignoreMomentumScrolls  (isMomentumScrollEvent || m_scrollElasticityController.m_snapRubberbandTimerIsActive)) {
-if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseEnded) {
-m_scrollElasticityController.m_ignoreMomentumScrolls = false;
-return true;
-}
-return false;
-}
-
-smoothScrollWithEvent(wheelEvent);
-return true;
+return smoothScrollWithEvent(wheelEvent);
 }
 
 void ScrollAnimatorMac::handleGestureEvent(const PlatformGestureEvent gestureEvent)
@@ -1139,8 +1129,17 @@
 return false;
 }
 
-void ScrollAnimatorMac::smoothScrollWithEvent(const PlatformWheelEvent wheelEvent)
+bool ScrollAnimatorMac::smoothScrollWithEvent(const PlatformWheelEvent wheelEvent)
 {
+bool isMomentumScrollEvent = (wheelEvent.momentumPhase() != PlatformWheelEventPhaseNone);
+if (m_scrollElasticityController.m_ignoreMomentumScrolls  (isMomentumScrollEvent || m_scrollElasticityController.m_snapRubberbandTimerIsActive)) {
+if (wheelEvent.momentumPhase() == PlatformWheelEventPhaseEnded) {
+m_scrollElasticityController.m_ignoreMomentumScrolls = false;
+return true;
+}
+return false;
+}
+
 m_haveScrolledSincePageLoad = true;
 
 float deltaX = m_scrollElasticityController.m_overflowScrollDelta.width();
@@ -1279,6 +1278,8 @@
 m_scrollElasticityController.m_ignoreMomentumScrolls = false;
 m_scrollElasticityController.m_lastMomentumScrollTimestamp = 0;
 }
+
+return true;
 }
 
 void ScrollAnimatorMac::beginScrollGesture()
@@ -1317,7 +1318,7 @@
 m_scrollElasticityController.m_origOrigin = FloatPoint();
 m_scrollElasticityController.m_origVelocity = FloatSize();
 
-m_snapRubberBandTimer.startRepeating(1.0/60.0);
+m_scrollElasticityController.m_client-startSnapRubberbandTimer();
 

[webkit-changes] [104367] branches/safari-534.54-branch/Source/WebKit/win

2012-01-06 Thread lforschler
Title: [104367] branches/safari-534.54-branch/Source/WebKit/win








Revision 104367
Author lforsch...@apple.com
Date 2012-01-06 17:59:50 -0800 (Fri, 06 Jan 2012)


Log Message
rollout uneeded windows build fix.

Modified Paths

branches/safari-534.54-branch/Source/WebKit/win/ChangeLog
branches/safari-534.54-branch/Source/WebKit/win/WebView.h




Diff

Modified: branches/safari-534.54-branch/Source/WebKit/win/ChangeLog (104366 => 104367)

--- branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:56:54 UTC (rev 104366)
+++ branches/safari-534.54-branch/Source/WebKit/win/ChangeLog	2012-01-07 01:59:50 UTC (rev 104367)
@@ -1,17 +1,5 @@
 2011-1-6  Lucas Forschler  lforsch...@apple.com
 
-Merge 91145
-
-2011-07-15  Simon Fraser  simon.fra...@apple.com
-
-Fix Windows build.
-
-* WebView.h:
-(WebView::backingScaleFactor):
-(WebView::pageScaleFactor):
-
-2011-1-6  Lucas Forschler  lforsch...@apple.com
-
 Merge 104296
 
 2012-01-06  Jessie Berlin  jber...@apple.com


Modified: branches/safari-534.54-branch/Source/WebKit/win/WebView.h (104366 => 104367)

--- branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:56:54 UTC (rev 104366)
+++ branches/safari-534.54-branch/Source/WebKit/win/WebView.h	2012-01-07 01:59:50 UTC (rev 104367)
@@ -994,8 +994,6 @@
 virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double time);
 virtual void notifySyncRequired(const WebCore::GraphicsLayer*);
 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect inClip);
-virtual float backingScaleFactor() const { return 1; }
-virtual float pageScaleFactor() const { return 1; }
 virtual bool showDebugBorders() const;
 virtual bool showRepaintCounter() const;
 






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


[webkit-changes] [104368] trunk/Source

2012-01-06 Thread wjmaclean
Title: [104368] trunk/Source








Revision 104368
Author wjmacl...@chromium.org
Date 2012-01-06 18:39:16 -0800 (Fri, 06 Jan 2012)


Log Message
[Chromium] Cull occluded tiles in tiled layers
https://bugs.webkit.org/show_bug.cgi?id=70533

Reviewed by James Robinson.

Source/WebCore:

Unit test provided, must pass all existing GPU layout tests.

* WebCore.gypi:
* platform/graphics/chromium/cc/CCLayerImpl.cpp:
(WebCore::CCLayerImpl::appendQuads):
(WebCore::CCLayerImpl::quadTransform):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
(WebCore::CCLayerTreeHostImpl::calculateRenderPasses):
(WebCore::CCLayerTreeHostImpl::optimizeRenderPasses):
(WebCore::CCLayerTreeHostImpl::drawLayers):
* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
* platform/graphics/chromium/cc/CCQuadCuller.cpp: Added.
(std::swap):
(WebCore::regionContainsRect):
(WebCore::CCQuadCuller::cullOccludedQuads):
* platform/graphics/chromium/cc/CCQuadCuller.h: Added.
(WebCore::CCQuadCuller::CCQuadCuller):
* platform/graphics/chromium/cc/CCRenderPass.cpp:
(WebCore::CCRenderPass::optimizeQuads):
* platform/graphics/chromium/cc/CCRenderPass.h:

Source/WebKit/chromium:

* WebKit.gypi:
* tests/CCQuadCullerTest.cpp: Added.
(WebCore::TestDrawQuad::TestDrawQuad):
(WebCore::TestDrawQuad::create):
(WebCore::setQuads):
(WebCore::TEST):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gypi
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHostImpl.h
trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCRenderPass.h
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/WebKit.gypi


Added Paths

trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.cpp
trunk/Source/WebCore/platform/graphics/chromium/cc/CCQuadCuller.h
trunk/Source/WebKit/chromium/tests/CCQuadCullerTest.cpp




Diff

Modified: trunk/Source/WebCore/ChangeLog (104367 => 104368)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 01:59:50 UTC (rev 104367)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 02:39:16 UTC (rev 104368)
@@ -1,3 +1,31 @@
+2012-01-06  W. James MacLean  wjmacl...@chromium.org
+
+[Chromium] Cull occluded tiles in tiled layers
+https://bugs.webkit.org/show_bug.cgi?id=70533
+
+Reviewed by James Robinson.
+
+Unit test provided, must pass all existing GPU layout tests.
+
+* WebCore.gypi:
+* platform/graphics/chromium/cc/CCLayerImpl.cpp:
+(WebCore::CCLayerImpl::appendQuads):
+(WebCore::CCLayerImpl::quadTransform):
+* platform/graphics/chromium/cc/CCLayerTreeHostImpl.cpp:
+(WebCore::CCLayerTreeHostImpl::calculateRenderPasses):
+(WebCore::CCLayerTreeHostImpl::optimizeRenderPasses):
+(WebCore::CCLayerTreeHostImpl::drawLayers):
+* platform/graphics/chromium/cc/CCLayerTreeHostImpl.h:
+* platform/graphics/chromium/cc/CCQuadCuller.cpp: Added.
+(std::swap):
+(WebCore::regionContainsRect):
+(WebCore::CCQuadCuller::cullOccludedQuads):
+* platform/graphics/chromium/cc/CCQuadCuller.h: Added.
+(WebCore::CCQuadCuller::CCQuadCuller):
+* platform/graphics/chromium/cc/CCRenderPass.cpp:
+(WebCore::CCRenderPass::optimizeQuads):
+* platform/graphics/chromium/cc/CCRenderPass.h:
+
 2012-01-06  Anders Carlsson  ander...@apple.com
 
 Move more rubberbanding code into ScrollAnimatorMac::smoothScrollWithEvent


Modified: trunk/Source/WebCore/WebCore.gypi (104367 => 104368)

--- trunk/Source/WebCore/WebCore.gypi	2012-01-07 01:59:50 UTC (rev 104367)
+++ trunk/Source/WebCore/WebCore.gypi	2012-01-07 02:39:16 UTC (rev 104368)
@@ -3637,6 +3637,8 @@
 'platform/graphics/chromium/cc/CCPluginLayerImpl.h',
 'platform/graphics/chromium/cc/CCProxy.cpp',
 'platform/graphics/chromium/cc/CCProxy.h',
+'platform/graphics/chromium/cc/CCQuadCuller.cpp',
+'platform/graphics/chromium/cc/CCQuadCuller.h',
 'platform/graphics/chromium/cc/CCRenderPass.cpp',
 'platform/graphics/chromium/cc/CCRenderPass.h',
 'platform/graphics/chromium/cc/CCRenderSurface.cpp',


Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp (104367 => 104368)

--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp	2012-01-07 01:59:50 UTC (rev 104367)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerImpl.cpp	2012-01-07 02:39:16 UTC (rev 104368)
@@ -129,8 +129,8 @@
 
 void CCLayerImpl::appendQuads(CCQuadList quadList, const CCSharedQuadState* sharedQuadState)
 {
-IntRect layerRect(IntPoint(), bounds());
-quadList.append(CCCustomLayerDrawQuad::create(sharedQuadState, layerRect, this));
+IntRect quadRect(IntPoint(), bounds());
+

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

2012-01-06 Thread mrowe
Title: [104369] trunk/Source/WebCore








Revision 104369
Author mr...@apple.com
Date 2012-01-06 18:43:54 -0800 (Fri, 06 Jan 2012)


Log Message
Roll out r104362 since it broke the build.

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp
trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104368 => 104369)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 02:39:16 UTC (rev 104368)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 02:43:54 UTC (rev 104369)
@@ -47,20 +47,6 @@
 (WebCore::ScrollAnimatorMac::snapRubberBandTimerFired):
 Ditto.
 
-2012-01-06  Caio Marcelo de Oliveira Filho  caio.olive...@openbossa.org
-
-Use HashMapOwnPtr in SVGAttributeToPropertyMap
-https://bugs.webkit.org/show_bug.cgi?id=75734
-
-Reviewed by Daniel Bates.
-
-* svg/properties/SVGAttributeToPropertyMap.cpp:
-(WebCore::SVGAttributeToPropertyMap::addProperties):
-(WebCore::SVGAttributeToPropertyMap::addProperty): use HashMap::add() to avoid an
-extra hash lookup to set a new PropertiesVector.
-(WebCore::SVGAttributeToPropertyMap::synchronizeProperties):
-* svg/properties/SVGAttributeToPropertyMap.h:
-
 2012-01-06  Greg Billock  gbill...@google.com
 
 WebCore implementation of the Intent object


Modified: trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp (104368 => 104369)

--- trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp	2012-01-07 02:39:16 UTC (rev 104368)
+++ trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp	2012-01-07 02:43:54 UTC (rev 104369)
@@ -31,7 +31,7 @@
 {
 AttributeToPropertiesMap::iterator end = map.m_map.end();
 for (AttributeToPropertiesMap::iterator it = map.m_map.begin(); it != end; ++it) {
-PropertiesVector* vector = it-second.get();
+PropertiesVector* vector = it-second;
 ASSERT(vector);
 
 PropertiesVector::iterator vectorEnd = vector-end();
@@ -44,10 +44,13 @@
 {
 ASSERT(info);
 ASSERT(info-attributeName != anyQName());
-OwnPtrPropertiesVector vector = m_map.add(info-attributeName, nullptr).first-second;
-if (!vector)
-vector = adoptPtr(new PropertiesVector);
+if (PropertiesVector* vector = m_map.get(info-attributeName)) {
+vector-append(info);
+return;
+}
+PropertiesVector* vector = new PropertiesVector;
 vector-append(info);
+m_map.set(info-attributeName, vector);
 }
 
 void SVGAttributeToPropertyMap::animatedPropertiesForAttribute(SVGElement* ownerType, const QualifiedName attributeName, VectorRefPtrSVGAnimatedProperty  properties)
@@ -78,7 +81,7 @@
 ASSERT(contextElement);
 AttributeToPropertiesMap::iterator end = m_map.end();
 for (AttributeToPropertiesMap::iterator it = m_map.begin(); it != end; ++it) {
-PropertiesVector* vector = it-second.get();
+PropertiesVector* vector = it-second;
 ASSERT(vector);
 
 PropertiesVector::iterator vectorEnd = vector-end();


Modified: trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h (104368 => 104369)

--- trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h	2012-01-07 02:39:16 UTC (rev 104368)
+++ trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h	2012-01-07 02:43:54 UTC (rev 104369)
@@ -33,6 +33,9 @@
 
 class SVGAttributeToPropertyMap {
 public:
+SVGAttributeToPropertyMap() { }
+~SVGAttributeToPropertyMap() { deleteAllValues(m_map); }
+
 bool isEmpty() const { return m_map.isEmpty(); }
 
 void addProperties(SVGAttributeToPropertyMap);
@@ -49,7 +52,7 @@
 PassRefPtrSVGAnimatedProperty animatedProperty(SVGElement* contextElement, const QualifiedName attributeName, const SVGPropertyInfo*);
 
 typedef Vectorconst SVGPropertyInfo* PropertiesVector;
-typedef HashMapQualifiedName, OwnPtrPropertiesVector  AttributeToPropertiesMap;
+typedef HashMapQualifiedName, PropertiesVector* AttributeToPropertiesMap;
 AttributeToPropertiesMap m_map;
 };
 






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


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

2012-01-06 Thread ostapenko . viatcheslav
Title: [104370] trunk/Source/WebKit2








Revision 104370
Author ostapenko.viatches...@nokia.com
Date 2012-01-06 18:50:25 -0800 (Fri, 06 Jan 2012)


Log Message
[Qt] [WK2] Minibrowser leaks memory ~6-7Mb per reload
https://bugs.webkit.org/show_bug.cgi?id=75746

Reset WebGraphicsLayer::m_layerTreeTileClient of all dependent
layers from ~LayerTreeHostQt(). This replaces r103760 which
causes leaks of GraphicsLayerTextureMapper objects on UI side.

Reviewed by Noam Rosenthal.

* WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
(WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
(WebCore::WebGraphicsLayer::setLayerTreeTileClient):
* WebProcess/WebCoreSupport/WebGraphicsLayer.h:
* WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
(WebKit::LayerTreeHostQt::~LayerTreeHostQt):

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h
trunk/Source/WebKit2/WebProcess/WebPage/qt/LayerTreeHostQt.cpp




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104369 => 104370)

--- trunk/Source/WebKit2/ChangeLog	2012-01-07 02:43:54 UTC (rev 104369)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-07 02:50:25 UTC (rev 104370)
@@ -1,3 +1,21 @@
+2012-01-06  Viatcheslav Ostapenko  ostapenko.viatches...@nokia.com
+
+[Qt] [WK2] Minibrowser leaks memory ~6-7Mb per reload
+https://bugs.webkit.org/show_bug.cgi?id=75746
+
+Reset WebGraphicsLayer::m_layerTreeTileClient of all dependent 
+layers from ~LayerTreeHostQt(). This replaces r103760 which
+causes leaks of GraphicsLayerTextureMapper objects on UI side. 
+
+Reviewed by Noam Rosenthal.
+
+* WebProcess/WebCoreSupport/WebGraphicsLayer.cpp:
+(WebCore::WebGraphicsLayer::syncCompositingStateForThisLayerOnly):
+(WebCore::WebGraphicsLayer::setLayerTreeTileClient):
+* WebProcess/WebCoreSupport/WebGraphicsLayer.h:
+* WebProcess/WebPage/qt/LayerTreeHostQt.cpp:
+(WebKit::LayerTreeHostQt::~LayerTreeHostQt):
+
 2012-01-06  Alexey Proskuryakov  a...@apple.com
 
 [Mac] Thread verifier assertions when printing


Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp (104369 => 104370)

--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp	2012-01-07 02:43:54 UTC (rev 104369)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.cpp	2012-01-07 02:50:25 UTC (rev 104370)
@@ -401,6 +401,9 @@
 
 void WebGraphicsLayer::syncCompositingStateForThisLayerOnly()
 {
+if (!m_layerTreeTileClient)
+m_layerTreeTileClient = layerTreeTileClient();
+
 updateContentBuffers();
 
 if (!m_modified)
@@ -431,12 +434,11 @@
 for (size_t i = 0; i  children().size(); ++i)
 m_layerInfo.children.append(toWebLayerID(children()[i]));
 
-WebLayerTreeTileClient* tileClient = layerTreeTileClient();
-ASSERT(tileClient);
+ASSERT(m_layerTreeTileClient);
 if (m_layerInfo.imageIsUpdated  m_image  !m_layerInfo.imageBackingStoreID)
-m_layerInfo.imageBackingStoreID = tileClient-adoptImageBackingStore(m_image.get());
+m_layerInfo.imageBackingStoreID = m_layerTreeTileClient-adoptImageBackingStore(m_image.get());
 
-tileClient-didSyncCompositingStateForLayer(m_layerInfo);
+m_layerTreeTileClient-didSyncCompositingStateForLayer(m_layerInfo);
 m_modified = false;
 m_layerInfo.imageIsUpdated = false;
 if (m_hasPendingAnimations)
@@ -612,6 +614,22 @@
 if (m_image)
 setContentsNeedsDisplay();
 }
+
+void WebGraphicsLayer::setLayerTreeTileClient(WebKit::WebLayerTreeTileClient* client)
+{
+if (m_layerTreeTileClient == client)
+return;
+
+for (size_t i = 0; i  children().size(); ++i) {
+WebGraphicsLayer* layer = toWebGraphicsLayer(this-children()[i]);
+layer-setLayerTreeTileClient(client);
+}
+
+// Have to force detach from remote layer here if layer tile client changes.
+if (m_layerTreeTileClient)
+m_layerTreeTileClient-didDeleteLayer(id());
+m_layerTreeTileClient = client;
+}
 #endif
 
 static PassOwnPtrGraphicsLayer createWebGraphicsLayer(GraphicsLayerClient* client)


Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h (104369 => 104370)

--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h	2012-01-07 02:43:54 UTC (rev 104369)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebGraphicsLayer.h	2012-01-07 02:50:25 UTC (rev 104370)
@@ -124,7 +124,7 @@
 virtual void updateTile(int tileID, const WebKit::UpdateInfo);
 virtual void removeTile(int tileID);
 
-void setLayerTreeTileClient(WebKit::WebLayerTreeTileClient* client) { m_layerTreeTileClient = client; }
+void setLayerTreeTileClient(WebKit::WebLayerTreeTileClient*);
 WebKit::WebLayerTreeTileClient* layerTreeTileClient() const;
 
 bool isReadyForTileBufferSwap() const;


Modified: 

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

2012-01-06 Thread commit-queue
Title: [104371] trunk/Source/WebCore








Revision 104371
Author commit-qu...@webkit.org
Date 2012-01-06 19:10:44 -0800 (Fri, 06 Jan 2012)


Log Message
Web Inspector: Missing Implementation of Public InspectorDOMAgent Function
https://bugs.webkit.org/show_bug.cgi?id=75759

Implement missing accessor and make setter public.

Patch by Joseph Pecoraro pecor...@apple.com on 2012-01-06
Reviewed by Timothy Hatcher.

* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::searchingForNodeInPage):
* inspector/InspectorDOMAgent.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
trunk/Source/WebCore/inspector/InspectorDOMAgent.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104370 => 104371)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 02:50:25 UTC (rev 104370)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 03:10:44 UTC (rev 104371)
@@ -1,3 +1,16 @@
+2012-01-06  Joseph Pecoraro  pecor...@apple.com
+
+Web Inspector: Missing Implementation of Public InspectorDOMAgent Function
+https://bugs.webkit.org/show_bug.cgi?id=75759
+
+Implement missing accessor and make setter public.
+
+Reviewed by Timothy Hatcher.
+
+* inspector/InspectorDOMAgent.cpp:
+(WebCore::InspectorDOMAgent::searchingForNodeInPage):
+* inspector/InspectorDOMAgent.h:
+
 2012-01-06  W. James MacLean  wjmacl...@chromium.org
 
 [Chromium] Cull occluded tiles in tiled layers


Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (104370 => 104371)

--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2012-01-07 02:50:25 UTC (rev 104370)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp	2012-01-07 03:10:44 UTC (rev 104371)
@@ -943,6 +943,11 @@
 }
 }
 
+bool InspectorDOMAgent::searchingForNodeInPage() const
+{
+return m_searchingForNode;
+}
+
 void InspectorDOMAgent::setSearchingForNode(bool enabled, InspectorObject* highlightConfig)
 {
 if (m_searchingForNode == enabled)


Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.h (104370 => 104371)

--- trunk/Source/WebCore/inspector/InspectorDOMAgent.h	2012-01-07 02:50:25 UTC (rev 104370)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.h	2012-01-07 03:10:44 UTC (rev 104371)
@@ -169,8 +169,9 @@
 
 PassRefPtrInspectorObject resolveNode(Node*, const String objectGroup);
 bool handleMousePress();
+void mouseDidMoveOverElement(const HitTestResult, unsigned modifierFlags);
 bool searchingForNodeInPage() const;
-void mouseDidMoveOverElement(const HitTestResult, unsigned modifierFlags);
+void setSearchingForNode(bool enabled, InspectorObject* highlightConfig);
 void inspect(Node*);
 void focusNode();
 
@@ -191,7 +192,6 @@
 private:
 InspectorDOMAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorClient*, InspectorState*, InjectedScriptManager*);
 
-void setSearchingForNode(bool enabled, InspectorObject* highlightConfig);
 bool setHighlightDataFromConfig(InspectorObject* highlightConfig);
 void highlight();
 






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


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

2012-01-06 Thread abarth
Title: [104372] trunk/Source/WebCore








Revision 104372
Author aba...@webkit.org
Date 2012-01-06 19:12:01 -0800 (Fri, 06 Jan 2012)


Log Message
DOMWindow should be a FrameDestructionObserver
https://bugs.webkit.org/show_bug.cgi?id=75697

Reviewed by Alexey Proskuryakov.

DOMWindow plays exactly the role of a FrameDestructionObserver, just
with special-case code.  It should just use the general-case code.

* page/DOMWindow.cpp:
(WebCore::DOMWindow::DOMWindow):
(WebCore::DOMWindow::~DOMWindow):
(WebCore::DOMWindow::frameDestroyed):
* page/DOMWindow.h:
* page/Frame.cpp:
(WebCore::Frame::~Frame):
(WebCore::Frame::clearDOMWindow):
(WebCore::Frame::setDOMWindow):
* page/Frame.h:

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/DOMWindow.cpp
trunk/Source/WebCore/page/DOMWindow.h
trunk/Source/WebCore/page/Frame.cpp
trunk/Source/WebCore/page/Frame.h




Diff

Modified: trunk/Source/WebCore/ChangeLog (104371 => 104372)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 03:10:44 UTC (rev 104371)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 03:12:01 UTC (rev 104372)
@@ -1,3 +1,24 @@
+2012-01-06  Adam Barth  aba...@webkit.org
+
+DOMWindow should be a FrameDestructionObserver
+https://bugs.webkit.org/show_bug.cgi?id=75697
+
+Reviewed by Alexey Proskuryakov.
+
+DOMWindow plays exactly the role of a FrameDestructionObserver, just
+with special-case code.  It should just use the general-case code.
+
+* page/DOMWindow.cpp:
+(WebCore::DOMWindow::DOMWindow):
+(WebCore::DOMWindow::~DOMWindow):
+(WebCore::DOMWindow::frameDestroyed):
+* page/DOMWindow.h:
+* page/Frame.cpp:
+(WebCore::Frame::~Frame):
+(WebCore::Frame::clearDOMWindow):
+(WebCore::Frame::setDOMWindow):
+* page/Frame.h:
+
 2012-01-06  Joseph Pecoraro  pecor...@apple.com
 
 Web Inspector: Missing Implementation of Public InspectorDOMAgent Function


Modified: trunk/Source/WebCore/page/DOMWindow.cpp (104371 => 104372)

--- trunk/Source/WebCore/page/DOMWindow.cpp	2012-01-07 03:10:44 UTC (rev 104371)
+++ trunk/Source/WebCore/page/DOMWindow.cpp	2012-01-07 03:12:01 UTC (rev 104372)
@@ -397,16 +397,13 @@
 }
 
 DOMWindow::DOMWindow(Frame* frame)
-: m_shouldPrintWhenFinishedLoading(false)
-, m_frame(frame)
+: FrameDestructionObserver(frame)
+, m_shouldPrintWhenFinishedLoading(false)
 {
 }
 
 DOMWindow::~DOMWindow()
 {
-if (m_frame)
-m_frame-clearFormerDOMWindow(this);
-
 ASSERT(!m_screen);
 ASSERT(!m_selection);
 ASSERT(!m_history);
@@ -473,9 +470,9 @@
 m_securityOrigin = securityOrigin;
 }
 
-void DOMWindow::disconnectFrame()
+void DOMWindow::frameDestroyed()
 {
-m_frame = 0;
+FrameDestructionObserver::frameDestroyed();
 clear();
 }
 


Modified: trunk/Source/WebCore/page/DOMWindow.h (104371 => 104372)

--- trunk/Source/WebCore/page/DOMWindow.h	2012-01-07 03:10:44 UTC (rev 104371)
+++ trunk/Source/WebCore/page/DOMWindow.h	2012-01-07 03:12:01 UTC (rev 104372)
@@ -28,6 +28,7 @@
 #define DOMWindow_h
 
 #include EventTarget.h
+#include FrameDestructionObserver.h
 #include KURL.h
 
 namespace WebCore {
@@ -80,7 +81,7 @@
 
 enum SetLocationLocking { LockHistoryBasedOnGestureState, LockHistoryAndBackForwardList };
 
-class DOMWindow : public RefCountedDOMWindow, public EventTarget {
+class DOMWindow : public RefCountedDOMWindow, public EventTarget, public FrameDestructionObserver {
 public:
 static PassRefPtrDOMWindow create(Frame* frame) { return adoptRef(new DOMWindow(frame)); }
 virtual ~DOMWindow();
@@ -90,8 +91,7 @@
 
 virtual DOMWindow* toDOMWindow();
 
-Frame* frame() const { return m_frame; }
-void disconnectFrame();
+virtual void frameDestroyed() OVERRIDE;
 
 void clear();
 
@@ -415,7 +415,7 @@
 #endif
 
 private:
-DOMWindow(Frame*);
+explicit DOMWindow(Frame*);
 
 // FIXME: When this DOMWindow is no longer the active DOMWindow (i.e.,
 // when its document is no longer the document that is displayed in its
@@ -437,7 +437,6 @@
 KURL m_url;
 
 bool m_shouldPrintWhenFinishedLoading;
-Frame* m_frame;
 mutable RefPtrScreen m_screen;
 mutable RefPtrDOMSelection m_selection;
 mutable RefPtrHistory m_history;


Modified: trunk/Source/WebCore/page/Frame.cpp (104371 => 104372)

--- trunk/Source/WebCore/page/Frame.cpp	2012-01-07 03:10:44 UTC (rev 104371)
+++ trunk/Source/WebCore/page/Frame.cpp	2012-01-07 03:12:01 UTC (rev 104372)
@@ -219,13 +219,6 @@
 
 disconnectOwnerElement();
 
-if (m_domWindow)
-m_domWindow-disconnectFrame();
-
-HashSetDOMWindow*::iterator end = m_liveFormerWindows.end();
-for (HashSetDOMWindow*::iterator it = m_liveFormerWindows.begin(); it != end; ++it)
-(*it)-disconnectFrame();
-
 HashSetFrameDestructionObserver*::iterator stop = m_destructionObservers.end();
   

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

2012-01-06 Thread kling
Title: [104374] trunk/Source/WebCore








Revision 104374
Author kl...@webkit.org
Date 2012-01-06 19:58:26 -0800 (Fri, 06 Jan 2012)


Log Message
Unreviewed build fix after r104373.

* html/HTMLTableElement.cpp:
(WebCore::HTMLTableElement::~HTMLTableElement):

Modified Paths

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




Diff

Modified: trunk/Source/WebCore/ChangeLog (104373 => 104374)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 03:30:36 UTC (rev 104373)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 03:58:26 UTC (rev 104374)
@@ -1,5 +1,12 @@
 2012-01-06  Andreas Kling  awesomekl...@apple.com
 
+Unreviewed build fix after r104373.
+
+* html/HTMLTableElement.cpp:
+(WebCore::HTMLTableElement::~HTMLTableElement):
+
+2012-01-06  Andreas Kling  awesomekl...@apple.com
+
 Simplify HTMLCollection ownership model.
 http://webkit.org/b/75437
 


Modified: trunk/Source/WebCore/html/HTMLTableElement.cpp (104373 => 104374)

--- trunk/Source/WebCore/html/HTMLTableElement.cpp	2012-01-07 03:30:36 UTC (rev 104373)
+++ trunk/Source/WebCore/html/HTMLTableElement.cpp	2012-01-07 03:58:26 UTC (rev 104374)
@@ -56,8 +56,6 @@
 
 HTMLTableElement::~HTMLTableElement()
 {
-if (m_rowsCollection)
-m_rowsCollection-detachFromNode();
 }
 
 PassRefPtrHTMLTableElement HTMLTableElement::create(Document* document)






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


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

2012-01-06 Thread mrowe
Title: [104377] trunk/Source/WebKit2








Revision 104377
Author mr...@apple.com
Date 2012-01-06 22:57:32 -0800 (Fri, 06 Jan 2012)


Log Message
REGRESSION (WebKit2): Save as PDF no longer generates links to URLs
http://webkit.org/b/65076 / rdar://problem/9606246

WebKit2 printing works by having the web process render the page content to a PDF. The PDF
data is then shipped to the UI process which will render it in to the printing graphics context.
Links were being lost because the API used to do the rendering of the PDF in to the printing
graphics context, CGContextDrawPDFPage, did not preserve the links that were present in the
PDF content received from the web process.

To fix this we switch to using PDFKit for drawing the PDF in to the printing graphics context.
PDFKit provides the ability for us to iterate over the links in the PDF content ourselves and
add links in to the printing graphics context.

Reviewed by Alexey Proskuryakov.

* UIProcess/API/mac/WKPrintingView.h:
* UIProcess/API/mac/WKPrintingView.mm:
(pdfAnnotationLinkClass): Look up the PDFAnnotationLink class from PDFKit as WebKit2 loads PDFKit lazily.
(pdfDocumentClass): Ditto.
(-[WKPrintingView _drawPDFDocument:page:atPoint:]): Switch to using the PDFKit equivalents of several types.
Iterate over the annotations present in the PDFPage, calling CGPDFContextSetURLForRect for each PDFAnnotationLink
that we find.
(-[WKPrintingView _drawPreview:]): Create an NSData to feed to PDFDocument.
(-[WKPrintingView drawRect:]): Ditto.
* WebKit2Prefix.h: Add the usual workaround to make Objective-C exceptions compile when C++ exception handling is disabled.

Modified Paths

trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.h
trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
trunk/Source/WebKit2/WebKit2Prefix.h




Diff

Modified: trunk/Source/WebKit2/ChangeLog (104376 => 104377)

--- trunk/Source/WebKit2/ChangeLog	2012-01-07 06:46:50 UTC (rev 104376)
+++ trunk/Source/WebKit2/ChangeLog	2012-01-07 06:57:32 UTC (rev 104377)
@@ -1,3 +1,31 @@
+2012-01-06  Mark Rowe  mr...@apple.com
+
+REGRESSION (WebKit2): Save as PDF no longer generates links to URLs
+http://webkit.org/b/65076 / rdar://problem/9606246
+
+WebKit2 printing works by having the web process render the page content to a PDF. The PDF
+data is then shipped to the UI process which will render it in to the printing graphics context.
+Links were being lost because the API used to do the rendering of the PDF in to the printing
+graphics context, CGContextDrawPDFPage, did not preserve the links that were present in the
+PDF content received from the web process.
+
+To fix this we switch to using PDFKit for drawing the PDF in to the printing graphics context.
+PDFKit provides the ability for us to iterate over the links in the PDF content ourselves and
+add links in to the printing graphics context.
+
+Reviewed by Alexey Proskuryakov.
+
+* UIProcess/API/mac/WKPrintingView.h:
+* UIProcess/API/mac/WKPrintingView.mm:
+(pdfAnnotationLinkClass): Look up the PDFAnnotationLink class from PDFKit as WebKit2 loads PDFKit lazily.
+(pdfDocumentClass): Ditto.
+(-[WKPrintingView _drawPDFDocument:page:atPoint:]): Switch to using the PDFKit equivalents of several types.
+Iterate over the annotations present in the PDFPage, calling CGPDFContextSetURLForRect for each PDFAnnotationLink
+that we find.
+(-[WKPrintingView _drawPreview:]): Create an NSData to feed to PDFDocument.
+(-[WKPrintingView drawRect:]): Ditto.
+* WebKit2Prefix.h: Add the usual workaround to make Objective-C exceptions compile when C++ exception handling is disabled.
+
 2012-01-06  Viatcheslav Ostapenko  ostapenko.viatches...@nokia.com
 
 [Qt] [WK2] Minibrowser leaks memory ~6-7Mb per reload


Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.h (104376 => 104377)

--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.h	2012-01-07 06:46:50 UTC (rev 104376)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.h	2012-01-07 06:57:32 UTC (rev 104377)
@@ -27,6 +27,7 @@
 #import wtf/RetainPtr.h
 
 @class WKPrintingViewData;
+@class PDFDocument;
 
 namespace WebKit {
 class WebFrameProxy;
@@ -43,7 +44,7 @@
 HashMapWebCore::IntRect, Vectoruint8_t  _pagePreviews;
 
 Vectoruint8_t _printedPagesData;
-RetainPtrCGPDFDocumentRef _printedPagesPDFDocument;
+RetainPtrPDFDocument _printedPagesPDFDocument;
 
 uint64_t _expectedComputedPagesCallback;
 HashMapuint64_t, WebCore::IntRect _expectedPreviewCallbacks;


Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (104376 => 104377)

--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm	2012-01-07 06:46:50 UTC (rev 104376)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm	2012-01-07 06:57:32 UTC (rev 104377)
@@ -30,6 +30,7 

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

2012-01-06 Thread mrowe
Title: [104378] trunk/Source/WebCore








Revision 104378
Author mr...@apple.com
Date 2012-01-06 22:57:47 -0800 (Fri, 06 Jan 2012)


Log Message
REGRESSION (r83075): Save as PDF does not generate any links for webkit.org and others
http://webkit.org/b/75768 rdar://problem/10659258

Use RenderObject::hasOutline when determining whether to always create line boxes so that
we take in to consideration whether we'll be creating PDF link rects.

Reviewed by Dan Bernstein.

* rendering/RenderInline.cpp:
(WebCore::RenderInline::styleDidChange):

Modified Paths

trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderInline.cpp


Property Changed

trunk/Source/WebCore/ChangeLog




Diff

Modified: trunk/Source/WebCore/ChangeLog (104377 => 104378)

--- trunk/Source/WebCore/ChangeLog	2012-01-07 06:57:32 UTC (rev 104377)
+++ trunk/Source/WebCore/ChangeLog	2012-01-07 06:57:47 UTC (rev 104378)
@@ -1,3 +1,16 @@
+2012-01-06  Mark Rowe  mr...@apple.com
+
+REGRESSION (r83075): Save as PDF does not generate any links for webkit.org and others
+http://webkit.org/b/75768 rdar://problem/10659258
+
+Use RenderObject::hasOutline when determining whether to always create line boxes so that
+we take in to consideration whether we'll be creating PDF link rects.
+
+Reviewed by Dan Bernstein.
+
+* rendering/RenderInline.cpp:
+(WebCore::RenderInline::styleDidChange):
+
 2012-01-06  Sheriff Bot  webkit.review@gmail.com
 
 Unreviewed, rolling out r104373 and r104374.
Property changes on: trunk/Source/WebCore/ChangeLog
___


Deleted: svn:executable

Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (104377 => 104378)

--- trunk/Source/WebCore/rendering/RenderInline.cpp	2012-01-07 06:57:32 UTC (rev 104377)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp	2012-01-07 06:57:47 UTC (rev 104378)
@@ -147,7 +147,7 @@
 m_lineHeight = -1;
 
 if (!m_alwaysCreateLineBoxes) {
-bool alwaysCreateLineBoxes = hasSelfPaintingLayer() || hasBoxDecorations() || style()-hasPadding() || style()-hasMargin() || style()-hasOutline();
+bool alwaysCreateLineBoxes = hasSelfPaintingLayer() || hasBoxDecorations() || style()-hasPadding() || style()-hasMargin() || hasOutline();
 if (oldStyle  alwaysCreateLineBoxes) {
 dirtyLineBoxes(false);
 setNeedsLayout(true);






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