[webkit-changes] [173909] trunk/Source/WTF
Title: [173909] trunk/Source/WTF
Revision 173909
Author gga...@apple.com
Date 2014-09-23 22:10:18 -0700 (Tue, 23 Sep 2014)
Log Message
2014-09-23 Geoffrey Garen
Rolled out r173346.
bmalloc should honor the FastMalloc statistics API
https://bugs.webkit.org/show_bug.cgi?id=136592
This didn't really work. Because we allow ranges with and without
physical pages to merge, and we allow double-committing and
double-decommitting, we can't rely on commit actions to track memory
footprint.
* wtf/FastMalloc.cpp:
(WTF::fastMallocStatistics):
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/FastMalloc.cpp
Diff
Modified: trunk/Source/WTF/ChangeLog (173908 => 173909)
--- trunk/Source/WTF/ChangeLog 2014-09-24 05:07:19 UTC (rev 173908)
+++ trunk/Source/WTF/ChangeLog 2014-09-24 05:10:18 UTC (rev 173909)
@@ -1,3 +1,18 @@
+2014-09-23 Geoffrey Garen
+
+Rolled out r173346.
+
+bmalloc should honor the FastMalloc statistics API
+https://bugs.webkit.org/show_bug.cgi?id=136592
+
+This didn't really work. Because we allow ranges with and without
+physical pages to merge, and we allow double-committing and
+double-decommitting, we can't rely on commit actions to track memory
+footprint.
+
+* wtf/FastMalloc.cpp:
+(WTF::fastMallocStatistics):
+
2014-09-23 Joseph Pecoraro
Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed
Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (173908 => 173909)
--- trunk/Source/WTF/wtf/FastMalloc.cpp 2014-09-24 05:07:19 UTC (rev 173908)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2014-09-24 05:10:18 UTC (rev 173909)
@@ -477,11 +477,7 @@
FastMallocStatistics fastMallocStatistics()
{
-FastMallocStatistics statistics;
-statistics.committedVMBytes = bmalloc::api::heapSize();
-statistics.reservedVMBytes = bmalloc::api::heapCapacity();
-statistics.freeListBytes = 0; // bmalloc doesn't really have free lists.
-
+FastMallocStatistics statistics = { 0, 0, 0 };
return statistics;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173908] trunk/Source/bmalloc
Title: [173908] trunk/Source/bmalloc
Revision 173908
Author gga...@apple.com
Date 2014-09-23 22:07:19 -0700 (Tue, 23 Sep 2014)
Log Message
2014-09-23 Geoffrey Garen
Rolled out r173346.
bmalloc should honor the FastMalloc statistics API
https://bugs.webkit.org/show_bug.cgi?id=136592
This didn't really work. Because we allow ranges with and without
physical pages to merge, and we allow double-committing and
double-decommitting, we can't rely on commit actions to track memory
footprint.
* bmalloc/Heap.cpp:
(bmalloc::Heap::size): Deleted.
(bmalloc::Heap::capacity): Deleted.
* bmalloc/Heap.h:
* bmalloc/VMHeap.cpp:
(bmalloc::VMHeap::VMHeap):
(bmalloc::VMHeap::allocateSmallChunk):
(bmalloc::VMHeap::allocateMediumChunk):
(bmalloc::VMHeap::allocateLargeChunk):
* bmalloc/VMHeap.h:
(bmalloc::VMHeap::allocateSmallPage):
(bmalloc::VMHeap::allocateMediumPage):
(bmalloc::VMHeap::allocateLargeRange):
(bmalloc::VMHeap::deallocateSmallPage):
(bmalloc::VMHeap::deallocateMediumPage):
(bmalloc::VMHeap::deallocateLargeRange):
(bmalloc::VMHeap::size): Deleted.
(bmalloc::VMHeap::capacity): Deleted.
* bmalloc/bmalloc.h:
(bmalloc::api::heapSize): Deleted.
(bmalloc::api::heapCapacity): Deleted.
Modified Paths
trunk/Source/bmalloc/ChangeLog
trunk/Source/bmalloc/bmalloc/Heap.cpp
trunk/Source/bmalloc/bmalloc/Heap.h
trunk/Source/bmalloc/bmalloc/VMHeap.cpp
trunk/Source/bmalloc/bmalloc/VMHeap.h
trunk/Source/bmalloc/bmalloc/bmalloc.h
Diff
Modified: trunk/Source/bmalloc/ChangeLog (173907 => 173908)
--- trunk/Source/bmalloc/ChangeLog 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/ChangeLog 2014-09-24 05:07:19 UTC (rev 173908)
@@ -1,5 +1,39 @@
2014-09-23 Geoffrey Garen
+Rolled out r173346.
+
+bmalloc should honor the FastMalloc statistics API
+https://bugs.webkit.org/show_bug.cgi?id=136592
+
+This didn't really work. Because we allow ranges with and without
+physical pages to merge, and we allow double-committing and
+double-decommitting, we can't rely on commit actions to track memory
+footprint.
+
+* bmalloc/Heap.cpp:
+(bmalloc::Heap::size): Deleted.
+(bmalloc::Heap::capacity): Deleted.
+* bmalloc/Heap.h:
+* bmalloc/VMHeap.cpp:
+(bmalloc::VMHeap::VMHeap):
+(bmalloc::VMHeap::allocateSmallChunk):
+(bmalloc::VMHeap::allocateMediumChunk):
+(bmalloc::VMHeap::allocateLargeChunk):
+* bmalloc/VMHeap.h:
+(bmalloc::VMHeap::allocateSmallPage):
+(bmalloc::VMHeap::allocateMediumPage):
+(bmalloc::VMHeap::allocateLargeRange):
+(bmalloc::VMHeap::deallocateSmallPage):
+(bmalloc::VMHeap::deallocateMediumPage):
+(bmalloc::VMHeap::deallocateLargeRange):
+(bmalloc::VMHeap::size): Deleted.
+(bmalloc::VMHeap::capacity): Deleted.
+* bmalloc/bmalloc.h:
+(bmalloc::api::heapSize): Deleted.
+(bmalloc::api::heapCapacity): Deleted.
+
+2014-09-23 Geoffrey Garen
+
bmalloc: Allocation should be more precise
https://bugs.webkit.org/show_bug.cgi?id=136993
Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (173907 => 173908)
--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-09-24 05:07:19 UTC (rev 173908)
@@ -369,14 +369,4 @@
m_scavenger.run();
}
-size_t Heap::size(std::lock_guard&)
-{
-return m_vmHeap.capacity() - m_vmHeap.size();
-}
-
-size_t Heap::capacity(std::lock_guard&)
-{
-return m_vmHeap.capacity();
-}
-
} // namespace bmalloc
Modified: trunk/Source/bmalloc/bmalloc/Heap.h (173907 => 173908)
--- trunk/Source/bmalloc/bmalloc/Heap.h 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2014-09-24 05:07:19 UTC (rev 173908)
@@ -64,9 +64,6 @@
void scavenge(std::unique_lock&, std::chrono::milliseconds sleepDuration);
-size_t size(std::lock_guard&);
-size_t capacity(std::lock_guard&);
-
private:
~Heap() = delete;
Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (173907 => 173908)
--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2014-09-24 05:07:19 UTC (rev 173908)
@@ -33,8 +33,6 @@
namespace bmalloc {
VMHeap::VMHeap()
-: m_size(0)
-, m_capacity(0)
{
}
@@ -43,9 +41,6 @@
SmallChunk* chunk = SmallChunk::create();
for (auto* it = chunk->begin(); it != chunk->end(); ++it)
m_smallPages.push(it);
-
-m_size += smallChunkSize;
-m_capacity += smallChunkSize;
}
void VMHeap::allocateMediumChunk()
@@ -53,20 +48,12 @@
MediumChunk* chunk = MediumChunk::create();
for (auto* it = chunk->be
[webkit-changes] [173907] trunk/Source/WebCore
Title: [173907] trunk/Source/WebCore
Revision 173907
Author cdu...@apple.com
Date 2014-09-23 20:31:50 -0700 (Tue, 23 Sep 2014)
Log Message
Add support for is() for type checking
https://bugs.webkit.org/show_bug.cgi?id=137015
Reviewed by Benjamin Poulain.
Add support for is() for type checking while keeping
support for the legacy toHTML*Element() form until the code base is
ported.
toHTML*Element() helpers are now macros to the new is()
type checking helpers.
No new tests, no behavior change.
* dom/Document.cpp:
(WebCore::Document::setTitle):
* dom/Element.cpp:
(WebCore::Element::childShouldCreateRenderer):
* dom/Element.h:
(WebCore::is):
(WebCore::downcast):
(WebCore::isElementOfType): Deleted.
* dom/ElementAncestorIterator.h:
(WebCore::lineageOfType):
* dom/ElementIterator.h:
(WebCore::findElementAncestorOfType):
* dom/ElementTraversal.h:
(WebCore::Traversal::firstChildTemplate):
(WebCore::Traversal::lastChildTemplate):
(WebCore::Traversal::firstWithinTemplate):
(WebCore::Traversal::lastWithinTemplate):
(WebCore::Traversal::nextTemplate):
(WebCore::Traversal::previous):
(WebCore::Traversal::nextSibling):
(WebCore::Traversal::previousSibling):
(WebCore::Traversal::nextSkippingChildren):
* dom/TypedElementDescendantIterator.h:
(WebCore::TypedElementDescendantIteratorAdapter::from):
(WebCore::TypedElementDescendantConstIteratorAdapter::from):
* dom/make_names.pl:
(printTypeHelpers):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h
trunk/Source/WebCore/dom/ElementAncestorIterator.h
trunk/Source/WebCore/dom/ElementIterator.h
trunk/Source/WebCore/dom/ElementTraversal.h
trunk/Source/WebCore/dom/TypedElementDescendantIterator.h
trunk/Source/WebCore/dom/make_names.pl
Diff
Modified: trunk/Source/WebCore/ChangeLog (173906 => 173907)
--- trunk/Source/WebCore/ChangeLog 2014-09-24 03:17:44 UTC (rev 173906)
+++ trunk/Source/WebCore/ChangeLog 2014-09-24 03:31:50 UTC (rev 173907)
@@ -1,3 +1,47 @@
+2014-09-23 Chris Dumez
+
+Add support for is() for type checking
+https://bugs.webkit.org/show_bug.cgi?id=137015
+
+Reviewed by Benjamin Poulain.
+
+Add support for is() for type checking while keeping
+support for the legacy toHTML*Element() form until the code base is
+ported.
+
+toHTML*Element() helpers are now macros to the new is()
+type checking helpers.
+
+No new tests, no behavior change.
+
+* dom/Document.cpp:
+(WebCore::Document::setTitle):
+* dom/Element.cpp:
+(WebCore::Element::childShouldCreateRenderer):
+* dom/Element.h:
+(WebCore::is):
+(WebCore::downcast):
+(WebCore::isElementOfType): Deleted.
+* dom/ElementAncestorIterator.h:
+(WebCore::lineageOfType):
+* dom/ElementIterator.h:
+(WebCore::findElementAncestorOfType):
+* dom/ElementTraversal.h:
+(WebCore::Traversal::firstChildTemplate):
+(WebCore::Traversal::lastChildTemplate):
+(WebCore::Traversal::firstWithinTemplate):
+(WebCore::Traversal::lastWithinTemplate):
+(WebCore::Traversal::nextTemplate):
+(WebCore::Traversal::previous):
+(WebCore::Traversal::nextSibling):
+(WebCore::Traversal::previousSibling):
+(WebCore::Traversal::nextSkippingChildren):
+* dom/TypedElementDescendantIterator.h:
+(WebCore::TypedElementDescendantIteratorAdapter::from):
+(WebCore::TypedElementDescendantConstIteratorAdapter::from):
+* dom/make_names.pl:
+(printTypeHelpers):
+
2014-09-23 Benjamin Poulain
The style resolution cache applies properties incorrectly whenever direction != ltr
Modified: trunk/Source/WebCore/dom/Document.cpp (173906 => 173907)
--- trunk/Source/WebCore/dom/Document.cpp 2014-09-24 03:17:44 UTC (rev 173906)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-24 03:31:50 UTC (rev 173907)
@@ -1551,7 +1551,7 @@
// The DOM API has no method of specifying direction, so assume LTR.
updateTitle(StringWithDirection(title, LTR));
-if (m_titleElement && isHTMLTitleElement(*m_titleElement))
+if (m_titleElement && is(*m_titleElement))
downcast(*m_titleElement).setText(title);
}
Modified: trunk/Source/WebCore/dom/Element.cpp (173906 => 173907)
--- trunk/Source/WebCore/dom/Element.cpp 2014-09-24 03:17:44 UTC (rev 173906)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-09-24 03:31:50 UTC (rev 173907)
@@ -2405,7 +2405,7 @@
if (child.isSVGElement()) {
ASSERT(!isSVGElement());
const SVGElement& childElement = downcast(child);
-return isSVGSVGElement(childElement) && childElement.isValid();
+return is(childElement) && childElement.isValid();
}
return true;
}
Modified: trunk/Source/WebCore/dom/Element.h (173906 => 173907)
--- trunk/Source/WebCore/dom/Element.h 2014-09-24 03
[webkit-changes] [173906] trunk
Title: [173906] trunk
Revision 173906
Author benja...@webkit.org
Date 2014-09-23 20:17:44 -0700 (Tue, 23 Sep 2014)
Log Message
The style resolution cache applies properties incorrectly whenever direction != ltr
https://bugs.webkit.org/show_bug.cgi?id=137052
Patch by Benjamin Poulain on 2014-09-23
Reviewed by Andreas Kling.
Source/WebCore:
The optimization r135021 introduced a bug whenever the direction of subtree is not
uniform in the whole page.
When StyleResolver::applyMatchedProperties() resolves the style, some properties are
resolved differently based on the writing-mode and the direction.
In isCacheableInMatchedPropertiesCache(), the cases for writing-mode are already handled
by not caching any style with anything else than the default.
The direction was ignored, causing the bugs solved here.
Tests: css3/flexbox/flex-flow-2.html
fast/css/style-resolver-cache-direction-1.html
fast/css/style-resolver-cache-direction-2.html
fast/css/style-resolver-cache-direction-3.html
* css/StyleResolver.cpp:
(WebCore::isCacheableInMatchedPropertiesCache):
LayoutTests:
* css3/flexbox/flex-flow-2-expected.txt: Added.
* css3/flexbox/flex-flow-2.html: Added.
The test flex-flow.html should have uncovered the bug. It did not because it uses
:nth-child(), which disable style optimizations.
flex-flow-2.html is a copy of flex-flow.html using classes instead of :nth-child().
This would have caught the bug.
* fast/css/style-resolver-cache-direction-1-expected.html: Added.
* fast/css/style-resolver-cache-direction-1.html: Added.
* fast/css/style-resolver-cache-direction-2-expected.html: Added.
* fast/css/style-resolver-cache-direction-2.html: Added.
* fast/css/style-resolver-cache-direction-3-expected.html: Added.
* fast/css/style-resolver-cache-direction-3.html: Added.
New basic tests for the fix.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/StyleResolver.cpp
Added Paths
trunk/LayoutTests/css3/flexbox/flex-flow-2-expected.txt
trunk/LayoutTests/css3/flexbox/flex-flow-2.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-1-expected.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-1.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-2-expected.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-2.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-3-expected.html
trunk/LayoutTests/fast/css/style-resolver-cache-direction-3.html
Diff
Modified: trunk/LayoutTests/ChangeLog (173905 => 173906)
--- trunk/LayoutTests/ChangeLog 2014-09-24 01:45:40 UTC (rev 173905)
+++ trunk/LayoutTests/ChangeLog 2014-09-24 03:17:44 UTC (rev 173906)
@@ -1,3 +1,26 @@
+2014-09-23 Benjamin Poulain
+
+The style resolution cache applies properties incorrectly whenever direction != ltr
+https://bugs.webkit.org/show_bug.cgi?id=137052
+
+Reviewed by Andreas Kling.
+
+* css3/flexbox/flex-flow-2-expected.txt: Added.
+* css3/flexbox/flex-flow-2.html: Added.
+The test flex-flow.html should have uncovered the bug. It did not because it uses
+:nth-child(), which disable style optimizations.
+
+flex-flow-2.html is a copy of flex-flow.html using classes instead of :nth-child().
+This would have caught the bug.
+
+* fast/css/style-resolver-cache-direction-1-expected.html: Added.
+* fast/css/style-resolver-cache-direction-1.html: Added.
+* fast/css/style-resolver-cache-direction-2-expected.html: Added.
+* fast/css/style-resolver-cache-direction-2.html: Added.
+* fast/css/style-resolver-cache-direction-3-expected.html: Added.
+* fast/css/style-resolver-cache-direction-3.html: Added.
+New basic tests for the fix.
+
2014-09-23 Roger Fong
[Windows] More windows test gardening of some fast/dom tests.
Added: trunk/LayoutTests/css3/flexbox/flex-flow-2-expected.txt (0 => 173906)
--- trunk/LayoutTests/css3/flexbox/flex-flow-2-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/flexbox/flex-flow-2-expected.txt 2014-09-24 03:17:44 UTC (rev 173906)
@@ -0,0 +1,12 @@
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
+PASS
Added: trunk/LayoutTests/css3/flexbox/flex-flow-2.html (0 => 173906)
--- trunk/LayoutTests/css3/flexbox/flex-flow-2.html (rev 0)
+++ trunk/LayoutTests/css3/flexbox/flex-flow-2.html 2014-09-24 03:17:44 UTC (rev 173906)
@@ -0,0 +1,153 @@
+
+
+
+body {
+margin: 0;
+}
+.flexbox {
+width: 600px;
+display: -webkit-flex;
+background-color: grey;
+}
+.flexbox > div {
+height: 20px;
+width: 20px;
+border: 0;
+}
+
+.rtl {
+direction: rtl;
+}
+
+.bt {
+-webkit-writing-mode: horizontal-bt;
+}
+
+.vertical-rl, .vertical-lr, .column, .column-reverse {
+height: 600px;
+}
+
+.vertical-rl {
+-webkit-writing-mode: vertical-rl;
+}
+
+.vertical-lr {
+-webkit-writing-mode:
[webkit-changes] [173905] trunk/Source/WebCore
Title: [173905] trunk/Source/WebCore Revision 173905 Author cdu...@apple.com Date 2014-09-23 18:45:40 -0700 (Tue, 23 Sep 2014) Log Message Have CSS classes' methods return more references https://bugs.webkit.org/show_bug.cgi?id=137036 Reviewed by Ryosuke Niwa. Have CSS classes' methods return more references instead of pointers when possible. No new tests, no behavior change. * css/CSSFontFaceRule.cpp: (WebCore::CSSFontFaceRule::style): * css/CSSFontFaceRule.h: * css/CSSGroupingRule.cpp: (WebCore::CSSGroupingRule::cssRules): * css/CSSGroupingRule.h: * css/CSSImportRule.cpp: (WebCore::CSSImportRule::media): * css/CSSImportRule.h: * css/CSSPageRule.cpp: (WebCore::CSSPageRule::style): * css/CSSPageRule.h: * css/CSSStyleRule.cpp: (WebCore::CSSStyleRule::style): * css/CSSStyleRule.h: * css/WebKitCSSKeyframeRule.cpp: (WebCore::WebKitCSSKeyframeRule::style): * css/WebKitCSSKeyframeRule.h: * css/WebKitCSSKeyframesRule.cpp: (WebCore::WebKitCSSKeyframesRule::cssRules): * css/WebKitCSSKeyframesRule.h: * css/WebKitCSSViewportRule.cpp: (WebCore::WebKitCSSViewportRule::style): * css/WebKitCSSViewportRule.h: * inspector/InspectorStyleSheet.cpp: (WebCore::asCSSRuleList): (WebCore::fillMediaListChain): (WebCore::InspectorStyleSheet::setRuleSelector): (WebCore::InspectorStyleSheet::deleteRule): (WebCore::InspectorStyleSheet::buildObjectForSelectorList): (WebCore::InspectorStyleSheet::buildObjectForRule): (WebCore::InspectorStyleSheet::styleForId): (WebCore::InspectorStyleSheet::ruleIndexByStyle): (WebCore::InspectorStyleSheet::ruleId): (WebCore::InspectorStyleSheet::revalidateStyle): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSFontFaceRule.cpp trunk/Source/WebCore/css/CSSFontFaceRule.h trunk/Source/WebCore/css/CSSGroupingRule.cpp trunk/Source/WebCore/css/CSSGroupingRule.h trunk/Source/WebCore/css/CSSImportRule.cpp trunk/Source/WebCore/css/CSSImportRule.h trunk/Source/WebCore/css/CSSPageRule.cpp trunk/Source/WebCore/css/CSSPageRule.h trunk/Source/WebCore/css/CSSStyleRule.cpp trunk/Source/WebCore/css/CSSStyleRule.h trunk/Source/WebCore/css/WebKitCSSKeyframeRule.cpp trunk/Source/WebCore/css/WebKitCSSKeyframeRule.h trunk/Source/WebCore/css/WebKitCSSKeyframesRule.cpp trunk/Source/WebCore/css/WebKitCSSKeyframesRule.h trunk/Source/WebCore/css/WebKitCSSViewportRule.cpp trunk/Source/WebCore/css/WebKitCSSViewportRule.h trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (173904 => 173905) --- trunk/Source/WebCore/ChangeLog 2014-09-24 00:52:37 UTC (rev 173904) +++ trunk/Source/WebCore/ChangeLog 2014-09-24 01:45:40 UTC (rev 173905) @@ -1,3 +1,51 @@ +2014-09-23 Chris Dumez + +Have CSS classes' methods return more references +https://bugs.webkit.org/show_bug.cgi?id=137036 + +Reviewed by Ryosuke Niwa. + +Have CSS classes' methods return more references instead of pointers +when possible. + +No new tests, no behavior change. + +* css/CSSFontFaceRule.cpp: +(WebCore::CSSFontFaceRule::style): +* css/CSSFontFaceRule.h: +* css/CSSGroupingRule.cpp: +(WebCore::CSSGroupingRule::cssRules): +* css/CSSGroupingRule.h: +* css/CSSImportRule.cpp: +(WebCore::CSSImportRule::media): +* css/CSSImportRule.h: +* css/CSSPageRule.cpp: +(WebCore::CSSPageRule::style): +* css/CSSPageRule.h: +* css/CSSStyleRule.cpp: +(WebCore::CSSStyleRule::style): +* css/CSSStyleRule.h: +* css/WebKitCSSKeyframeRule.cpp: +(WebCore::WebKitCSSKeyframeRule::style): +* css/WebKitCSSKeyframeRule.h: +* css/WebKitCSSKeyframesRule.cpp: +(WebCore::WebKitCSSKeyframesRule::cssRules): +* css/WebKitCSSKeyframesRule.h: +* css/WebKitCSSViewportRule.cpp: +(WebCore::WebKitCSSViewportRule::style): +* css/WebKitCSSViewportRule.h: +* inspector/InspectorStyleSheet.cpp: +(WebCore::asCSSRuleList): +(WebCore::fillMediaListChain): +(WebCore::InspectorStyleSheet::setRuleSelector): +(WebCore::InspectorStyleSheet::deleteRule): +(WebCore::InspectorStyleSheet::buildObjectForSelectorList): +(WebCore::InspectorStyleSheet::buildObjectForRule): +(WebCore::InspectorStyleSheet::styleForId): +(WebCore::InspectorStyleSheet::ruleIndexByStyle): +(WebCore::InspectorStyleSheet::ruleId): +(WebCore::InspectorStyleSheet::revalidateStyle): + 2014-09-23 Roger Fong [Windows] Enable CSS Supports Rule on Windows. Modified: trunk/Source/WebCore/css/CSSFontFaceRule.cpp (173904 => 173905) --- trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2014-09-24 00:52:37 UTC (rev 173904) +++ trunk/Source/WebCore/css/CSSFontFaceRule.cpp 2014-09-24 01:45:40 UTC (rev 173905) @@ -41,11 +41,11 @@ m_propertiesCSSOMWrapper->clearParentRule(); } -CSSStyleDeclaration* CSSFontFaceRule::style() +CSSStyleDec
[webkit-changes] [173904] trunk
Title: [173904] trunk Revision 173904 Author roger_f...@apple.com Date 2014-09-23 17:52:37 -0700 (Tue, 23 Sep 2014) Log Message [Windows] Enable CSS Supports Rule on Windows. * win/tools/vsprops/FeatureDefines.props: * css/CSSAllInOne.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/css/CSSAllInOne.cpp trunk/WebKitLibraries/ChangeLog trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props Diff Modified: trunk/Source/WebCore/ChangeLog (173903 => 173904) --- trunk/Source/WebCore/ChangeLog 2014-09-24 00:46:22 UTC (rev 173903) +++ trunk/Source/WebCore/ChangeLog 2014-09-24 00:52:37 UTC (rev 173904) @@ -1,3 +1,9 @@ +2014-09-23 Roger Fong + +[Windows] Enable CSS Supports Rule on Windows. + +* css/CSSAllInOne.cpp: + 2014-09-23 Christophe Dumez Unreviewed build fix after r173893. @@ -2200,6 +2206,14 @@ 2014-09-18 Roger Fong +Add a move operator and constructor override to HashSet. +https://bugs.webkit.org/show_bug.cgi?id=136934. + +* dom/Node.cpp: +(WebCore::Document::invalidateNodeListAndCollectionCaches): Remove the now unneeded call to clear the HashSet. + +2014-09-18 Roger Fong + [Windows] Media tests all fail because they cannot find localized strings. * rendering/RenderThemeSafari.cpp: Modified: trunk/Source/WebCore/css/CSSAllInOne.cpp (173903 => 173904) --- trunk/Source/WebCore/css/CSSAllInOne.cpp 2014-09-24 00:46:22 UTC (rev 173903) +++ trunk/Source/WebCore/css/CSSAllInOne.cpp 2014-09-24 00:52:37 UTC (rev 173904) @@ -66,6 +66,9 @@ #include "CSSSegmentedFontFace.cpp" #include "CSSSelector.cpp" #include "CSSSelectorList.cpp" +#if ENABLE(CSS3_CONDITIONAL_RULES) +#include "CSSSupportsRule.cpp" +#endif #include "CSSStyleRule.cpp" #include "CSSStyleSheet.cpp" #include "CSSTimingFunctionValue.cpp" Modified: trunk/WebKitLibraries/ChangeLog (173903 => 173904) --- trunk/WebKitLibraries/ChangeLog 2014-09-24 00:46:22 UTC (rev 173903) +++ trunk/WebKitLibraries/ChangeLog 2014-09-24 00:52:37 UTC (rev 173904) @@ -1,3 +1,9 @@ +2014-09-23 Roger Fong + +[Windows] Enable CSS Supports Rule on Windows. + +* win/tools/vsprops/FeatureDefines.props: + 2014-09-19 Brent Fulgham [Win] Turn off SSE Instructions for 32-bit Builds Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (173903 => 173904) --- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2014-09-24 00:46:22 UTC (rev 173903) +++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props 2014-09-24 00:52:37 UTC (rev 173904) @@ -8,7 +8,7 @@ ENABLE_CHANNEL_MESSAGING - +ENABLE_CSS3_CONDITIONAL_RULES ENABLE_CSS_BOX_DECORATION_BREAK ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173903] trunk/Tools
Title: [173903] trunk/Tools
Revision 173903
Author roger_f...@apple.com
Date 2014-09-23 17:46:22 -0700 (Tue, 23 Sep 2014)
Log Message
[Windows] More debugging for the Windows bots.
* Scripts/webkitpy/common/system/path.py:
(_CygPath):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/system/path.py
trunk/Tools/Scripts/webkitpy/port/driver.py
Diff
Modified: trunk/Tools/ChangeLog (173902 => 173903)
--- trunk/Tools/ChangeLog 2014-09-24 00:16:25 UTC (rev 173902)
+++ trunk/Tools/ChangeLog 2014-09-24 00:46:22 UTC (rev 173903)
@@ -1,5 +1,12 @@
2014-09-23 Roger Fong
+[Windows] More debugging for the Windows bots.
+
+* Scripts/webkitpy/common/system/path.py:
+(_CygPath):
+
+2014-09-23 Roger Fong
+
Unreviewed. Fix for r173899, those tabs should be spaces.
* Scripts/webkitpy/port/driver.py:
Modified: trunk/Tools/Scripts/webkitpy/common/system/path.py (173902 => 173903)
--- trunk/Tools/Scripts/webkitpy/common/system/path.py 2014-09-24 00:16:25 UTC (rev 173902)
+++ trunk/Tools/Scripts/webkitpy/common/system/path.py 2014-09-24 00:46:22 UTC (rev 173903)
@@ -31,9 +31,11 @@
import atexit
import subprocess
import sys
+import logging
import threading
import urllib
+_log = logging.getLogger(__name__)
def abspath_to_uri(platform, path):
"""Converts a platform-specific absolute path to a file: URL."""
@@ -98,9 +100,11 @@
def convert(self, path):
if not self.is_running():
self.start()
+_log.error("Input to convert: %s" % path)
self._child_process.stdin.write("%s\r\n" % path)
self._child_process.stdin.flush()
windows_path = self._child_process.stdout.readline().rstrip()
+_log.error("Windows path: %s" % windows_path)
# Some versions of cygpath use lowercase drive letters while others
# use uppercase. We always convert to uppercase for consistency.
windows_path = '%s%s' % (windows_path[0].upper(), windows_path[1:])
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (173902 => 173903)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-24 00:16:25 UTC (rev 173902)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-24 00:46:22 UTC (rev 173903)
@@ -392,7 +392,6 @@
else:
command = self._port.abspath_for_test(driver_input.test_name)
if sys.platform == 'cygwin':
-_log.error("Command for cygpath: %s" % command)
command = path.cygpath(command)
assert not driver_input.image_hash or driver_input.should_run_pixel_test
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173902] trunk/Tools
Title: [173902] trunk/Tools
Revision 173902
Author roger_f...@apple.com
Date 2014-09-23 17:16:25 -0700 (Tue, 23 Sep 2014)
Log Message
Unreviewed. Fix for r173899, those tabs should be spaces.
* Scripts/webkitpy/port/driver.py:
(Driver._command_from_driver_input):
(Driver): Deleted.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/driver.py
Diff
Modified: trunk/Tools/ChangeLog (173901 => 173902)
--- trunk/Tools/ChangeLog 2014-09-24 00:08:40 UTC (rev 173901)
+++ trunk/Tools/ChangeLog 2014-09-24 00:16:25 UTC (rev 173902)
@@ -1,5 +1,13 @@
2014-09-23 Roger Fong
+Unreviewed. Fix for r173899, those tabs should be spaces.
+
+* Scripts/webkitpy/port/driver.py:
+(Driver._command_from_driver_input):
+(Driver): Deleted.
+
+2014-09-23 Roger Fong
+
[Windows] Add some logging to debug a problem with the Windows bots that causes layout tests to exit early.
* Scripts/webkitpy/port/driver.py:
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (173901 => 173902)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-24 00:08:40 UTC (rev 173901)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-24 00:16:25 UTC (rev 173902)
@@ -392,7 +392,7 @@
else:
command = self._port.abspath_for_test(driver_input.test_name)
if sys.platform == 'cygwin':
-_log.error("Command for cygpath: %s" % command)
+_log.error("Command for cygpath: %s" % command)
command = path.cygpath(command)
assert not driver_input.image_hash or driver_input.should_run_pixel_test
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173901] trunk/LayoutTests
Title: [173901] trunk/LayoutTests
Revision 173901
Author roger_f...@apple.com
Date 2014-09-23 17:08:40 -0700 (Tue, 23 Sep 2014)
Log Message
[Windows] More windows test gardening of some fast/dom tests.
* platform/win/TestExpectations:
* platform/win/fast/dom/NavigatorContentUtils: Added.
* platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt: Added.
* platform/win/fast/dom/navigator-detached-no-crash-expected.txt: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/win/TestExpectations
Added Paths
trunk/LayoutTests/platform/win/fast/dom/NavigatorContentUtils/
trunk/LayoutTests/platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt
trunk/LayoutTests/platform/win/fast/dom/navigator-detached-no-crash-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (173900 => 173901)
--- trunk/LayoutTests/ChangeLog 2014-09-23 23:58:09 UTC (rev 173900)
+++ trunk/LayoutTests/ChangeLog 2014-09-24 00:08:40 UTC (rev 173901)
@@ -1,3 +1,12 @@
+2014-09-23 Roger Fong
+
+[Windows] More windows test gardening of some fast/dom tests.
+
+* platform/win/TestExpectations:
+* platform/win/fast/dom/NavigatorContentUtils: Added.
+* platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt: Added.
+* platform/win/fast/dom/navigator-detached-no-crash-expected.txt: Added.
+
2014-09-23 Eduardo Lima Mitev
[GTK] Adds implementation of subtle crypto HMAC algorithm
Modified: trunk/LayoutTests/platform/win/TestExpectations (173900 => 173901)
--- trunk/LayoutTests/platform/win/TestExpectations 2014-09-23 23:58:09 UTC (rev 173900)
+++ trunk/LayoutTests/platform/win/TestExpectations 2014-09-24 00:08:40 UTC (rev 173901)
@@ -2765,3 +2765,9 @@
svg/clip-path/mask-userspaceonuse-content-clip.svg [ ImageOnlyFailure ]
svg/W3C-SVG-1.1/animate-elem-64-t.svg [ ImageOnlyFailure ]
svg/W3C-SVG-1.1/animate-elem-65-t.svg [ ImageOnlyFailure ]
+
+# Navigator Hardware Concurrency not enabled on Windows
+fast/dom/navigator-hardwareConcurrency.html
+
+# Tests that exceed maximum call stack on windows
+fast/dom/Window/window-postmessage-clone-deep-array.html
Added: trunk/LayoutTests/platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt (0 => 173901)
--- trunk/LayoutTests/platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/fast/dom/NavigatorContentUtils/is-protocol-handler-registered-expected.txt 2014-09-24 00:08:40 UTC (rev 173901)
@@ -0,0 +1,10 @@
+This test makes sure that navigator.isProtocolHandlerRegistered throws the proper exceptions and returns the default state of handler.
+
+FAIL window.navigator.isProtocolHandlerRegistered is not defined.
+PASS Invalid url "%S" threw SyntaxError exception.
+PASS Invalid scheme "mailto:" failed.
+PASS Invalid scheme "ssh:/" failed.
+PASS Invalid scheme "magnet:+" failed.
+PASS Invalid scheme "tel:sip" failed.
+FAIL window.navigator.isProtocolHandlerRegistered call is failed: "undefined is not a function (evaluating 'window.navigator.isProtocolHandlerRegistered("bitcoin", "valid protocol %s")')".
+
Added: trunk/LayoutTests/platform/win/fast/dom/navigator-detached-no-crash-expected.txt (0 => 173901)
--- trunk/LayoutTests/platform/win/fast/dom/navigator-detached-no-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/win/fast/dom/navigator-detached-no-crash-expected.txt 2014-09-24 00:08:40 UTC (rev 173901)
@@ -0,0 +1,36 @@
+This tests that the navigator object of a deleted frame is disconnected properly. Accessing fields or methods shouldn't crash the browser.
+ Check Navigator
+navigator.appCodeName is OK
+navigator.appName is OK
+navigator.appVersion is OK
+navigator.cookieEnabled is OK
+navigator.getStorageUpdates() is OK
+navigator.javaEnabled() is OK
+navigator.language is OK
+navigator.mimeTypes is OK
+navigator.onLine is OK
+navigator.platform is OK
+navigator.plugins is OK
+navigator.product is OK
+navigator.productSub is OK
+navigator.userAgent is OK
+navigator.vendor is OK
+navigator.vendorSub is OK
+navigator.appCodeName is OK
+navigator.appName is OK
+navigator.appVersion is OK
+navigator.cookieEnabled is OK
+navigator.getStorageUpdates() is OK
+navigator.hardwareConcurrency is OK
+navigator.javaEnabled() is OK
+navigator.language is OK
+navigator.mimeTypes is OK
+navigator.onLine is OK
+navigator.platform is OK
+navigator.plugins is OK
+navigator.product is OK
+navigator.productSub is OK
+navigator.userAgent is OK
+navigator.vendor is OK
+navigator.vendorSub is OK
+
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173900] trunk/Source/WebKit
Title: [173900] trunk/Source/WebKit Revision 173900 Author bfulg...@apple.com Date 2014-09-23 16:58:09 -0700 (Tue, 23 Sep 2014) Log Message [Win] 64-bit Build fix after r173882. * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Add correct 64-bit mangled symbol name. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in Diff Modified: trunk/Source/WebKit/ChangeLog (173899 => 173900) --- trunk/Source/WebKit/ChangeLog 2014-09-23 23:34:49 UTC (rev 173899) +++ trunk/Source/WebKit/ChangeLog 2014-09-23 23:58:09 UTC (rev 173900) @@ -1,3 +1,9 @@ +2014-09-23 Brent Fulgham + +[Win] 64-bit Build fix after r173882. + +* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Add correct 64-bit mangled symbol name. + 2014-09-23 Joseph Pecoraro Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (173899 => 173900) --- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-09-23 23:34:49 UTC (rev 173899) +++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-09-23 23:58:09 UTC (rev 173900) @@ -219,7 +219,7 @@ symbolWithPointer(??1InspectorFrontendClientLocal@WebCore@@UAE@XZ, ??1InspectorFrontendClientLocal@WebCore@@UEAA@XZ) symbolWithPointer(?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z) symbolWithPointer(?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z) -symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@_N@Z, ?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@_N@Z) +symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@_N@Z, ?connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@_N@Z) symbolWithPointer(?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPAVPage@2@ABVString@WTF@@@Z, ?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPEAVPage@2@AEBVString@WTF@@@Z) symbolWithPointer(?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UEAAXXZ) symbolWithPointer(?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAE?AVString@WTF@@ABV45@@Z, ?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UEAA?AVString@WTF@@AEBV45@@Z) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173899] trunk/Tools
Title: [173899] trunk/Tools
Revision 173899
Author roger_f...@apple.com
Date 2014-09-23 16:34:49 -0700 (Tue, 23 Sep 2014)
Log Message
[Windows] Add some logging to debug a problem with the Windows bots that causes layout tests to exit early.
* Scripts/webkitpy/port/driver.py:
(Driver):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/port/driver.py
Diff
Modified: trunk/Tools/ChangeLog (173898 => 173899)
--- trunk/Tools/ChangeLog 2014-09-23 23:07:28 UTC (rev 173898)
+++ trunk/Tools/ChangeLog 2014-09-23 23:34:49 UTC (rev 173899)
@@ -1,3 +1,10 @@
+2014-09-23 Roger Fong
+
+[Windows] Add some logging to debug a problem with the Windows bots that causes layout tests to exit early.
+
+* Scripts/webkitpy/port/driver.py:
+(Driver):
+
2014-09-23 Jer Noble
[Tools] git-commit uses wrong ChangeLog when run from a subdirectory
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (173898 => 173899)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-23 23:07:28 UTC (rev 173898)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-09-23 23:34:49 UTC (rev 173899)
@@ -392,6 +392,7 @@
else:
command = self._port.abspath_for_test(driver_input.test_name)
if sys.platform == 'cygwin':
+_log.error("Command for cygpath: %s" % command)
command = path.cygpath(command)
assert not driver_input.image_hash or driver_input.should_run_pixel_test
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173898] branches/safari-600.1-branch/Source/WebCore
Title: [173898] branches/safari-600.1-branch/Source/WebCore
Revision 173898
Author lforsch...@apple.com
Date 2014-09-23 16:07:28 -0700 (Tue, 23 Sep 2014)
Log Message
Rollout 173848. rdar://problem/12708225
Modified Paths
branches/safari-600.1-branch/Source/WebCore/ChangeLog
branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173897 => 173898)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 22:30:50 UTC (rev 173897)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 23:07:28 UTC (rev 173898)
@@ -1,5 +1,9 @@
2014-09-23 Lucas Forschler
+Rollout trunk r173848 | (r173897 on branch)
+
+2014-09-23 Lucas Forschler
+
Merge r173848
2014-09-22 Alexey Proskuryakov
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (173897 => 173898)
--- branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 22:30:50 UTC (rev 173897)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 23:07:28 UTC (rev 173898)
@@ -85,13 +85,10 @@
{
if (Page* page = m_document->page())
m_identifier = page->progress().createUniqueIdentifier();
-
-LOG(Network, "WebSocketChannel %p ctor, identifier %lu", this, m_identifier);
}
WebSocketChannel::~WebSocketChannel()
{
-LOG(Network, "WebSocketChannel %p dtor", this);
}
void WebSocketChannel::connect(const URL& url, const String& protocol)
@@ -184,7 +181,6 @@
ASSERT(!m_suspended);
if (!m_handle)
return;
-Ref protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
startClosingHandshake(code, reason);
if (m_closing && !m_closingTimer.isActive())
m_closingTimer.startOneShot(2 * TCPMaximumSegmentLifetime);
@@ -212,8 +208,6 @@
if (m_handle && !m_closed)
m_handle->disconnect(); // Will call didClose().
-
-ASSERT(m_closed);
}
void WebSocketChannel::disconnect()
@@ -464,7 +458,6 @@
void WebSocketChannel::startClosingHandshake(int code, const String& reason)
{
LOG(Network, "WebSocketChannel %p startClosingHandshake() code=%d m_receivedClosingHandshake=%d", this, m_closing, m_receivedClosingHandshake);
-ASSERT(!m_closed);
if (m_closing)
return;
ASSERT(m_handle);
@@ -478,14 +471,8 @@
buf.append(reason.utf8().data(), reason.utf8().length());
}
enqueueRawFrame(WebSocketFrame::OpCodeClose, buf.data(), buf.size());
-Ref protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
processOutgoingFrameQueue();
-if (m_closed) {
-// The channel got closed because processOutgoingFrameQueue() failed.
-return;
-}
-
m_closing = true;
if (m_client)
m_client->didStartClosingHandshake();
@@ -719,8 +706,6 @@
if (m_outgoingFrameQueueStatus == OutgoingFrameQueueClosed)
return;
-Ref protect(*this); // Any call to fail() will get the channel closed and dereferenced.
-
while (!m_outgoingFrameQueue.isEmpty()) {
OwnPtr frame = m_outgoingFrameQueue.takeFirst();
switch (frame->frameType) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173897] branches/safari-600.1-branch/Source/WebCore
Title: [173897] branches/safari-600.1-branch/Source/WebCore
Revision 173897
Author lforsch...@apple.com
Date 2014-09-23 15:30:50 -0700 (Tue, 23 Sep 2014)
Log Message
Merged r173848. rdar://problem/12708225
Modified Paths
branches/safari-600.1-branch/Source/WebCore/ChangeLog
branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (173896 => 173897)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 22:29:35 UTC (rev 173896)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-09-23 22:30:50 UTC (rev 173897)
@@ -1,3 +1,29 @@
+2014-09-23 Lucas Forschler
+
+Merge r173848
+
+2014-09-22 Alexey Proskuryakov
+
+WebSocket crash when a connection is closed from server side
+https://bugs.webkit.org/show_bug.cgi?id=137009
+rdar://problem/18333977
+rdar://problem/12708225
+
+Reviewed by Brady Eidson.
+
+I don't think that this can be tested with our test server.
+
+* Modules/websockets/WebSocketChannel.cpp:
+(WebCore::WebSocketChannel::WebSocketChannel): Added logging.
+(WebCore::WebSocketChannel::~WebSocketChannel): Ditto.
+(WebCore::WebSocketChannel::close): Protect self, because startClosingHandshake
+can release the last reference.
+(WebCore::WebSocketChannel::fail): Added an assertion that the channel is always
+closed after this function.
+(WebCore::WebSocketChannel::startClosingHandshake): Protect self, and don't change
+the stack from closed back to closing if after failing to send closing handshake.
+(WebCore::WebSocketChannel::processOutgoingFrameQueue): Protect self.
+
2014-09-17 Matthew Hanson
Merge r173664. rdar://problem/18187713
Modified: branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (173896 => 173897)
--- branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 22:29:35 UTC (rev 173896)
+++ branches/safari-600.1-branch/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2014-09-23 22:30:50 UTC (rev 173897)
@@ -85,10 +85,13 @@
{
if (Page* page = m_document->page())
m_identifier = page->progress().createUniqueIdentifier();
+
+LOG(Network, "WebSocketChannel %p ctor, identifier %lu", this, m_identifier);
}
WebSocketChannel::~WebSocketChannel()
{
+LOG(Network, "WebSocketChannel %p dtor", this);
}
void WebSocketChannel::connect(const URL& url, const String& protocol)
@@ -181,6 +184,7 @@
ASSERT(!m_suspended);
if (!m_handle)
return;
+Ref protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
startClosingHandshake(code, reason);
if (m_closing && !m_closingTimer.isActive())
m_closingTimer.startOneShot(2 * TCPMaximumSegmentLifetime);
@@ -208,6 +212,8 @@
if (m_handle && !m_closed)
m_handle->disconnect(); // Will call didClose().
+
+ASSERT(m_closed);
}
void WebSocketChannel::disconnect()
@@ -458,6 +464,7 @@
void WebSocketChannel::startClosingHandshake(int code, const String& reason)
{
LOG(Network, "WebSocketChannel %p startClosingHandshake() code=%d m_receivedClosingHandshake=%d", this, m_closing, m_receivedClosingHandshake);
+ASSERT(!m_closed);
if (m_closing)
return;
ASSERT(m_handle);
@@ -471,8 +478,14 @@
buf.append(reason.utf8().data(), reason.utf8().length());
}
enqueueRawFrame(WebSocketFrame::OpCodeClose, buf.data(), buf.size());
+Ref protect(*this); // An attempt to send closing handshake may fail, which will get the channel closed and dereferenced.
processOutgoingFrameQueue();
+if (m_closed) {
+// The channel got closed because processOutgoingFrameQueue() failed.
+return;
+}
+
m_closing = true;
if (m_client)
m_client->didStartClosingHandshake();
@@ -706,6 +719,8 @@
if (m_outgoingFrameQueueStatus == OutgoingFrameQueueClosed)
return;
+Ref protect(*this); // Any call to fail() will get the channel closed and dereferenced.
+
while (!m_outgoingFrameQueue.isEmpty()) {
OwnPtr frame = m_outgoingFrameQueue.takeFirst();
switch (frame->frameType) {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173896] trunk/Source/JavaScriptCore
Title: [173896] trunk/Source/_javascript_Core
Revision 173896
Author mark@apple.com
Date 2014-09-23 15:29:35 -0700 (Tue, 23 Sep 2014)
Log Message
DebuggerCallFrame::invalidate() should invalidate all DebuggerScope chains.
Reviewed by Geoffrey Garen.
DebuggerCallFrame::invalidate() currently invalidates all DebuggerCallFrames
in the debugger stack, but only invalidates the DebuggerScope chain of the
top most frame. We should also invalidate all the DebuggerScope chains of
the other frames in the debugger stack.
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::invalidate):
* debugger/DebuggerScope.cpp:
(JSC::DebuggerScope::invalidateChain):
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.cpp
trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (173895 => 173896)
--- trunk/Source/_javascript_Core/ChangeLog 2014-09-23 22:27:38 UTC (rev 173895)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-09-23 22:29:35 UTC (rev 173896)
@@ -1,5 +1,22 @@
2014-09-23 Mark Lam
+DebuggerCallFrame::invalidate() should invalidate all DebuggerScope chains.
+
+
+Reviewed by Geoffrey Garen.
+
+DebuggerCallFrame::invalidate() currently invalidates all DebuggerCallFrames
+in the debugger stack, but only invalidates the DebuggerScope chain of the
+top most frame. We should also invalidate all the DebuggerScope chains of
+the other frames in the debugger stack.
+
+* debugger/DebuggerCallFrame.cpp:
+(JSC::DebuggerCallFrame::invalidate):
+* debugger/DebuggerScope.cpp:
+(JSC::DebuggerScope::invalidateChain):
+
+2014-09-23 Mark Lam
+
Renamed DebuggerCallFrameScope to DebuggerPausedScope.
Modified: trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.cpp (173895 => 173896)
--- trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.cpp 2014-09-23 22:27:38 UTC (rev 173895)
+++ trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.cpp 2014-09-23 22:29:35 UTC (rev 173896)
@@ -208,14 +208,13 @@
void DebuggerCallFrame::invalidate()
{
-m_callFrame = nullptr;
-if (m_scope) {
-m_scope->invalidateChain();
-m_scope.clear();
-}
-RefPtr frame = m_caller.release();
+RefPtr frame = this;
while (frame) {
frame->m_callFrame = nullptr;
+if (frame->m_scope) {
+frame->m_scope->invalidateChain();
+frame->m_scope.clear();
+}
frame = frame->m_caller.release();
}
}
Modified: trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp (173895 => 173896)
--- trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp 2014-09-23 22:27:38 UTC (rev 173895)
+++ trunk/Source/_javascript_Core/debugger/DebuggerScope.cpp 2014-09-23 22:29:35 UTC (rev 173896)
@@ -142,12 +142,14 @@
void DebuggerScope::invalidateChain()
{
+if (!isValid())
+return;
+
DebuggerScope* scope = this;
while (scope) {
-ASSERT(scope->isValid());
DebuggerScope* nextScope = scope->m_next.get();
scope->m_next.clear();
-scope->m_scope.clear();
+scope->m_scope.clear(); // This also marks this scope as invalid.
scope = nextScope;
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173895] trunk/Source
Title: [173895] trunk/Source Revision 173895 Author cdu...@apple.com Date 2014-09-23 15:27:38 -0700 (Tue, 23 Sep 2014) Log Message Unreviewed build fix after r173893. Partial revert of r173893 to fix debug builds. Source/WebCore: * accessibility/AccessibilityNodeObject.cpp: (WebCore::AccessibilityNodeObject::text): * bindings/js/JSDOMWindowCustom.cpp: (WebCore::namedItemGetter): (WebCore::JSDOMWindow::getOwnPropertySlot): (WebCore::JSDOMWindow::getOwnPropertySlotByIndex): * css/SelectorChecker.cpp: (WebCore::SelectorChecker::checkOne): * cssjit/SelectorCompiler.cpp: (WebCore::SelectorCompiler::makeContextStyleUniqueIfNecessaryAndTestIsPlaceholderShown): (WebCore::SelectorCompiler::makeElementStyleUniqueIfNecessaryAndTestIsPlaceholderShown): (WebCore::SelectorCompiler::isPlaceholderShown): * dom/Document.cpp: (WebCore::Document::processHttpEquiv): * dom/Element.cpp: (WebCore::Element::insertedInto): (WebCore::Element::removedFrom): (WebCore::Element::updateName): (WebCore::Element::updateId): * editing/Editor.cpp: (WebCore::Editor::selectionForCommand): (WebCore::findFirstMarkable): * editing/FrameSelection.cpp: (WebCore::FrameSelection::selectAll): * html/HTMLElement.cpp: (WebCore::HTMLElement::matchesReadWritePseudoClass): (WebCore::HTMLElement::directionality): * html/HTMLImageElement.cpp: (WebCore::HTMLImageElement::parseAttribute): * html/HTMLObjectElement.cpp: (WebCore::HTMLObjectElement::updateDocNamedItem): * html/HTMLPlugInImageElement.cpp: (WebCore::addPlugInsFromNodeListMatchingPlugInOrigin): * html/HTMLTextFormControlElement.cpp: (WebCore::enclosingTextFormControl): * page/FrameView.cpp: (WebCore::FrameView::addEmbeddedObjectToUpdate): (WebCore::FrameView::updateEmbeddedObject): * rendering/HitTestResult.cpp: (WebCore::HitTestResult::absolutePDFURL): * rendering/RenderEmbeddedObject.cpp: (WebCore::RenderEmbeddedObject::paintContents): (WebCore::RenderEmbeddedObject::layout): * rendering/RenderSnapshottedPlugIn.cpp: (WebCore::RenderSnapshottedPlugIn::plugInImageElement): * rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::textFormControlElement): * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::paintSearchFieldCancelButton): (WebCore::RenderThemeMac::paintSnapshottedPluginOverlay): * testing/Internals.cpp: (WebCore::Internals::visiblePlaceholder): Source/WebKit/win: * DOMHTMLClasses.cpp: (DOMHTMLDocument::URL): (DOMHTMLDocument::body): (DOMHTMLDocument::forms): Source/WebKit2: * WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm: (WebKit::PDFPluginTextAnnotation::value): * WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::initializePlugin): (WebKit::PluginView::pluginSnapshotTimerFired): (WebKit::PluginView::pluginDidReceiveUserInteraction): * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::createPlugin): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp trunk/Source/WebCore/css/SelectorChecker.cpp trunk/Source/WebCore/cssjit/SelectorCompiler.cpp trunk/Source/WebCore/dom/Document.cpp trunk/Source/WebCore/dom/Element.cpp trunk/Source/WebCore/editing/Editor.cpp trunk/Source/WebCore/editing/FrameSelection.cpp trunk/Source/WebCore/html/HTMLElement.cpp trunk/Source/WebCore/html/HTMLImageElement.cpp trunk/Source/WebCore/html/HTMLObjectElement.cpp trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp trunk/Source/WebCore/page/FrameView.cpp trunk/Source/WebCore/rendering/HitTestResult.cpp trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp trunk/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp trunk/Source/WebCore/rendering/RenderTextControl.cpp trunk/Source/WebCore/rendering/RenderThemeMac.mm trunk/Source/WebCore/testing/Internals.cpp trunk/Source/WebKit/win/ChangeLog trunk/Source/WebKit/win/DOMHTMLClasses.cpp trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPluginTextAnnotation.mm trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (173894 => 173895) --- trunk/Source/WebCore/ChangeLog 2014-09-23 22:16:25 UTC (rev 173894) +++ trunk/Source/WebCore/ChangeLog 2014-09-23 22:27:38 UTC (rev 173895) @@ -1,3 +1,62 @@ +2014-09-23 Christophe Dumez + +Unreviewed build fix after r173893. + +Partial revert of r173893 to fix debug builds. + +* accessibility/AccessibilityNodeObject.cpp: +(WebCore::AccessibilityNodeObject::text): +* bindings/js/JSDOMWindowCustom.cpp: +(WebCore::namedItemGetter): +(WebCore::JSDOMWindow::getOwnPropertySlot): +(WebCore::JSDOMWindow::getOwnPropertySlotByIndex): +* css/SelectorChecker.cpp: +(WebCore::SelectorChecker::checkOne): +* cssjit/SelectorCompiler.cpp: +(WebCore::SelectorCompiler::makeContextStyleUniqueIfNecessaryAndTestIsPlaceholder
[webkit-changes] [173894] trunk/Source/WebCore
Title: [173894] trunk/Source/WebCore
Revision 173894
Author bfulg...@apple.com
Date 2014-09-23 15:16:25 -0700 (Tue, 23 Sep 2014)
Log Message
Implement snapping behavior for Mac overflow scrolling
https://bugs.webkit.org/show_bug.cgi?id=135774
Patch by Wenson Hsieh on 2014-09-22
Reviewed by Beth Dakin.
Hooks into AxisScrollSnapAnimator to implement overflow scroll snapping on Mac.
We need to find a way to test this!
* dom/Element.cpp:
(WebCore::Element::dispatchWheelEvent):
* page/EventHandler.cpp:
(WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::handleWheelEvent):
(WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
(WebCore::ScrollAnimator::scrollOffsetInAxis):
(WebCore::ScrollAnimator::immediateScrollInAxis):
(WebCore::ScrollAnimator::startScrollSnapTimer):
(WebCore::ScrollAnimator::stopScrollSnapTimer):
(WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
(WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
* platform/ScrollAnimator.h:
* platform/mac/AxisScrollSnapAnimator.h:
* platform/mac/AxisScrollSnapAnimator.mm:
(WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
(WebCore::AxisScrollSnapAnimator::beginScrollSnapAnimation):
(WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
(WebCore::AxisScrollSnapAnimator::initializeGlideParameters):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateScrollInfoAfterLayout):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/ScrollAnimator.cpp
trunk/Source/WebCore/platform/ScrollAnimator.h
trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h
trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm
trunk/Source/WebCore/rendering/RenderLayer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (173893 => 173894)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 22:16:25 UTC (rev 173894)
@@ -1,3 +1,37 @@
+2014-09-22 Wenson Hsieh
+
+Implement snapping behavior for Mac overflow scrolling
+https://bugs.webkit.org/show_bug.cgi?id=135774
+
+Reviewed by Beth Dakin.
+
+Hooks into AxisScrollSnapAnimator to implement overflow scroll snapping on Mac.
+
+We need to find a way to test this!
+
+* dom/Element.cpp:
+(WebCore::Element::dispatchWheelEvent):
+* page/EventHandler.cpp:
+(WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis):
+* platform/ScrollAnimator.cpp:
+(WebCore::ScrollAnimator::handleWheelEvent):
+(WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
+(WebCore::ScrollAnimator::scrollOffsetInAxis):
+(WebCore::ScrollAnimator::immediateScrollInAxis):
+(WebCore::ScrollAnimator::startScrollSnapTimer):
+(WebCore::ScrollAnimator::stopScrollSnapTimer):
+(WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
+(WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
+* platform/ScrollAnimator.h:
+* platform/mac/AxisScrollSnapAnimator.h:
+* platform/mac/AxisScrollSnapAnimator.mm:
+(WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
+(WebCore::AxisScrollSnapAnimator::beginScrollSnapAnimation):
+(WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
+(WebCore::AxisScrollSnapAnimator::initializeGlideParameters):
+* rendering/RenderLayer.cpp:
+(WebCore::RenderLayer::updateScrollInfoAfterLayout):
+
2014-09-23 Chris Dumez
Use downcast() instead of toHTML*Element()
Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (173893 => 173894)
--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-09-23 22:16:25 UTC (rev 173894)
@@ -82,6 +82,18 @@
bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
{
+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+if (m_verticalScrollSnapAnimator) {
+m_verticalScrollSnapAnimator->handleWheelEvent(e);
+if (m_verticalScrollSnapAnimator->shouldOverrideWheelEvent(e))
+return false;
+}
+if (m_horizontalScrollSnapAnimator) {
+m_horizontalScrollSnapAnimator->handleWheelEvent(e);
+if (m_horizontalScrollSnapAnimator->shouldOverrideWheelEvent(e))
+return false;
+}
+#endif
#if PLATFORM(COCOA)
// Events in the PlatformWheelEventPhaseMayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
// This causes us to return with an 'unhandled' return state, even though this event was successfully processed.
@@ -158,4 +170,64 @@
m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_currentPosY));
}
+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+void ScrollAnimator::updateScrollAnimatorsAndTimers()
+{
+// FIXME: Current
[webkit-changes] [173892] trunk/Source/JavaScriptCore
Title: [173892] trunk/Source/_javascript_Core
Revision 173892
Author mark@apple.com
Date 2014-09-23 14:24:01 -0700 (Tue, 23 Sep 2014)
Log Message
Renamed DebuggerCallFrameScope to DebuggerPausedScope.
Reviewed by Michael Saboff.
DebuggerPausedScope is a better name for this data structure because it
is meant for tracking the period within which the debugger is paused,
and doing clean ups after the pause ends.
* debugger/Debugger.cpp:
(JSC::DebuggerPausedScope::DebuggerPausedScope):
(JSC::DebuggerPausedScope::~DebuggerPausedScope):
(JSC::Debugger::pauseIfNeeded):
(JSC::DebuggerCallFrameScope::DebuggerCallFrameScope): Deleted.
(JSC::DebuggerCallFrameScope::~DebuggerCallFrameScope): Deleted.
* debugger/Debugger.h:
* debugger/DebuggerCallFrame.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/debugger/Debugger.cpp
trunk/Source/_javascript_Core/debugger/Debugger.h
trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (173891 => 173892)
--- trunk/Source/_javascript_Core/ChangeLog 2014-09-23 21:21:17 UTC (rev 173891)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-09-23 21:24:01 UTC (rev 173892)
@@ -1,3 +1,23 @@
+2014-09-23 Mark Lam
+
+Renamed DebuggerCallFrameScope to DebuggerPausedScope.
+
+
+Reviewed by Michael Saboff.
+
+DebuggerPausedScope is a better name for this data structure because it
+is meant for tracking the period within which the debugger is paused,
+and doing clean ups after the pause ends.
+
+* debugger/Debugger.cpp:
+(JSC::DebuggerPausedScope::DebuggerPausedScope):
+(JSC::DebuggerPausedScope::~DebuggerPausedScope):
+(JSC::Debugger::pauseIfNeeded):
+(JSC::DebuggerCallFrameScope::DebuggerCallFrameScope): Deleted.
+(JSC::DebuggerCallFrameScope::~DebuggerCallFrameScope): Deleted.
+* debugger/Debugger.h:
+* debugger/DebuggerCallFrame.h:
+
2014-09-23 Tomas Popela
[CLoop] - Fix CLoop on the 32-bit Big-Endians
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (173891 => 173892)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-09-23 21:21:17 UTC (rev 173891)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-09-23 21:24:01 UTC (rev 173892)
@@ -96,9 +96,9 @@
namespace JSC {
-class DebuggerCallFrameScope {
+class DebuggerPausedScope {
public:
-DebuggerCallFrameScope(Debugger& debugger)
+DebuggerPausedScope(Debugger& debugger)
: m_debugger(debugger)
{
ASSERT(!m_debugger.m_currentDebuggerCallFrame);
@@ -106,7 +106,7 @@
m_debugger.m_currentDebuggerCallFrame = DebuggerCallFrame::create(debugger.m_currentCallFrame);
}
-~DebuggerCallFrameScope()
+~DebuggerPausedScope()
{
if (m_debugger.m_currentDebuggerCallFrame) {
m_debugger.m_currentDebuggerCallFrame->invalidate();
@@ -644,7 +644,7 @@
bool pauseNow = m_pauseOnNextStatement;
pauseNow |= (m_pauseOnCallFrame == m_currentCallFrame);
-DebuggerCallFrameScope debuggerCallFrameScope(*this);
+DebuggerPausedScope debuggerPausedScope(*this);
intptr_t sourceID = DebuggerCallFrame::sourceIDForCallFrame(m_currentCallFrame);
TextPosition position = DebuggerCallFrame::positionForCallFrame(m_currentCallFrame);
Modified: trunk/Source/_javascript_Core/debugger/Debugger.h (173891 => 173892)
--- trunk/Source/_javascript_Core/debugger/Debugger.h 2014-09-23 21:21:17 UTC (rev 173891)
+++ trunk/Source/_javascript_Core/debugger/Debugger.h 2014-09-23 21:24:01 UTC (rev 173892)
@@ -207,7 +207,7 @@
RefPtr m_currentDebuggerCallFrame;
-friend class DebuggerCallFrameScope;
+friend class DebuggerPausedScope;
friend class TemporaryPausedState;
friend class LLIntOffsetsExtractor;
};
Modified: trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h (173891 => 173892)
--- trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h 2014-09-23 21:21:17 UTC (rev 173891)
+++ trunk/Source/_javascript_Core/debugger/DebuggerCallFrame.h 2014-09-23 21:24:01 UTC (rev 173892)
@@ -82,7 +82,7 @@
CallFrame* m_callFrame;
RefPtr m_caller;
TextPosition m_position;
-// The DebuggerCallFrameScope is responsible for calling invalidate() which,
+// The DebuggerPausedScope is responsible for calling invalidate() which,
// in turn, will clear this strong ref.
Strong m_scope;
};
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173891] trunk/Source/WebCore
Title: [173891] trunk/Source/WebCore
Revision 173891
Author cdu...@apple.com
Date 2014-09-23 14:21:17 -0700 (Tue, 23 Sep 2014)
Log Message
Have DataTransfer::files() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137039
Reviewed by Ryosuke Niwa.
Have DataTransfer::files() return a reference instead of a pointer as
it can never return null.
No new tests, no behavior change.
* dom/DataTransfer.cpp:
(WebCore::DataTransfer::files):
* dom/DataTransfer.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/DataTransfer.cpp
trunk/Source/WebCore/dom/DataTransfer.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (173890 => 173891)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 21:21:17 UTC (rev 173891)
@@ -1,5 +1,21 @@
2014-09-23 Chris Dumez
+Have DataTransfer::files() return a reference
+https://bugs.webkit.org/show_bug.cgi?id=137039
+
+Reviewed by Ryosuke Niwa.
+
+Have DataTransfer::files() return a reference instead of a pointer as
+it can never return null.
+
+No new tests, no behavior change.
+
+* dom/DataTransfer.cpp:
+(WebCore::DataTransfer::files):
+* dom/DataTransfer.h:
+
+2014-09-23 Chris Dumez
+
Have NamedNodeMap::element() and DOMStringMap::element() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137040
Modified: trunk/Source/WebCore/dom/DataTransfer.cpp (173890 => 173891)
--- trunk/Source/WebCore/dom/DataTransfer.cpp 2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/dom/DataTransfer.cpp 2014-09-23 21:21:17 UTC (rev 173891)
@@ -159,7 +159,7 @@
return m_pasteboard->types();
}
-FileList* DataTransfer::files() const
+FileList& DataTransfer::files() const
{
bool newlyCreatedFileList = !m_fileList;
if (!m_fileList)
@@ -167,13 +167,13 @@
if (!canReadData()) {
m_fileList->clear();
-return m_fileList.get();
+return *m_fileList;
}
#if ENABLE(DRAG_SUPPORT)
if (m_forDrag && !m_forFileDrag) {
ASSERT(m_fileList->isEmpty());
-return m_fileList.get();
+return *m_fileList;
}
#endif
@@ -181,7 +181,7 @@
for (const String& filename : m_pasteboard->readFilenames())
m_fileList->append(File::create(filename));
}
-return m_fileList.get();
+return *m_fileList;
}
bool DataTransfer::hasFileOfType(const String& type)
Modified: trunk/Source/WebCore/dom/DataTransfer.h (173890 => 173891)
--- trunk/Source/WebCore/dom/DataTransfer.h 2014-09-23 21:17:28 UTC (rev 173890)
+++ trunk/Source/WebCore/dom/DataTransfer.h 2014-09-23 21:21:17 UTC (rev 173891)
@@ -56,7 +56,7 @@
Vector types() const;
-FileList* files() const;
+FileList& files() const;
void clearData(const String& type);
void clearData();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173890] trunk/Source/WebCore
Title: [173890] trunk/Source/WebCore
Revision 173890
Author cdu...@apple.com
Date 2014-09-23 14:17:28 -0700 (Tue, 23 Sep 2014)
Log Message
Have NamedNodeMap::element() and DOMStringMap::element() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137040
Reviewed by Ryosuke Niwa.
Have NamedNodeMap::element() and DOMStringMap::element() return a
reference instead of a pointer as they can never return null.
No new tests, no behavior change.
* dom/DatasetDOMStringMap.h:
* dom/NamedNodeMap.h:
(WebCore::NamedNodeMap::element):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/DatasetDOMStringMap.h
trunk/Source/WebCore/dom/NamedNodeMap.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (173889 => 173890)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 21:08:36 UTC (rev 173889)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 21:17:28 UTC (rev 173890)
@@ -1,5 +1,21 @@
2014-09-23 Chris Dumez
+Have NamedNodeMap::element() and DOMStringMap::element() return a reference
+https://bugs.webkit.org/show_bug.cgi?id=137040
+
+Reviewed by Ryosuke Niwa.
+
+Have NamedNodeMap::element() and DOMStringMap::element() return a
+reference instead of a pointer as they can never return null.
+
+No new tests, no behavior change.
+
+* dom/DatasetDOMStringMap.h:
+* dom/NamedNodeMap.h:
+(WebCore::NamedNodeMap::element):
+
+2014-09-23 Chris Dumez
+
Have DOMImplementation::document() and Element::attributes() return references
https://bugs.webkit.org/show_bug.cgi?id=137035
Modified: trunk/Source/WebCore/dom/DatasetDOMStringMap.h (173889 => 173890)
--- trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-09-23 21:08:36 UTC (rev 173889)
+++ trunk/Source/WebCore/dom/DatasetDOMStringMap.h 2014-09-23 21:17:28 UTC (rev 173890)
@@ -52,7 +52,7 @@
void setItem(const String& name, const String& value, ExceptionCode&);
bool deleteItem(const String& name);
-Element* element() { return &m_element; }
+Element& element() { return m_element; }
private:
Element& m_element;
Modified: trunk/Source/WebCore/dom/NamedNodeMap.h (173889 => 173890)
--- trunk/Source/WebCore/dom/NamedNodeMap.h 2014-09-23 21:08:36 UTC (rev 173889)
+++ trunk/Source/WebCore/dom/NamedNodeMap.h 2014-09-23 21:17:28 UTC (rev 173890)
@@ -63,8 +63,7 @@
PassRefPtr item(unsigned index) const;
unsigned length() const;
-// FIXME: It's lame that the bindings generator chokes if we return Element& here.
-Element* element() const { return &m_element; }
+Element& element() const { return m_element; }
private:
explicit NamedNodeMap(Element& element)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173889] trunk/Source/WebInspectorUI
Title: [173889] trunk/Source/WebInspectorUI
Revision 173889
Author timo...@apple.com
Date 2014-09-23 14:08:36 -0700 (Tue, 23 Sep 2014)
Log Message
Web Inspector: Remove UserInterface/Images/gtk from Apple builds
https://bugs.webkit.org/show_bug.cgi?id=136955
Reviewed by Joseph Pecoraro.
* Scripts/copy-user-interface-resources.pl:
Remove Images/Legacy and Images/gtk on Mac and Windows builds by looking
at the MAC_OS_X_VERSION_MAJOR and OFFICIAL_BUILD environment vars.
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (173888 => 173889)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-09-23 21:04:53 UTC (rev 173888)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-09-23 21:08:36 UTC (rev 173889)
@@ -1,3 +1,14 @@
+2014-09-23 Timothy Hatcher
+
+Web Inspector: Remove UserInterface/Images/gtk from Apple builds
+https://bugs.webkit.org/show_bug.cgi?id=136955
+
+Reviewed by Joseph Pecoraro.
+
+* Scripts/copy-user-interface-resources.pl:
+Remove Images/Legacy and Images/gtk on Mac and Windows builds by looking
+at the MAC_OS_X_VERSION_MAJOR and OFFICIAL_BUILD environment vars.
+
2014-09-21 Saam Barati
Web Inspector: fix TypeSet hierarchy in TypeTokenView
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (173888 => 173889)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-09-23 21:04:53 UTC (rev 173888)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2014-09-23 21:08:36 UTC (rev 173889)
@@ -2,7 +2,7 @@
use English;
use File::Copy qw(copy);
-use File::Path qw(make_path);
+use File::Path qw(make_path remove_tree);
use File::Spec;
my $useDirCopy = 0;
@@ -178,6 +178,12 @@
ditto(File::Spec->catdir($uiRoot, 'Images'), File::Spec->catdir($targetResourcePath, 'Images'));
+# Remove Images/Legacy on modern systems (OS X 10.10 Yosemite and greater or Windows).
+remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'Legacy')) if (defined $ENV{'MAC_OS_X_VERSION_MAJOR'} && $ENV{'MAC_OS_X_VERSION_MAJOR'} ge 101000) or defined $ENV{'OFFICIAL_BUILD'};
+
+# Remove Images/gtk on Mac and Windows builds.
+remove_tree(File::Spec->catdir($targetResourcePath, 'Images', 'gtk')) if defined $ENV{'MAC_OS_X_VERSION_MAJOR'} or defined $ENV{'OFFICIAL_BUILD'};
+
# Copy the Legacy directory.
ditto(File::Spec->catfile($uiRoot, 'Protocol', 'Legacy'), File::Spec->catfile($protocolDir, 'Legacy'));
} else {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173888] trunk/Source/WebKit2
Title: [173888] trunk/Source/WebKit2 Revision 173888 Author jer.no...@apple.com Date 2014-09-23 14:04:53 -0700 (Tue, 23 Sep 2014) Log Message REGRESSION (r171197): Clip's content is drawn behind Safari window when entering Full Screen youtube html5 first time https://bugs.webkit.org/show_bug.cgi?id=137029 Reviewed by Brent Fulgham. In r171197, we ordered the full screen window on- and off-screen so that the fullscreen animation went to the correct screen, which introduced a subtle glitch at the beginning and end of an animation. For entering, ensure that the window is scaled to its starting size before ordering on-screen. For exiting, order the window off- screen before resetting its clipping rect. * UIProcess/mac/WKFullScreenWindowController.mm: (-[WKFullScreenWindowController beganEnterFullScreenWithInitialFrame:finalFrame:]): (-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (173887 => 173888) --- trunk/Source/WebKit2/ChangeLog 2014-09-23 20:54:14 UTC (rev 173887) +++ trunk/Source/WebKit2/ChangeLog 2014-09-23 21:04:53 UTC (rev 173888) @@ -1,3 +1,19 @@ +2014-09-23 Jer Noble + +REGRESSION (r171197): Clip's content is drawn behind Safari window when entering Full Screen youtube html5 first time +https://bugs.webkit.org/show_bug.cgi?id=137029 + +Reviewed by Brent Fulgham. + +In r171197, we ordered the full screen window on- and off-screen so that the fullscreen animation went to the +correct screen, which introduced a subtle glitch at the beginning and end of an animation. For entering, ensure +that the window is scaled to its starting size before ordering on-screen. For exiting, order the window off- +screen before resetting its clipping rect. + +* UIProcess/mac/WKFullScreenWindowController.mm: +(-[WKFullScreenWindowController beganEnterFullScreenWithInitialFrame:finalFrame:]): +(-[WKFullScreenWindowController finishedExitFullScreenAnimation:]): + 2014-09-23 Joseph Pecoraro Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm (173887 => 173888) --- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-09-23 20:54:14 UTC (rev 173887) +++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.mm 2014-09-23 21:04:53 UTC (rev 173888) @@ -267,6 +267,12 @@ if (!_backgroundWindow) _backgroundWindow = createBackgroundFullscreenWindow(NSZeroRect); +// The -orderBack: call below can cause the full screen window's contents to draw on top of +// all other visible windows on the screen, despite NSDisableScreenUpdates having been set, and +// despite being explicitly ordered behind all other windows. Set the initial scaled frame here +// before ordering the window on-screen to avoid this flash. +WKWindowSetScaledFrame(self.window, initialFrame, finalFrame); + [self.window orderBack: self]; // Make sure the full screen window is part of the correct Space. [[self window] enterFullScreenMode:self]; } @@ -383,11 +389,11 @@ [self _replaceView:_webViewPlaceholder.get() with:_webView]; makeResponderFirstResponderIfDescendantOfView(_webView.window, firstResponder, _webView); +[[self window] orderOut:self]; + NSRect windowBounds = [[self window] frame]; windowBounds.origin = NSZeroPoint; WKWindowSetClipRect([self window], windowBounds); - -[[self window] orderOut:self]; [[self window] setFrame:NSZeroRect display:YES]; [_scaleAnimation stopAnimation]; ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173887] trunk/Tools
Title: [173887] trunk/Tools
Revision 173887
Author jer.no...@apple.com
Date 2014-09-23 13:54:14 -0700 (Tue, 23 Sep 2014)
Log Message
[Tools] git-commit uses wrong ChangeLog when run from a subdirectory
https://bugs.webkit.org/show_bug.cgi?id=137031
Reviewed by Joseph Pecoraro.
commit-log-editor is run from the top of the Git checkout, even when git-commit is invoked
from a subdirectory, making the parsed locations of ChangeLog files incorrect. Git provides
a mapping prefix in the GIT_PREFIX environment variable, so apply this prefix to the parsed
ChangeLog locations before passing them to createCommitMessage().
* Scripts/commit-log-editor:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/commit-log-editor
Diff
Modified: trunk/Tools/ChangeLog (173886 => 173887)
--- trunk/Tools/ChangeLog 2014-09-23 20:21:51 UTC (rev 173886)
+++ trunk/Tools/ChangeLog 2014-09-23 20:54:14 UTC (rev 173887)
@@ -1,3 +1,17 @@
+2014-09-23 Jer Noble
+
+[Tools] git-commit uses wrong ChangeLog when run from a subdirectory
+https://bugs.webkit.org/show_bug.cgi?id=137031
+
+Reviewed by Joseph Pecoraro.
+
+commit-log-editor is run from the top of the Git checkout, even when git-commit is invoked
+from a subdirectory, making the parsed locations of ChangeLog files incorrect. Git provides
+a mapping prefix in the GIT_PREFIX environment variable, so apply this prefix to the parsed
+ChangeLog locations before passing them to createCommitMessage().
+
+* Scripts/commit-log-editor:
+
2014-09-23 Youenn Fablet
W3C test importer should detect manual and reference tests according their filenames
Modified: trunk/Tools/Scripts/commit-log-editor (173886 => 173887)
--- trunk/Tools/Scripts/commit-log-editor 2014-09-23 20:21:51 UTC (rev 173886)
+++ trunk/Tools/Scripts/commit-log-editor 2014-09-23 20:54:14 UTC (rev 173887)
@@ -152,6 +152,8 @@
}
close LOG;
+@changeLogs = map { $ENV{GIT_PREFIX} . $_ } @changeLogs if isGit();
+
# We want to match the line endings of the existing log file in case they're
# different from perl's line endings.
$endl = $1 if $logContents =~ /(\r?\n)/;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173886] trunk/Source/JavaScriptCore
Title: [173886] trunk/Source/_javascript_Core Revision 173886 Author commit-qu...@webkit.org Date 2014-09-23 13:21:51 -0700 (Tue, 23 Sep 2014) Log Message [CLoop] - Fix CLoop on the 32-bit Big-Endians https://bugs.webkit.org/show_bug.cgi?id=137020 Patch by Tomas Popela on 2014-09-23 Reviewed by Mark Lam. * llint/LowLevelInterpreter.asm: * llint/LowLevelInterpreter32_64.asm: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm Diff Modified: trunk/Source/_javascript_Core/ChangeLog (173885 => 173886) --- trunk/Source/_javascript_Core/ChangeLog 2014-09-23 19:53:08 UTC (rev 173885) +++ trunk/Source/_javascript_Core/ChangeLog 2014-09-23 20:21:51 UTC (rev 173886) @@ -1,3 +1,13 @@ +2014-09-23 Tomas Popela + +[CLoop] - Fix CLoop on the 32-bit Big-Endians +https://bugs.webkit.org/show_bug.cgi?id=137020 + +Reviewed by Mark Lam. + +* llint/LowLevelInterpreter.asm: +* llint/LowLevelInterpreter32_64.asm: + 2014-09-23 Joseph Pecoraro Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (173885 => 173886) --- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2014-09-23 19:53:08 UTC (rev 173885) +++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2014-09-23 20:21:51 UTC (rev 173886) @@ -533,13 +533,21 @@ end macro functionForCallCodeBlockGetter(targetRegister) -loadp Callee[cfr], targetRegister +if JSVALUE64 +loadp Callee[cfr], targetRegister +else +loadp Callee + PayloadOffset[cfr], targetRegister +end loadp JSFunction::m_executable[targetRegister], targetRegister loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister end macro functionForConstructCodeBlockGetter(targetRegister) -loadp Callee[cfr], targetRegister +if JSVALUE64 +loadp Callee[cfr], targetRegister +else +loadp Callee + PayloadOffset[cfr], targetRegister +end loadp JSFunction::m_executable[targetRegister], targetRegister loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister end Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm (173885 => 173886) --- trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2014-09-23 19:53:08 UTC (rev 173885) +++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter32_64.asm 2014-09-23 20:21:51 UTC (rev 173886) @@ -392,7 +392,7 @@ loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 loadp VM::callFrameForThrow[t3], cfr -loadp CallerFrame + PayloadOffset[cfr], cfr +loadp CallerFrame[cfr], cfr if ARMv7 vmEntryRecord(cfr, t3) @@ -689,7 +689,7 @@ end macro branchIfException(label) -loadp Callee[cfr], t3 +loadp Callee + PayloadOffset[cfr], t3 andp MarkedBlockMask, t3 loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException @@ -2136,7 +2136,7 @@ loadp JSFunction::m_executable[t1], t1 checkStackPointerAlignment(t3, 0xdead0001) call executableOffsetToFunction[t1] -loadp Callee[cfr], t3 +loadp Callee + PayloadOffset[cfr], t3 andp MarkedBlockMask, t3 loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 addp 8, sp @@ -2159,7 +2159,7 @@ else call executableOffsetToFunction[t1] end -loadp Callee[cfr], t3 +loadp Callee + PayloadOffset[cfr], t3 andp MarkedBlockMask, t3 loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3 addp 8, sp @@ -2197,7 +2197,7 @@ loadp CodeBlock[cfr], t0 loadisFromInstruction(4, t2) -loadp ScopeChain[cfr], t0 +loadp ScopeChain + PayloadOffset[cfr], t0 btiz t2, .resolveScopeLoopEnd .resolveScopeLoop: @@ -2256,7 +2256,7 @@ macro loadWithStructureCheck(operand, slowPath) loadisFromInstruction(operand, t0) -loadp [cfr, t0, 8], t0 +loadp PayloadOffset[cfr, t0, 8], t0 loadpFromInstruction(5, t1) bpneq JSCell::m_structureID[t0], t1, slowPath end ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173885] trunk/Source/WebCore
Title: [173885] trunk/Source/WebCore
Revision 173885
Author cdu...@apple.com
Date 2014-09-23 12:53:08 -0700 (Tue, 23 Sep 2014)
Log Message
Have DOMImplementation::document() and Element::attributes() return references
https://bugs.webkit.org/show_bug.cgi?id=137035
Reviewed by Andreas Kling.
Have DOMImplementation::document() and Element::attributes() return
references instead of pointers as they can never return null.
No new tests, no behavior change.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateImplementation):
Update the JS Bindings code generator to use WTF::getPtr() in a couple
more places so that the implementation can return references instead
of pointers even when [GenerateIsReachable=xxx] IDL extended attribute
is used.
* dom/DOMImplementation.h:
(WebCore::DOMImplementation::document):
* dom/Element.cpp:
(WebCore::Element::attributes):
* dom/Element.h:
(WebCore::Node::attributes):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
trunk/Source/WebCore/dom/DOMImplementation.h
trunk/Source/WebCore/dom/Element.cpp
trunk/Source/WebCore/dom/Element.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (173884 => 173885)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 19:53:08 UTC (rev 173885)
@@ -1,5 +1,31 @@
2014-09-23 Chris Dumez
+Have DOMImplementation::document() and Element::attributes() return references
+https://bugs.webkit.org/show_bug.cgi?id=137035
+
+Reviewed by Andreas Kling.
+
+Have DOMImplementation::document() and Element::attributes() return
+references instead of pointers as they can never return null.
+
+No new tests, no behavior change.
+
+* bindings/scripts/CodeGeneratorJS.pm:
+(GenerateImplementation):
+Update the JS Bindings code generator to use WTF::getPtr() in a couple
+more places so that the implementation can return references instead
+of pointers even when [GenerateIsReachable=xxx] IDL extended attribute
+is used.
+
+* dom/DOMImplementation.h:
+(WebCore::DOMImplementation::document):
+* dom/Element.cpp:
+(WebCore::Element::attributes):
+* dom/Element.h:
+(WebCore::Node::attributes):
+
+2014-09-23 Chris Dumez
+
Have Document::ensureTemplateDocument() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137033
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (173884 => 173885)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-09-23 19:53:08 UTC (rev 173885)
@@ -2986,19 +2986,19 @@
if (GetGenerateIsReachable($interface) eq "Impl") {
$rootString = "${implType}* root = &js${interfaceName}->impl();\n";
} elsif (GetGenerateIsReachable($interface) eq "ImplWebGLRenderingContext") {
-$rootString = "WebGLRenderingContext* root = js${interfaceName}->impl().context();\n";
+$rootString = "WebGLRenderingContext* root = WTF::getPtr(js${interfaceName}->impl().context());\n";
} elsif (GetGenerateIsReachable($interface) eq "ImplFrame") {
-$rootString = "Frame* root = js${interfaceName}->impl().frame();\n";
+$rootString = "Frame* root = WTF::getPtr(js${interfaceName}->impl().frame());\n";
$rootString .= "if (!root)\n";
$rootString .= "return false;\n";
} elsif (GetGenerateIsReachable($interface) eq "ImplDocument") {
-$rootString = "Document* root = js${interfaceName}->impl().document();\n";
+$rootString = "Document* root = WTF::getPtr(js${interfaceName}->impl().document());\n";
$rootString .= "if (!root)\n";
$rootString .= "return false;\n";
} elsif (GetGenerateIsReachable($interface) eq "ImplElementRoot") {
$implIncludes{"Element.h"} = 1;
$implIncludes{"JSNodeCustom.h"} = 1;
-$rootString = "Element* element = js${interfaceName}->impl().element();\n";
+$rootString = "Element* element = WTF::getPtr(js${interfaceName}->impl().element());\n";
$rootString .= "if (!element)\n";
$rootString .= "return false;\n";
$rootString .= "void* root = WebCore::root(element);\n";
Modified: trunk/Source/WebCore/dom/DOMImplementation.h (173884 => 173885)
--- trunk/Source/WebCore/dom/DOMImplementation.h 2014-09-23 19:30:18 UTC (rev 173884)
+++ trunk/Source/WebCore/dom/DOMImplementation.h 2014-09-23 19:53:08 UTC (rev 173885)
@@ -50,7 +50,7 @@
void ref() { m_document.ref(); }
void deref() { m_document.deref(); }
[webkit-changes] [173884] trunk/Source/WebCore
Title: [173884] trunk/Source/WebCore
Revision 173884
Author cdu...@apple.com
Date 2014-09-23 12:30:18 -0700 (Tue, 23 Sep 2014)
Log Message
Have Document::ensureTemplateDocument() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137033
Reviewed by Ryosuke Niwa.
Have Document::ensureTemplateDocument() return a reference instead of
a pointer as it can never return null.
No new tests, no behavior change.
* dom/Document.cpp:
(WebCore::Document::ensureTemplateDocument):
* dom/Document.h:
* editing/markup.cpp:
(WebCore::createFragmentForInnerOuterHTML):
* html/HTMLTemplateElement.cpp:
(WebCore::HTMLTemplateElement::content):
(WebCore::HTMLTemplateElement::didMoveToNewDocument):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/dom/Document.h
trunk/Source/WebCore/editing/markup.cpp
trunk/Source/WebCore/html/HTMLTemplateElement.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (173883 => 173884)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 19:30:18 UTC (rev 173884)
@@ -1,5 +1,26 @@
2014-09-23 Chris Dumez
+Have Document::ensureTemplateDocument() return a reference
+https://bugs.webkit.org/show_bug.cgi?id=137033
+
+Reviewed by Ryosuke Niwa.
+
+Have Document::ensureTemplateDocument() return a reference instead of
+a pointer as it can never return null.
+
+No new tests, no behavior change.
+
+* dom/Document.cpp:
+(WebCore::Document::ensureTemplateDocument):
+* dom/Document.h:
+* editing/markup.cpp:
+(WebCore::createFragmentForInnerOuterHTML):
+* html/HTMLTemplateElement.cpp:
+(WebCore::HTMLTemplateElement::content):
+(WebCore::HTMLTemplateElement::didMoveToNewDocument):
+
+2014-09-23 Chris Dumez
+
Have Document::accessSVGExtensions() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137030
Modified: trunk/Source/WebCore/dom/Document.cpp (173883 => 173884)
--- trunk/Source/WebCore/dom/Document.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -6126,10 +6126,10 @@
}
#if ENABLE(TEMPLATE_ELEMENT)
-Document* Document::ensureTemplateDocument()
+Document& Document::ensureTemplateDocument()
{
if (const Document* document = templateDocument())
-return const_cast(document);
+return const_cast(*document);
if (isHTMLDocument())
m_templateDocument = HTMLDocument::create(nullptr, blankURL());
@@ -6138,7 +6138,7 @@
m_templateDocument->setTemplateDocumentHost(this); // balanced in dtor.
-return m_templateDocument.get();
+return *m_templateDocument;
}
#endif
Modified: trunk/Source/WebCore/dom/Document.h (173883 => 173884)
--- trunk/Source/WebCore/dom/Document.h 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/dom/Document.h 2014-09-23 19:30:18 UTC (rev 173884)
@@ -1257,7 +1257,7 @@
#if ENABLE(TEMPLATE_ELEMENT)
const Document* templateDocument() const;
-Document* ensureTemplateDocument();
+Document& ensureTemplateDocument();
void setTemplateDocumentHost(Document* templateDocumentHost) { m_templateDocumentHost = templateDocumentHost; }
Document* templateDocumentHost() { return m_templateDocumentHost; }
#endif
Modified: trunk/Source/WebCore/editing/markup.cpp (173883 => 173884)
--- trunk/Source/WebCore/editing/markup.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -884,7 +884,7 @@
Document* document = &contextElement->document();
#if ENABLE(TEMPLATE_ELEMENT)
if (contextElement->hasTagName(templateTag))
-document = document->ensureTemplateDocument();
+document = &document->ensureTemplateDocument();
#endif
RefPtr fragment = DocumentFragment::create(*document);
Modified: trunk/Source/WebCore/html/HTMLTemplateElement.cpp (173883 => 173884)
--- trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
+++ trunk/Source/WebCore/html/HTMLTemplateElement.cpp 2014-09-23 19:30:18 UTC (rev 173884)
@@ -63,7 +63,7 @@
DocumentFragment* HTMLTemplateElement::content() const
{
if (!m_content)
-m_content = TemplateContentDocumentFragment::create(*document().ensureTemplateDocument(), this);
+m_content = TemplateContentDocumentFragment::create(document().ensureTemplateDocument(), this);
return m_content.get();
}
@@ -84,7 +84,7 @@
HTMLElement::didMoveToNewDocument(oldDocument);
if (!m_content)
return;
-document().ensureTemplateDocument()->adoptIfNeeded(m_content.get());
+document().ensureTemplateDocument().adoptIfNeeded(m_content.get());
}
} // namespace WebCore
___
webkit-changes mailing list
webkit-changes@lists.webkit.or
[webkit-changes] [173883] trunk/Source/WebCore
Title: [173883] trunk/Source/WebCore Revision 173883 Author cdu...@apple.com Date 2014-09-23 11:44:41 -0700 (Tue, 23 Sep 2014) Log Message Have Document::accessSVGExtensions() return a reference https://bugs.webkit.org/show_bug.cgi?id=137030 Reviewed by Ryosuke Niwa. Have Document::accessSVGExtensions() return a reference instead of a pointer as it can never return null. No new tests, no behavior change. * dom/ContainerNode.cpp: (WebCore::ContainerNode::removeChild): (WebCore::ContainerNode::removeChildren): * dom/Document.cpp: (WebCore::Document::commonTeardown): (WebCore::Document::implicitClose): (WebCore::Document::accessSVGExtensions): * dom/Document.h: * dom/Element.cpp: (WebCore::Element::~Element): (WebCore::Element::removedFrom): * editing/markup.cpp: (WebCore::isPlainTextMarkup): * history/CachedFrame.cpp: (WebCore::CachedFrameBase::restore): * rendering/FilterEffectRenderer.cpp: (WebCore::FilterEffectRenderer::buildReferenceFilter): * rendering/svg/RenderSVGResource.cpp: (WebCore::removeFromCacheAndInvalidateDependencies): * rendering/svg/RenderSVGResourceContainer.cpp: (WebCore::svgExtensionsFromElement): * rendering/svg/RenderSVGResourceContainer.h: (WebCore::getRenderSVGResourceContainerById): (WebCore::getRenderSVGResourceById): * rendering/svg/SVGResources.cpp: (WebCore::registerPendingResource): (WebCore::SVGResources::buildCachedResources): * rendering/svg/SVGResourcesCache.cpp: (WebCore::resourcesCacheFromRenderer): (WebCore::SVGResourcesCache::resourceDestroyed): * svg/SVGElement.cpp: (WebCore::SVGElement::~SVGElement): (WebCore::SVGElement::reportAttributeParsingError): (WebCore::SVGElement::removedFrom): (WebCore::SVGElement::viewportElement): (WebCore::SVGElement::attributeChanged): (WebCore::SVGElement::buildPendingResourcesIfNeeded): (WebCore::SVGElement::accessDocumentSVGExtensions): Deleted. * svg/SVGElement.h: * svg/SVGFEConvolveMatrixElement.cpp: (WebCore::SVGFEConvolveMatrixElement::parseAttribute): * svg/SVGFEGaussianBlurElement.cpp: (WebCore::SVGFEGaussianBlurElement::parseAttribute): * svg/SVGFEImageElement.cpp: (WebCore::SVGFEImageElement::clearResourceReferences): (WebCore::SVGFEImageElement::buildPendingResource): * svg/SVGFitToViewBox.cpp: (WebCore::SVGFitToViewBox::parseViewBox): * svg/SVGFontFaceElement.cpp: (WebCore::SVGFontFaceElement::insertedInto): (WebCore::SVGFontFaceElement::removedFrom): * svg/SVGMPathElement.cpp: (WebCore::SVGMPathElement::buildPendingResource): (WebCore::SVGMPathElement::clearResourceReferences): * svg/SVGPathElement.cpp: (WebCore::SVGPathElement::parseAttribute): (WebCore::SVGPathElement::invalidateMPathDependencies): * svg/SVGPolyElement.cpp: (WebCore::SVGPolyElement::parseAttribute): * svg/SVGSVGElement.cpp: (WebCore::SVGSVGElement::~SVGSVGElement): (WebCore::SVGSVGElement::insertedInto): (WebCore::SVGSVGElement::removedFrom): * svg/SVGTRefElement.cpp: (WebCore::SVGTRefElement::detachTarget): (WebCore::SVGTRefElement::buildPendingResource): * svg/SVGTextPathElement.cpp: (WebCore::SVGTextPathElement::clearResourceReferences): (WebCore::SVGTextPathElement::buildPendingResource): * svg/SVGUseElement.cpp: (WebCore::SVGUseElement::clearResourceReferences): (WebCore::SVGUseElement::buildPendingResource): (WebCore::SVGUseElement::toClipPath): (WebCore::SVGUseElement::buildInstanceTree): * svg/animation/SVGSMILElement.cpp: (WebCore::SVGSMILElement::clearResourceReferences): (WebCore::SVGSMILElement::buildPendingResource): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/dom/ContainerNode.cpp trunk/Source/WebCore/dom/Document.cpp trunk/Source/WebCore/dom/Document.h trunk/Source/WebCore/dom/Element.cpp trunk/Source/WebCore/editing/markup.cpp trunk/Source/WebCore/history/CachedFrame.cpp trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h trunk/Source/WebCore/rendering/svg/SVGResources.cpp trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp trunk/Source/WebCore/svg/SVGElement.cpp trunk/Source/WebCore/svg/SVGElement.h trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp trunk/Source/WebCore/svg/SVGFEImageElement.cpp trunk/Source/WebCore/svg/SVGFitToViewBox.cpp trunk/Source/WebCore/svg/SVGFontFaceElement.cpp trunk/Source/WebCore/svg/SVGMPathElement.cpp trunk/Source/WebCore/svg/SVGPathElement.cpp trunk/Source/WebCore/svg/SVGPolyElement.cpp trunk/Source/WebCore/svg/SVGSVGElement.cpp trunk/Source/WebCore/svg/SVGTRefElement.cpp trunk/Source/WebCore/svg/SVGTextPathElement.cpp trunk/Source/WebCore/svg/SVGUseElement.cpp trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (173882 => 173883) --- trunk/Source/WebCore/ChangeLog 2014-09-23 18:38:24 UTC (rev 173882) +++ trunk/Source/WebCore/ChangeLog 2014-09-23 18:44:41 UTC (rev 1
[webkit-changes] [173882] trunk/Source
Title: [173882] trunk/Source Revision 173882 Author commit-qu...@webkit.org Date 2014-09-23 11:38:24 -0700 (Tue, 23 Sep 2014) Log Message Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed https://bugs.webkit.org/show_bug.cgi?id=136893 Patch by Joseph Pecoraro on 2014-09-23 Reviewed by Timothy Hatcher. Source/_javascript_Core: Adds new remote inspector protocol handling for automatic inspection. Debuggers can signal they have enabled automatic inspection, and when debuggables are created the current application will pause to see if the debugger will inspect or decline to inspect the debuggable. * inspector/remote/RemoteInspectorConstants.h: * inspector/remote/RemoteInspector.h: * inspector/remote/RemoteInspector.mm: (Inspector::globalAutomaticInspectionState): (Inspector::RemoteInspector::RemoteInspector): (Inspector::RemoteInspector::start): When first starting, check the global "is there an auto-inspect" debugger state. This is necessary so that the current application knows if it should pause or not when a debuggable is created, even without having connected to webinspectord yet. (Inspector::RemoteInspector::updateDebuggableAutomaticInspectCandidate): When a debuggable has enabled remote inspection, take this path to propose it as an automatic inspection candidate if there is an auto-inspect debugger. (Inspector::RemoteInspector::sendAutomaticInspectionCandidateMessage): Send the automatic inspection candidate message. (Inspector::RemoteInspector::receivedSetupMessage): (Inspector::RemoteInspector::setupFailed): (Inspector::RemoteInspector::setupSucceeded): After attempting to open an inspector, unpause if it was for the automatic inspection candidate. (Inspector::RemoteInspector::waitingForAutomaticInspection): When running a nested runloop, check if we should remain paused. (Inspector::RemoteInspector::setupXPCConnectionIfNeeded): If by the time we connect to webinspectord we have a candidate, then immediately send the candidate message. (Inspector::RemoteInspector::stopInternal): (Inspector::RemoteInspector::xpcConnectionFailed): In error cases, clear our state. (Inspector::RemoteInspector::xpcConnectionReceivedMessage): (Inspector::RemoteInspector::receivedAutomaticInspectionConfigurationMessage): (Inspector::RemoteInspector::receivedAutomaticInspectionRejectMessage): Update state when receiving new messages. * inspector/remote/RemoteInspectorDebuggable.h: * inspector/remote/RemoteInspectorDebuggable.cpp: (Inspector::RemoteInspectorDebuggable::setRemoteDebuggingAllowed): Special case when a debuggable is newly allowed to be debuggable. (Inspector::RemoteInspectorDebuggable::pauseWaitingForAutomaticInspection): Run a nested run loop while this is an automatic inspection candidate. * inspector/JSGlobalObjectInspectorController.h: * inspector/JSGlobalObjectInspectorController.cpp: (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController): (Inspector::JSGlobalObjectInspectorController::connectFrontend): When the inspector starts via automatic inspection automatically pause. We plan on removing this condition by having the frontend signal to the backend when it is completely initialized. * inspector/remote/RemoteInspectorDebuggableConnection.h: * inspector/remote/RemoteInspectorDebuggableConnection.mm: (Inspector::RemoteInspectorDebuggableConnection::setup): Pass on the flag of whether or not this was automatic inspection. * runtime/JSGlobalObjectDebuggable.h: * runtime/JSGlobalObjectDebuggable.cpp: (JSC::JSGlobalObjectDebuggable::connect): (JSC::JSGlobalObjectDebuggable::pauseWaitingForAutomaticInspection): When pausing in a JSGlobalObject we need to release the API lock. Source/WebCore: Automatic inspection is currently disabled for web pages. This just updates the interfaces that changed. * WebCore.exp.in: * inspector/InspectorController.cpp: (WebCore::InspectorController::connectFrontend): (WebCore::InspectorController::show): * inspector/InspectorController.h: * page/PageDebuggable.cpp: (WebCore::PageDebuggable::connect): * page/PageDebuggable.h: * testing/Internals.cpp: (WebCore::Internals::openDummyInspectorFrontend): Source/WebKit: * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Source/WebKit2: * WebProcess/WebPage/WebInspector.cpp: (WebKit::WebInspector::remoteFrontendConnected): Source/WTF: Currently automatic inspection only happens in processes that have a debugger attached. That condition may change in the future, but this function can stand on its own in WTF. It may be useful in the future to perhaps continue though ASSERTs if you have a debugger attached. * wtf/Assertions.cpp: * wtf/Assertions.h: Modified Paths trunk/Source/_javascript_Core/ChangeLog trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.cpp trunk/Source/_javascript_Core/inspector/JSGlobalObjectInspectorController.h trunk/Source/_javascript_Core/inspector/remote/RemoteInspector.h trunk/S
[webkit-changes] [173881] trunk/Source/bmalloc
Title: [173881] trunk/Source/bmalloc Revision 173881 Author gga...@apple.com Date 2014-09-23 11:24:02 -0700 (Tue, 23 Sep 2014) Log Message bmalloc: Allocation should be more precise https://bugs.webkit.org/show_bug.cgi?id=136993 Reviewed by Gavin Barraclough. 13% reduction in heap size on the MallocBench *_memory_warning benchmarks. This patch teaches the allocator to merge adjacent free lines into a single allocatable range. This allows us to shrink the size of an individual line without increasing fragmentation or the rate of allocator slow paths. We'll only take more slow paths when available memory is sparse, which is exactly when it's worth it. When available memory is dense, we'll take fewer slow paths. * bmalloc.xcodeproj/project.pbxproj: * bmalloc/Algorithm.h: (bmalloc::divideRoundingUp): * bmalloc/Allocator.cpp: (bmalloc::Allocator::Allocator): Updated for interface changes. (bmalloc::Allocator::scavenge): Scavenge by object instead of by line. Now that we merge lines, it's not convenient to scavenge by line. (bmalloc::Allocator::allocateSmallBumpRange): (bmalloc::Allocator::allocateMediumBumpRange): Allocate whole ranges instead of individual lines. (bmalloc::Allocator::allocateSlowCase): (bmalloc::Allocator::allocateSmallLine): Deleted. (bmalloc::Allocator::allocateMediumLine): Deleted. (bmalloc::Allocator::allocateMedium): Deleted. * bmalloc/Allocator.h: (bmalloc::Allocator::allocateFastCase): Folded medium allocations into the standard fast path with small allocations. Since a BumpAllocator just allocates out of an arbitrary range, it doesn't need to distinguish between small and medium lines. * bmalloc/BumpAllocator.h: (bmalloc::BumpAllocator::size): (bmalloc::BumpAllocator::BumpAllocator): (bmalloc::BumpAllocator::init): (bmalloc::BumpAllocator::refill): (bmalloc::BumpAllocator::line): Deleted. No need to track line information anymore: the heap just gives us a pointer and a pre-computed number of objects, and we allocate them. * bmalloc/Deallocator.cpp: (bmalloc::Deallocator::processObjectLog): Updated for interface changes. * bmalloc/Heap.cpp: (bmalloc::Heap::Heap): (bmalloc::Heap::initializeLineMetadata): Pre-compute precise metadata detailing where all objects will lie in memory. After we merge two lines, we might allocate an object that spans from one line to the next. This metadata details which bits of memory overlap in that way, and how they overlap. (bmalloc::Heap::refillSmallBumpRangeCache): (bmalloc::Heap::refillMediumBumpRangeCache): Scan a whole page at a time, and merge adjacent free lines into BumpRanges. (bmalloc::Heap::allocateSmallPage): (bmalloc::Heap::allocateMediumPage): (bmalloc::Heap::deallocateSmallLine): (bmalloc::Heap::deallocateMediumLine): Track pages rather than lines, since we scan for free memory a page at a time. (bmalloc::Heap::allocateSmallLineSlowCase): Deleted. (bmalloc::Heap::allocateMediumLineSlowCase): Deleted. Folded into the fast path. * bmalloc/Heap.h: (bmalloc::Heap::derefSmallLine): (bmalloc::Heap::derefMediumLine): (bmalloc::Heap::deallocateSmallLine): Deleted. (bmalloc::Heap::allocateSmallLine): Deleted. (bmalloc::Heap::deallocateMediumLine): Deleted. (bmalloc::Heap::allocateMediumLine): Deleted. Updated for interface changes. * bmalloc/Line.h: (bmalloc::Line::ref): (bmalloc::Line::deref): (bmalloc::Line::concurrentRef): Deleted. We don't pass a derefCount anymore, since we only ever deref by 1 now. * bmalloc/MediumAllocator.h: (bmalloc::MediumAllocator::isNull): Deleted. (bmalloc::MediumAllocator::MediumAllocator): Deleted. (bmalloc::MediumAllocator::line): Deleted. (bmalloc::MediumAllocator::allocate): Deleted. (bmalloc::MediumAllocator::derefCount): Deleted. (bmalloc::MediumAllocator::refill): Deleted. (bmalloc::MediumAllocator::clear): Deleted. Deleted some code that's been dead for a while, since it doesn't build anymore with this patch. * bmalloc/Page.h: (bmalloc::Page::sizeClass): (bmalloc::Page::setSizeClass): (bmalloc::Page::smallSizeClass): Deleted. (bmalloc::Page::setSmallSizeClass): Deleted. Renamed setSmallSizeClass to sizeClass, since we use it for medium sizes too. * bmalloc/Sizes.h: (bmalloc::Sizes::sizeClass): (bmalloc::Sizes::objectSize): Shrank line sizes to save memory. (bmalloc::Sizes::smallSizeClassFor): Deleted. (bmalloc::Sizes::mediumSizeClassFor): Deleted. * bmalloc/bmalloc.h: (bmalloc::api::realloc): Now that we have precise objects sizes, realloc can be a bit more precise. It also has to be, since we can't guarantee that an object ends at the end of a line anymore. Modified Paths trunk/Source/bmalloc/ChangeLog trunk/Source/bmalloc/bmalloc/Algorithm.h trunk/Source/bmalloc/bmalloc/Allocator.cpp trunk/Source/bmalloc/bmalloc/Allocator.h trunk/Source/bmalloc/bmalloc/BumpAllocator.h trunk/Source/bmalloc/bmalloc/Deallocator.cpp trunk/Source/bmalloc/bmalloc/Heap.cpp trunk/Source/bmalloc/bmalloc/Heap.h trunk/Source/bmalloc/bmalloc/Line.h trunk/Source/bmalloc/bmalloc/Page.h trunk/Source/bmalloc/b
[webkit-changes] [173880] trunk/Tools
Title: [173880] trunk/Tools
Revision 173880
Author commit-qu...@webkit.org
Date 2014-09-23 11:09:02 -0700 (Tue, 23 Sep 2014)
Log Message
W3C test importer should detect manual and reference tests according their filenames
https://bugs.webkit.org/show_bug.cgi?id=133852
Patch by Youenn Fablet on 2014-09-23
Reviewed by Bem Jones-Bey.
* Scripts/webkitpy/w3c/test_parser.py:
(TestParser.analyze_test): Adding checks based on WPT filename rules.
(TestParser.is_wpt_manualtest): Detecting whether the test is a manual test based on its filename.
(TestParser):
(TestParser.potential_ref_filename): Getting the potential reference filename of a test from its filename.
(TestParser.is_wpt_reftest): Detecting whether the test is a ref test based on its filename.
* Scripts/webkitpy/w3c/test_parser_unittest.py:
(test_analyze_manual_wpt_test): Adding a test for a "-manual.html" file with testharness.js link in it.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/w3c/test_parser.py
trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py
Property Changed
trunk/Tools/Scripts/webkitpy/w3c/test_parser.py
Diff
Modified: trunk/Tools/ChangeLog (173879 => 173880)
--- trunk/Tools/ChangeLog 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/ChangeLog 2014-09-23 18:09:02 UTC (rev 173880)
@@ -1,3 +1,19 @@
+2014-09-23 Youenn Fablet
+
+W3C test importer should detect manual and reference tests according their filenames
+https://bugs.webkit.org/show_bug.cgi?id=133852
+
+Reviewed by Bem Jones-Bey.
+
+* Scripts/webkitpy/w3c/test_parser.py:
+(TestParser.analyze_test): Adding checks based on WPT filename rules.
+(TestParser.is_wpt_manualtest): Detecting whether the test is a manual test based on its filename.
+(TestParser):
+(TestParser.potential_ref_filename): Getting the potential reference filename of a test from its filename.
+(TestParser.is_wpt_reftest): Detecting whether the test is a ref test based on its filename.
+* Scripts/webkitpy/w3c/test_parser_unittest.py:
+(test_analyze_manual_wpt_test): Adding a test for a "-manual.html" file with testharness.js link in it.
+
2014-09-23 Bem Jones-Bey
Unreviewed, add Rebecca Hauck as a contributor.
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py (173879 => 173880)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser.py 2014-09-23 18:09:02 UTC (rev 173880)
@@ -108,6 +108,13 @@
reference_relpath = self.filesystem.relpath(self.filesystem.dirname(self.filename), self.filesystem.dirname(ref_file)) + self.filesystem.sep
test_info['reference_support_info'] = {'reference_relpath': reference_relpath, 'files': reference_support_files}
+# not all reference tests have a element in WPT repo
+elif self.is_wpt_reftest():
+test_info = {'test': self.filename, 'reference': self.potential_ref_filename()}
+test_info['reference_support_info'] = {}
+# we check for wpt manual test before checking for jstest, as some WPT manual tests can be classified as CSS JS tests
+elif self.is_wpt_manualtest():
+test_info = None
elif self.is_jstest():
test_info = {'test': self.filename, 'jstest': True}
elif self.options['all'] is True and not('-ref' in self.filename) and not('reference' in self.filename):
@@ -122,6 +129,19 @@
"""Returns whether the file appears to be a jstest, by searching for usage of W3C-style testharness paths."""
return bool(self.test_doc.find(src=""
+def is_wpt_manualtest(self):
+"""Returns whether the test is a manual test according WPT rules (i.e. file ends with -manual.htm path)."""
+return self.filename.endswith('-manual.htm') or self.filename.endswith('-manual.html')
+
+def potential_ref_filename(self):
+parts = self.filesystem.splitext(self.filename)
+return parts[0] + '-ref' + parts[1]
+
+def is_wpt_reftest(self):
+"""Returns whether the test is a ref test according WPT rules (i.e. file has a -ref.html counterpart)."""
+parts = self.filesystem.splitext(self.filename)
+return self.filesystem.isfile(self.potential_ref_filename())
+
def support_files(self, doc):
""" Searches the file for all paths specified in url()'s, href or src attributes."""
support_files = []
Property changes on: trunk/Tools/Scripts/webkitpy/w3c/test_parser.py
___
Added: svn:executable
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py (173879 => 173880)
--- trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-23 17:32:04 UTC (rev 173879)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py 2014-09-23 18:09:02 UTC (rev 173880)
@@ -155,6 +1
[webkit-changes] [173879] trunk/Tools
Title: [173879] trunk/Tools
Revision 173879
Author bjone...@adobe.com
Date 2014-09-23 10:32:04 -0700 (Tue, 23 Sep 2014)
Log Message
Unreviewed, add Rebecca Hauck as a contributor.
* Scripts/webkitpy/common/config/contributors.json:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json
Diff
Modified: trunk/Tools/ChangeLog (173878 => 173879)
--- trunk/Tools/ChangeLog 2014-09-23 17:11:53 UTC (rev 173878)
+++ trunk/Tools/ChangeLog 2014-09-23 17:32:04 UTC (rev 173879)
@@ -1,3 +1,9 @@
+2014-09-23 Bem Jones-Bey
+
+Unreviewed, add Rebecca Hauck as a contributor.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
2014-09-23 David Kilzer
Switch build.webkit.org URLs to https
Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (173878 => 173879)
--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2014-09-23 17:11:53 UTC (rev 173878)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2014-09-23 17:32:04 UTC (rev 173879)
@@ -3208,6 +3208,14 @@
"rhudea"
]
},
+ "Rebecca Hauck" : {
+ "emails" : [
+ "rha...@adobe.com"
+ ],
+ "nicks" : [
+ "rhauck"
+ ]
+ },
"Ricky Mondello" : {
"emails" : [
"rmonde...@apple.com"
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173878] trunk/Source/WebKit
Title: [173878] trunk/Source/WebKit Revision 173878 Author bfulg...@apple.com Date 2014-09-23 10:11:53 -0700 (Tue, 23 Sep 2014) Log Message [Win] Correct 64-bit Windows export definitions after r173804. * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Provide proper 64-bit mangled symbol names. Modified Paths trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in Diff Modified: trunk/Source/WebKit/ChangeLog (173877 => 173878) --- trunk/Source/WebKit/ChangeLog 2014-09-23 17:11:33 UTC (rev 173877) +++ trunk/Source/WebKit/ChangeLog 2014-09-23 17:11:53 UTC (rev 173878) @@ -1,3 +1,10 @@ +2014-09-23 Brent Fulgham + +[Win] Correct 64-bit Windows export definitions after r173804. + +* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Provide proper +64-bit mangled symbol names. + 2014-09-21 Chris Dumez Generate Element casting helper functions Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (173877 => 173878) --- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-09-23 17:11:33 UTC (rev 173877) +++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-09-23 17:11:53 UTC (rev 173878) @@ -153,7 +153,7 @@ symbolWithPointer(??0HitTestResult@WebCore@@QAE@ABVLayoutPoint@1@@Z, ??0HitTestResult@WebCore@@QEAA@AEBVLayoutPoint@1@@Z) symbolWithPointer(?isReplacementObscured@RenderEmbeddedObject@WebCore@@QBE_NXZ, ?isReplacementObscured@RenderEmbeddedObject@WebCore@@QEBA_NXZ) symbolWithPointer(??1Range@WebCore@@QAE@XZ, ??1Range@WebCore@@QEAA@XZ) -symbolWithPointer(?toWrapped@JSNode@WebCore@@SAPAVNode@2@VJSValue@JSC@@@Z, ?toWrapped@JSNode@WebCore@@SAPAVNode@2@VJSValue@JSC@@@Z) +symbolWithPointer(?toWrapped@JSNode@WebCore@@SAPAVNode@2@VJSValue@JSC@@@Z, ?toWrapped@JSNode@WebCore@@SAPEAVNode@2@VJSValue@JSC@@@Z) symbolWithPointer(??0ClientRect@WebCore@@AAE@ABVFloatRect@1@@Z, ??0ClientRect@WebCore@@AEAA@AEBVFloatRect@1@@Z) symbolWithPointer(??0ClientRect@WebCore@@AAE@ABVIntRect@1@@Z, ??0ClientRect@WebCore@@AEAA@AEBVIntRect@1@@Z) symbolWithPointer(??0ClientRect@WebCore@@AAE@XZ, ??0ClientRect@WebCore@@AEAA@XZ) @@ -310,8 +310,8 @@ symbolWithPointer(?text@Range@WebCore@@QBE?AVString@WTF@@XZ, ?text@Range@WebCore@@QEBA?AVString@WTF@@XZ) ?textareaTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B symbolWithPointer(?textContent@Node@WebCore@@QBE?AVString@WTF@@_N@Z, ?textContent@Node@WebCore@@QEBA?AVString@WTF@@_N@Z) -symbolWithPointer(?toWrapped@JSDocument@WebCore@@SAPAVDocument@2@VJSValue@JSC@@@Z, ?toWrapped@JSDocument@WebCore@@SAPAVDocument@2@VJSValue@JSC@@@Z) -symbolWithPointer(?toWrapped@JSElement@WebCore@@SAPAVElement@2@VJSValue@JSC@@@Z, ?toWrapped@JSElement@WebCore@@SAPAVElement@2@VJSValue@JSC@@@Z) +symbolWithPointer(?toWrapped@JSDocument@WebCore@@SAPAVDocument@2@VJSValue@JSC@@@Z, ?toWrapped@JSDocument@WebCore@@SAPEAVDocument@2@VJSValue@JSC@@@Z) +symbolWithPointer(?toWrapped@JSElement@WebCore@@SAPAVElement@2@VJSValue@JSC@@@Z, ?toWrapped@JSElement@WebCore@@SAPEAVElement@2@VJSValue@JSC@@@Z) symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVArrayBuffer@3@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVArrayBuffer@3@@Z) symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVCSSStyleDeclaration@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVCSSStyleDeclaration@1@@Z) symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVClientRect@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVClientRect@1@@Z) @@ -319,7 +319,7 @@ symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVNode@1@@Z) symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVRange@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVRange@1@@Z) symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNodeList@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVNodeList@1@@Z) -symbolWithPointer(?toWrapped@JSRange@WebCore@@SAPAVRange@2@VJSValue@JSC@@@Z, ?toWrapped@JSRange@WebCore@@SAPAVRange@2@VJSValue@JSC@@@Z) +symbolWithPointer(?toWrapped@JSRange@WebCore@@SAPAVRange@2@VJSValue@JSC@@@Z, ?toWrapped@JSRange@WebCore@@SAPEAVRange@2@VJSValue@JSC@@@Z) symbolWithPointer(?isTreeScope@Node@WebCore@@QBE_NXZ, ?isTreeScope@Node@WebCore@@QEBA_NXZ) symbolWithPointer(?updateEdit
[webkit-changes] [173877] trunk/Tools
Title: [173877] trunk/Tools Revision 173877 Author ddkil...@apple.com Date 2014-09-23 10:11:33 -0700 (Tue, 23 Sep 2014) Log Message Switch build.webkit.org URLs to https Reviewed by Lucas Forschler and Alexey Proskuryakov. * TestResultServer/app.yaml: Update version to this commit revision. * BuildSlaveSupport/build.webkit.org-config/master.cfg: * BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js: * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html: * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/WebKitBuildbot.js: (WebKitBuildbot): * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js: * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js: * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js: (.): * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: (WebKitBuildbot): * BuildSlaveSupport/build.webkit.org-config/templates/root.html: * Scripts/webkitpy/common/config/urls.py: * Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py: (test_builder_with_name): * Scripts/webkitpy/tool/commands/queries.py: (TreeStatus): * TestResultServer/generate_builders_json.py: (main): * TestResultServer/generate_builders_json_unittest.py: (GenerateBuildersJsonTest.test_generate_json_data.dummy_fetch_json): (GenerateBuildersJsonTest): (GenerateBuildersJsonTest.test_generate_json_data): * TestResultServer/static-dashboards/builders.jsonp: * TestResultServer/static-dashboards/flakiness_dashboard.js: (loadExpectationsLayoutTests): * TestResultServer/static-dashboards/timeline_explorer.js: Modified Paths trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/WebKitBuildbot.js trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js trunk/Tools/BuildSlaveSupport/build.webkit.org-config/templates/root.html trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/common/config/urls.py trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py trunk/Tools/Scripts/webkitpy/tool/commands/queries.py trunk/Tools/TestResultServer/app.yaml trunk/Tools/TestResultServer/generate_builders_json.py trunk/Tools/TestResultServer/generate_builders_json_unittest.py trunk/Tools/TestResultServer/static-dashboards/builders.jsonp trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js trunk/Tools/TestResultServer/static-dashboards/timeline_explorer.js Diff Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (173876 => 173877) --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-23 17:10:33 UTC (rev 173876) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-23 17:11:33 UTC (rev 173877) @@ -51,7 +51,7 @@ c['slavePortnum'] = 17000 c['projectName'] = "WebKit" c['projectURL'] = "http://webkit.org" -c['buildbotURL'] = "http://build.webkit.org/" +c['buildbotURL'] = "https://build.webkit.org/" c['buildHorizon'] = 1000 c['logHorizon'] = 500 Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js (173876 => 173877) --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js 2014-09-23 17:10:33 UTC (rev 173876) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/RecentBuildsLoader.js 2014-09-23 17:11:33 UTC (rev 173877) @@ -80,5 +80,5 @@ }); }, -_buildbotBaseURL: "http://build.webkit.org/", +_buildbotBaseURL: "https://build.webkit.org/", }; Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html (173876 => 173877) --- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html 2014-09-23 17:10:33 UTC (rev 173876) +++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html 2014-09-23 17:11:33 UTC (rev 173877) @@ -32,10 +32,10 @@ script-src 'self' file: https://ajax.googleapis.com; style-src 'self' 'unsafe-inline' file: https://ajax.googleapis.com http://fonts.googleapis.com; font-src http://themes.googleusercontent.com; -
[webkit-changes] [173876] trunk/Tools
Title: [173876] trunk/Tools
Revision 173876
Author commit-qu...@webkit.org
Date 2014-09-23 10:10:33 -0700 (Tue, 23 Sep 2014)
Log Message
W3C test importer should copy .htaccess files
https://bugs.webkit.org/show_bug.cgi?id=136850
Patch by Youenn Fablet on 2014-09-23
Reviewed by Bem Jones-Bey.
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.should_skip_file): Helper function to check whether to skip file or not. Added ".htaccess" file specific check.
(TestImporter):
(TestImporter.find_importable_tests): Making use of new helper function.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/w3c/test_importer.py
Diff
Modified: trunk/Tools/ChangeLog (173875 => 173876)
--- trunk/Tools/ChangeLog 2014-09-23 16:56:49 UTC (rev 173875)
+++ trunk/Tools/ChangeLog 2014-09-23 17:10:33 UTC (rev 173876)
@@ -1,3 +1,15 @@
+2014-09-23 Youenn Fablet
+
+W3C test importer should copy .htaccess files
+https://bugs.webkit.org/show_bug.cgi?id=136850
+
+Reviewed by Bem Jones-Bey.
+
+* Scripts/webkitpy/w3c/test_importer.py:
+(TestImporter.should_skip_file): Helper function to check whether to skip file or not. Added ".htaccess" file specific check.
+(TestImporter):
+(TestImporter.find_importable_tests): Making use of new helper function.
+
2014-09-23 Alexey Proskuryakov
Trying to revive bot watcher's dashboard after HSTS.
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (173875 => 173876)
--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-09-23 16:56:49 UTC (rev 173875)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-09-23 17:10:33 UTC (rev 173876)
@@ -164,6 +164,14 @@
should_skip = subdir.startswith('.') or (root == self.source_directory and subdir in DIRS_TO_SKIP)
return not should_skip
+def should_skip_file(self, filename):
+# For some reason the w3c repo contains random perl scripts we don't care about.
+if filename.endswith('.pl'):
+return True
+if filename.startswith('.'):
+return not filename == '.htaccess'
+return False
+
def find_importable_tests(self, directory):
# FIXME: use filesystem
for root, dirs, files in os.walk(directory):
@@ -179,8 +187,8 @@
for filename in files:
# FIXME: This block should really be a separate function, but the early-continues make that difficult.
-if filename.startswith('.') or filename.endswith('.pl'):
-continue # For some reason the w3c repo contains random perl scripts we don't care about.
+if self.should_skip_file(filename):
+continue
fullpath = os.path.join(root, filename)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173875] trunk/Tools
Title: [173875] trunk/Tools
Revision 173875
Author a...@apple.com
Date 2014-09-23 09:56:49 -0700 (Tue, 23 Sep 2014)
Log Message
Trying to revive bot watcher's dashboard after HSTS.
Unreviewed.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot): It looks like XMLHttpRequest may not like HSTS redirects, let's try to avoid these.
Modified Paths
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (173874 => 173875)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2014-09-23 16:41:45 UTC (rev 173874)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2014-09-23 16:56:49 UTC (rev 173875)
@@ -54,7 +54,7 @@
"EFL Linux 64-bit Release WK2 (Perf)": {platform: Dashboard.Platform.LinuxEFL, performance: true}
};
-Buildbot.call(this, "http://build.webkit.org/", queueInfo);
+Buildbot.call(this, "https://build.webkit.org/", queueInfo);
};
BaseObject.addConstructorFunctions(WebKitBuildbot);
Modified: trunk/Tools/ChangeLog (173874 => 173875)
--- trunk/Tools/ChangeLog 2014-09-23 16:41:45 UTC (rev 173874)
+++ trunk/Tools/ChangeLog 2014-09-23 16:56:49 UTC (rev 173875)
@@ -1,3 +1,12 @@
+2014-09-23 Alexey Proskuryakov
+
+Trying to revive bot watcher's dashboard after HSTS.
+
+Unreviewed.
+
+* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+(WebKitBuildbot): It looks like XMLHttpRequest may not like HSTS redirects, let's try to avoid these.
+
2014-09-23 Tibor Meszaros
Make Tools/BuildSlaveSupport/wait-for-SVN-server.py handle server donwtime
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173874] trunk
Title: [173874] trunk
Revision 173874
Author commit-qu...@webkit.org
Date 2014-09-23 09:41:45 -0700 (Tue, 23 Sep 2014)
Log Message
[GTK] Adds implementation of subtle crypto HMAC algorithm
https://bugs.webkit.org/show_bug.cgi?id=133320
Patch by Eduardo Lima Mitev on 2014-09-23
Reviewed by Philippe Normand.
Source/WebCore:
Tests are already in place under crypto/subtle/hmac-*.html
* crypto/gtk/CryptoAlgorithmHMACGtk.cpp:
(WebCore::getGnutlsDigestAlgorithm):
(WebCore::calculateSignature):
(WebCore::CryptoAlgorithmHMAC::platformSign):
(WebCore::CryptoAlgorithmHMAC::platformVerify):
LayoutTests:
* platform/gtk/TestExpectations: Whitelists HMAC related tests that are passing
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (173873 => 173874)
--- trunk/LayoutTests/ChangeLog 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/LayoutTests/ChangeLog 2014-09-23 16:41:45 UTC (rev 173874)
@@ -1,3 +1,12 @@
+2014-09-23 Eduardo Lima Mitev
+
+[GTK] Adds implementation of subtle crypto HMAC algorithm
+https://bugs.webkit.org/show_bug.cgi?id=133320
+
+Reviewed by Philippe Normand.
+
+* platform/gtk/TestExpectations: Whitelists HMAC related tests that are passing
+
2014-09-23 Gyuyoung Kim
Unreviewed, rolling out r173864.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (173873 => 173874)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 16:41:45 UTC (rev 173874)
@@ -363,6 +363,12 @@
webkit.org/b/133319 crypto/subtle/sha-256.html [ Pass ]
webkit.org/b/133319 crypto/subtle/sha-384.html [ Pass ]
webkit.org/b/133319 crypto/subtle/sha-512.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-check-algorithm.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-export-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-generate-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-import-jwk.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-sign-verify-empty-key.html [ Pass ]
+webkit.org/b/133320 crypto/subtle/hmac-sign-verify.html [ Pass ]
# QuickTime plug-in not relevant to this port
Bug(GTK) plugins/quicktime-plugin-replacement.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (173873 => 173874)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 16:41:45 UTC (rev 173874)
@@ -1,5 +1,20 @@
2014-09-23 Eduardo Lima Mitev
+[GTK] Adds implementation of subtle crypto HMAC algorithm
+https://bugs.webkit.org/show_bug.cgi?id=133320
+
+Reviewed by Philippe Normand.
+
+Tests are already in place under crypto/subtle/hmac-*.html
+
+* crypto/gtk/CryptoAlgorithmHMACGtk.cpp:
+(WebCore::getGnutlsDigestAlgorithm):
+(WebCore::calculateSignature):
+(WebCore::CryptoAlgorithmHMAC::platformSign):
+(WebCore::CryptoAlgorithmHMAC::platformVerify):
+
+2014-09-23 Eduardo Lima Mitev
+
[GTK] Adds implementation of Subtle Crypto digest algorithms
https://bugs.webkit.org/show_bug.cgi?id=133319
Modified: trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp (173873 => 173874)
--- trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp 2014-09-23 16:14:24 UTC (rev 173873)
+++ trunk/Source/WebCore/crypto/gtk/CryptoAlgorithmHMACGtk.cpp 2014-09-23 16:41:45 UTC (rev 173874)
@@ -31,35 +31,72 @@
#include "CryptoAlgorithmHmacParams.h"
#include "CryptoKeyHMAC.h"
#include "ExceptionCode.h"
-#include "NotImplemented.h"
+#include
+#include
+#include
namespace WebCore {
+static gnutls_mac_algorithm_t getGnutlsDigestAlgorithm(CryptoAlgorithmIdentifier hashFunction)
+{
+switch (hashFunction) {
+case CryptoAlgorithmIdentifier::SHA_1:
+return GNUTLS_MAC_SHA1;
+case CryptoAlgorithmIdentifier::SHA_224:
+return GNUTLS_MAC_SHA224;
+case CryptoAlgorithmIdentifier::SHA_256:
+return GNUTLS_MAC_SHA256;
+case CryptoAlgorithmIdentifier::SHA_384:
+return GNUTLS_MAC_SHA384;
+case CryptoAlgorithmIdentifier::SHA_512:
+return GNUTLS_MAC_SHA512;
+default:
+return GNUTLS_MAC_UNKNOWN;
+}
+}
+
+static Vector calculateSignature(gnutls_mac_algorithm_t algorithm, const Vector& key, const CryptoOperationData& data)
+{
+size_t digestLength = gnutls_hmac_get_len(algorithm);
+
+Vector result(digestLength);
+const void* keyData = key.data() ? key.data() : reinterpret_cast("");
+int ret = gnutls_hmac_fast(algorithm, keyData, key.size(), data.first, data.second, result.data());
+ASSERT(ret == GNUTLS_E_SUCCESS);
+UNUSED_PARAM(ret);
+
+return result;
+}
+
void CryptoAlgorithmHMAC::platformSign(const CryptoAlgorithmHmacParams& paramete
[webkit-changes] [173872] trunk
Title: [173872] trunk
Revision 173872
Author commit-qu...@webkit.org
Date 2014-09-23 08:17:52 -0700 (Tue, 23 Sep 2014)
Log Message
[GTK] Adds implementation of Subtle Crypto digest algorithms
https://bugs.webkit.org/show_bug.cgi?id=133319
Source/WebCore:
Patch by Eduardo Lima Mitev on 2014-09-23
Reviewed by Philippe Normand.
Tests are already in place under crypto/subtle/sha-*.html
* crypto/gtk/CryptoDigestGtk.cpp:
(WebCore::CryptoDigest::CryptoDigest):
(WebCore::CryptoDigest::~CryptoDigest):
(WebCore::CryptoDigest::create):
(WebCore::CryptoDigest::addBytes):
(WebCore::CryptoDigest::computeHash):
LayoutTests:
Leaves all crypto/subtle tests skipped and whitelist only those related to
digest algorithms (sha-*.html). When enough crypto algorithms are implemented,
we can invert the approach and blacklist only those tests whose algorithms are
not implemented.
Patch by Eduardo Lima Mitev on 2014-09-23
Reviewed by Philippe Normand.
* platform/gtk/TestExpectations: Unskip tests for Subtle-Crypto digest algorithms.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/platform/gtk/TestExpectations
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/crypto/gtk/CryptoDigestGtk.cpp
Property Changed
trunk/LayoutTests/platform/gtk/TestExpectations
Diff
Modified: trunk/LayoutTests/ChangeLog (173871 => 173872)
--- trunk/LayoutTests/ChangeLog 2014-09-23 14:47:21 UTC (rev 173871)
+++ trunk/LayoutTests/ChangeLog 2014-09-23 15:17:52 UTC (rev 173872)
@@ -1,3 +1,17 @@
+2014-09-23 Eduardo Lima Mitev
+
+[GTK] Adds implementation of Subtle Crypto digest algorithms
+https://bugs.webkit.org/show_bug.cgi?id=133319
+
+Leaves all crypto/subtle tests skipped and whitelist only those related to
+digest algorithms (sha-*.html). When enough crypto algorithms are implemented,
+we can invert the approach and blacklist only those tests whose algorithms are
+not implemented.
+
+Reviewed by Philippe Normand.
+
+* platform/gtk/TestExpectations: Unskip tests for Subtle-Crypto digest algorithms.
+
2014-09-23 Ion Rosca
[CSS Blending] The composited layers isolated by the page group should blend with the default white background color.
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (173871 => 173872)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 14:47:21 UTC (rev 173871)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-09-23 15:17:52 UTC (rev 173872)
@@ -355,8 +355,14 @@
# Synthesized italics not supported
webkit.org/b/117975 fast/text/international/synthesized-italic-vertical-latin.html [ Skip ]
-# crypto.subtle is not yet enabled
-Bug(GTK) crypto/subtle [ Skip ]
+# crypto.subtle is not yet enabled, but digest algorithms are already implemented
+# and their tests are whitelisted
+webkit.org/b/133122 crypto/subtle [ Skip ]
+webkit.org/b/133319 crypto/subtle/sha-1.html [ Pass ]
+webkit.org/b/133319 crypto/subtle/sha-224.html [ Pass ]
+webkit.org/b/133319 crypto/subtle/sha-256.html [ Pass ]
+webkit.org/b/133319 crypto/subtle/sha-384.html [ Pass ]
+webkit.org/b/133319 crypto/subtle/sha-512.html [ Pass ]
# QuickTime plug-in not relevant to this port
Bug(GTK) plugins/quicktime-plugin-replacement.html [ Skip ]
Property changes on: trunk/LayoutTests/platform/gtk/TestExpectations
___
Deleted: svn:executable
Modified: trunk/Source/WebCore/ChangeLog (173871 => 173872)
--- trunk/Source/WebCore/ChangeLog 2014-09-23 14:47:21 UTC (rev 173871)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 15:17:52 UTC (rev 173872)
@@ -1,3 +1,19 @@
+2014-09-23 Eduardo Lima Mitev
+
+[GTK] Adds implementation of Subtle Crypto digest algorithms
+https://bugs.webkit.org/show_bug.cgi?id=133319
+
+Reviewed by Philippe Normand.
+
+Tests are already in place under crypto/subtle/sha-*.html
+
+* crypto/gtk/CryptoDigestGtk.cpp:
+(WebCore::CryptoDigest::CryptoDigest):
+(WebCore::CryptoDigest::~CryptoDigest):
+(WebCore::CryptoDigest::create):
+(WebCore::CryptoDigest::addBytes):
+(WebCore::CryptoDigest::computeHash):
+
2014-09-15 Sergio Villar Senin
[CSS Grid Layout] Do not grow tracks when the growth factor is 0
Modified: trunk/Source/WebCore/crypto/gtk/CryptoDigestGtk.cpp (173871 => 173872)
--- trunk/Source/WebCore/crypto/gtk/CryptoDigestGtk.cpp 2014-09-23 14:47:21 UTC (rev 173871)
+++ trunk/Source/WebCore/crypto/gtk/CryptoDigestGtk.cpp 2014-09-23 15:17:52 UTC (rev 173872)
@@ -28,44 +28,78 @@
#if ENABLE(SUBTLE_CRYPTO)
-#include "NotImplemented.h"
+#include
+#include
namespace WebCore {
struct CryptoDigestContext {
+gnutls_digest_algorithm_t algorithm;
+gnutls_hash_hd_t hash;
};
CryptoDigest::CryptoDigest()
: m_context(new CryptoDigestContext)
{
-notImplemented();
}
CryptoDigest::~CryptoDigest()
{
-notImplemented();
+
[webkit-changes] [173871] trunk/Tools
Title: [173871] trunk/Tools
Revision 173871
Author commit-qu...@webkit.org
Date 2014-09-23 07:47:21 -0700 (Tue, 23 Sep 2014)
Log Message
Make Tools/BuildSlaveSupport/wait-for-SVN-server.py handle server donwtime
https://bugs.webkit.org/show_bug.cgi?id=137026
Patch by Tibor Meszaros on 2014-09-23
Reviewed by Csaba Osztrogonác.
* BuildSlaveSupport/wait-for-SVN-server.py:
(getLatestSVNRevision):
(waitForSVNRevision):
Modified Paths
trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py (173870 => 173871)
--- trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py 2014-09-23 09:57:53 UTC (rev 173870)
+++ trunk/Tools/BuildSlaveSupport/wait-for-SVN-server.py 2014-09-23 14:47:21 UTC (rev 173871)
@@ -28,9 +28,14 @@
def getLatestSVNRevision(SVNServer):
+p = subprocess.Popen(["svn", "log", "--non-interactive", "--verbose", "--xml", "--limit=1", SVNServer], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+response = p.communicate()[0]
+if p.returncode != 0:
+print "Can't connect to host: %s, return code %s " % (SVNServer, p.returncode)
+print "OUTPUT:"
+print response
+return -1
try:
-p = subprocess.Popen(["svn", "log", "--non-interactive", "--verbose", "--xml", "--limit=1", SVNServer], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-response = p.communicate()[0]
doc = xml.dom.minidom.parseString(response)
el = doc.getElementsByTagName("logentry")[0]
return el.getAttribute("revision")
@@ -52,7 +57,10 @@
revision = int(revision)
while True:
latestRevision = int(getLatestSVNRevision(SVNServer))
-if latestRevision < revision:
+if latestRevision == -1:
+print "%s SVN server is unreachable. Sleeping for 60 seconds." % (SVNServer)
+time.sleep(60)
+elif latestRevision < revision:
print "Latest SVN revision on %s is r%d, but we are waiting for r%d. Sleeping for 5 seconds." % (SVNServer, latestRevision, revision)
time.sleep(5)
else:
Modified: trunk/Tools/ChangeLog (173870 => 173871)
--- trunk/Tools/ChangeLog 2014-09-23 09:57:53 UTC (rev 173870)
+++ trunk/Tools/ChangeLog 2014-09-23 14:47:21 UTC (rev 173871)
@@ -1,5 +1,16 @@
2014-09-23 Tibor Meszaros
+Make Tools/BuildSlaveSupport/wait-for-SVN-server.py handle server donwtime
+https://bugs.webkit.org/show_bug.cgi?id=137026
+
+Reviewed by Csaba Osztrogonác.
+
+* BuildSlaveSupport/wait-for-SVN-server.py:
+(getLatestSVNRevision):
+(waitForSVNRevision):
+
+2014-09-23 Tibor Meszaros
+
Remove unlinkZeroFiles from build-webkit
https://bugs.webkit.org/show_bug.cgi?id=137018
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173870] trunk/Tools
Title: [173870] trunk/Tools
Revision 173870
Author commit-qu...@webkit.org
Date 2014-09-23 02:57:53 -0700 (Tue, 23 Sep 2014)
Log Message
Remove unlinkZeroFiles from build-webkit
https://bugs.webkit.org/show_bug.cgi?id=137018
Patch by Tibor Meszaros on 2014-09-23
Reviewed by Csaba Osztrogonác.
* Scripts/build-webkit:
(unlinkZeroFiles): Deleted.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/build-webkit
Diff
Modified: trunk/Tools/ChangeLog (173869 => 173870)
--- trunk/Tools/ChangeLog 2014-09-23 09:26:14 UTC (rev 173869)
+++ trunk/Tools/ChangeLog 2014-09-23 09:57:53 UTC (rev 173870)
@@ -1,3 +1,13 @@
+2014-09-23 Tibor Meszaros
+
+Remove unlinkZeroFiles from build-webkit
+https://bugs.webkit.org/show_bug.cgi?id=137018
+
+Reviewed by Csaba Osztrogonác.
+
+* Scripts/build-webkit:
+(unlinkZeroFiles): Deleted.
+
2014-09-23 Rohit Kumar
[GTK] Minibrowser : Add keyboard support for stop page load
Modified: trunk/Tools/Scripts/build-webkit (173869 => 173870)
--- trunk/Tools/Scripts/build-webkit 2014-09-23 09:26:14 UTC (rev 173869)
+++ trunk/Tools/Scripts/build-webkit 2014-09-23 09:57:53 UTC (rev 173870)
@@ -143,18 +143,6 @@
my $productDir = productDir();
-sub unlinkZeroFiles()
-{
-my $file = $File::Find::name;
-# Remove 0 byte sized files, except
-# - directories (Because they are always 0 byte sized on Windows)
-# - .d files used for dependency tracking
-if (! -d $file && ! -s $file && $file !~ m/\.d$/) {
-unlink $file;
-print "0 byte sized file removed from build directory: $file\n";
-}
-}
-
# Check that all the project directories are there.
my @projects = ("Source/_javascript_Core", "Source/WebCore", "Source/WebKit");
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [173869] trunk/Tools
Title: [173869] trunk/Tools
Revision 173869
Author commit-qu...@webkit.org
Date 2014-09-23 02:26:14 -0700 (Tue, 23 Sep 2014)
Log Message
[GTK] Minibrowser : Add keyboard support for stop page load
https://bugs.webkit.org/show_bug.cgi?id=136857
Patch by Rohit Kumar on 2014-09-23
Reviewed by Philippe Normand.
Keyboard support to stop page load in GTK Minibrowser using F6 and Escape keys.
* MiniBrowser/gtk/BrowserWindow.c:
(stopPageLoad): Callback to stop page load.
(browser_window_init):
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/MiniBrowser/gtk/BrowserWindow.c
Diff
Modified: trunk/Tools/ChangeLog (173868 => 173869)
--- trunk/Tools/ChangeLog 2014-09-23 08:37:10 UTC (rev 173868)
+++ trunk/Tools/ChangeLog 2014-09-23 09:26:14 UTC (rev 173869)
@@ -1,3 +1,16 @@
+2014-09-23 Rohit Kumar
+
+[GTK] Minibrowser : Add keyboard support for stop page load
+https://bugs.webkit.org/show_bug.cgi?id=136857
+
+Reviewed by Philippe Normand.
+
+Keyboard support to stop page load in GTK Minibrowser using F6 and Escape keys.
+
+* MiniBrowser/gtk/BrowserWindow.c:
+(stopPageLoad): Callback to stop page load.
+(browser_window_init):
+
2014-09-22 Rohit Kumar
[EFL][WK2] Minibrowser : Add keyboard support for page reload while ignoring cache
Modified: trunk/Tools/MiniBrowser/gtk/BrowserWindow.c (173868 => 173869)
--- trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-09-23 08:37:10 UTC (rev 173868)
+++ trunk/Tools/MiniBrowser/gtk/BrowserWindow.c 2014-09-23 09:26:14 UTC (rev 173869)
@@ -540,6 +540,12 @@
webkit_web_view_reload_bypass_cache(window->webView);
}
+static void stopPageLoad(BrowserWindow *window, gpointer user_data)
+{
+if (webkit_web_view_is_loading(window->webView))
+webkit_web_view_stop_loading(window->webView);
+}
+
static void browserWindowFinalize(GObject *gObject)
{
BrowserWindow *window = BROWSER_WINDOW(gObject);
@@ -625,6 +631,12 @@
gtk_accel_group_connect(window->accelGroup, GDK_KEY_R, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE,
g_cclosure_new_swap(G_CALLBACK(reloadPageIgnoringCache), window, NULL));
+/* Stop page load */
+gtk_accel_group_connect(window->accelGroup, GDK_KEY_F6, 0, GTK_ACCEL_VISIBLE,
+g_cclosure_new_swap(G_CALLBACK(stopPageLoad), window, NULL));
+gtk_accel_group_connect(window->accelGroup, GDK_KEY_Escape, 0, GTK_ACCEL_VISIBLE,
+g_cclosure_new_swap(G_CALLBACK(stopPageLoad), window, NULL));
+
GtkWidget *toolbar = gtk_toolbar_new();
window->toolbar = toolbar;
gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
