[webkit-changes] [170698] trunk/Source
Title: [170698] trunk/Source Revision 170698 Author achristen...@apple.com Date 2014-07-01 22:57:33 -0700 (Tue, 01 Jul 2014) Log Message [Win64] Unreviewed build fix. Source/WebCore: * WebCore.vcxproj/WebCore.vcxproj: Exclude CA files from 32 and 64 bit WinCairo builds. * WebCore.vcxproj/WebCoreTestSupport.vcxproj: Don't use a precompiled header in 32 or 63 bit builds of MockCDM.cpp. Source/WebKit: * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Corrected 64-bit linker symbols. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj trunk/Source/WebKit/ChangeLog trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in Diff Modified: trunk/Source/WebCore/ChangeLog (170697 => 170698) --- trunk/Source/WebCore/ChangeLog 2014-07-02 04:49:39 UTC (rev 170697) +++ trunk/Source/WebCore/ChangeLog 2014-07-02 05:57:33 UTC (rev 170698) @@ -1,5 +1,14 @@ 2014-07-01 Alex Christensen +[Win64] Unreviewed build fix. + +* WebCore.vcxproj/WebCore.vcxproj: +Exclude CA files from 32 and 64 bit WinCairo builds. +* WebCore.vcxproj/WebCoreTestSupport.vcxproj: +Don't use a precompiled header in 32 or 63 bit builds of MockCDM.cpp. + +2014-07-01 Alex Christensen + Reduce dynamic memory allocation in css jit. https://bugs.webkit.org/show_bug.cgi?id=134416 Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (170697 => 170698) --- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-02 04:49:39 UTC (rev 170697) +++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-07-02 05:57:33 UTC (rev 170698) @@ -7356,7 +7356,12 @@ - + + true + true + true + true + true true @@ -7365,15 +7370,21 @@ true + true true + true true + true true + true true + true true + true Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj (170697 => 170698) --- trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2014-07-02 04:49:39 UTC (rev 170697) +++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2014-07-02 05:57:33 UTC (rev 170698) @@ -832,11 +832,17 @@ NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing NotUsing + NotUsing Modified: trunk/Source/WebKit/ChangeLog (170697 => 170698) --- trunk/Source/WebKit/ChangeLog 2014-07-02 04:49:39 UTC (rev 170697) +++ trunk/Source/WebKit/ChangeLog 2014-07-02 05:57:33 UTC (rev 170698) @@ -1,3 +1,10 @@ +2014-07-01 Alex Christensen + +[Win64] Unreviewed build fix. + +* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: +Corrected 64-bit linker symbols. + 2014-06-27 Brent Fulgham [Win] Implement parts of the AVFOUNDATION_LOADER_DELEGATE logic for Windows Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (170697 => 170698) --- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-07-02 04:49:39 UTC (rev 170697) +++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-07-02 05:57:33 UTC (rev 170698) @@ -179,7 +179,7 @@ symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z) #if USE(CF) symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ) -symbolWithPointer(?dictionary@CFDictionaryPropertyBag@@QBEPAU__CFDictionary@@XZ, ) +symbolWithPointer(?dictionary@CFDictionaryPropertyBag@@QBEPAU__CFDictionary@@XZ, ?dictionary@CFDictionaryPropertyBag@@QEBAPEAU__CFDictionary@@XZ) #endif symbolWithPointer(?createShadowRoot@Element@WebCore@@QAE?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@AAH@Z, ?createShadowRoot@Element@WebCore@@QEAA?AV?$PassRefPtr@VShadowRoot@WebCore@@@WTF@@AEAH@Z) symbolWithPointer(?createWrapper@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVNode@1@@Z, ?createWrapper@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVNode@1@@Z) @@ -211,7 +211,7 @@ ?selectTag@HTMLNames@WebCore@@3VHTMLQualifiedName@2@B #if ENABLE(INSPECTOR) symbolWithPointer(?buildObjectForHighlightedNode@InspectorController@WebCore@@QBE?AV?$PassRefPtr@VInspectorObject@Inspector@@@WTF@@XZ, ?buildObjectForHighlightedNode@InspectorController@WebCore@@QEBA?AV?$PassRefPtr@VInspectorOb
[webkit-changes] [170697] trunk/Source
Title: [170697] trunk/Source
Revision 170697
Author achristen...@apple.com
Date 2014-07-01 21:49:39 -0700 (Tue, 01 Jul 2014)
Log Message
Reduce dynamic memory allocation in css jit.
https://bugs.webkit.org/show_bug.cgi?id=134416
Reviewed by Benjamin Poulain.
Source/WebCore:
* cssjit/FunctionCall.h:
(WebCore::FunctionCall::saveAllocatedRegisters):
* cssjit/RegisterAllocator.h:
* cssjit/SelectorCompiler.cpp:
(WebCore::SelectorCompiler::addPseudoClassType):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateSelectorChecker):
(WebCore::SelectorCompiler::SelectorCodeGenerator::generateElementIsNthChild):
* cssjit/StackAllocator.h:
(WebCore::StackAllocator::push):
(WebCore::StackAllocator::pop):
Use inlineCapacity template parameter to reduce malloc calls.
I use 32 as the inline capacity for non-register related vectors because that
is probably big enough for the selector compiler, and if it is not then a malloc
call will not be significant because the selector is very complex.
Source/WTF:
* wtf/Deque.h:
Added inlineCapacity optional template parameter.
Modified Paths
trunk/Source/WTF/ChangeLog
trunk/Source/WTF/wtf/Deque.h
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/cssjit/FunctionCall.h
trunk/Source/WebCore/cssjit/RegisterAllocator.h
trunk/Source/WebCore/cssjit/SelectorCompiler.cpp
trunk/Source/WebCore/cssjit/StackAllocator.h
Diff
Modified: trunk/Source/WTF/ChangeLog (170696 => 170697)
--- trunk/Source/WTF/ChangeLog 2014-07-02 04:49:27 UTC (rev 170696)
+++ trunk/Source/WTF/ChangeLog 2014-07-02 04:49:39 UTC (rev 170697)
@@ -1,3 +1,13 @@
+2014-07-01 Alex Christensen
+
+Reduce dynamic memory allocation in css jit.
+https://bugs.webkit.org/show_bug.cgi?id=134416
+
+Reviewed by Benjamin Poulain.
+
+* wtf/Deque.h:
+Added inlineCapacity optional template parameter.
+
2014-06-30 Commit Queue
Unreviewed, rolling out r170605.
Modified: trunk/Source/WTF/wtf/Deque.h (170696 => 170697)
--- trunk/Source/WTF/wtf/Deque.h 2014-07-02 04:49:27 UTC (rev 170696)
+++ trunk/Source/WTF/wtf/Deque.h 2014-07-02 04:49:39 UTC (rev 170697)
@@ -38,25 +38,25 @@
namespace WTF {
-template class DequeIteratorBase;
-template class DequeIterator;
-template class DequeConstIterator;
+template class DequeIteratorBase;
+template class DequeIterator;
+template class DequeConstIterator;
-template
+template
class Deque {
WTF_MAKE_FAST_ALLOCATED;
public:
-typedef DequeIterator iterator;
-typedef DequeConstIterator const_iterator;
+typedef DequeIterator iterator;
+typedef DequeConstIterator const_iterator;
typedef std::reverse_iterator reverse_iterator;
typedef std::reverse_iterator const_reverse_iterator;
Deque();
-Deque(const Deque&);
-Deque& operator=(const Deque&);
+Deque(const Deque&);
+Deque& operator=(const Deque&);
~Deque();
-void swap(Deque&);
+void swap(Deque&);
size_t size() const { return m_start <= m_end ? m_end - m_start : m_end + m_buffer.capacity() - m_start; }
bool isEmpty() const { return m_start == m_end; }
@@ -91,11 +91,11 @@
iterator findIf(Predicate&&);
private:
-friend class DequeIteratorBase;
+friend class DequeIteratorBase;
-typedef VectorBuffer Buffer;
+typedef VectorBuffer Buffer;
typedef VectorTypeOperations TypeOperations;
-typedef DequeIteratorBase IteratorBase;
+typedef DequeIteratorBase IteratorBase;
void remove(size_t position);
void invalidateIterators();
@@ -113,11 +113,11 @@
#endif
};
-template
+template
class DequeIteratorBase {
protected:
DequeIteratorBase();
-DequeIteratorBase(const Deque*, size_t);
+DequeIteratorBase(const Deque*, size_t);
DequeIteratorBase(const DequeIteratorBase&);
DequeIteratorBase& operator=(const DequeIteratorBase&);
~DequeIteratorBase();
@@ -138,10 +138,10 @@
void checkValidity() const;
void checkValidity(const DequeIteratorBase&) const;
-Deque* m_deque;
+Deque* m_deque;
size_t m_index;
-friend class Deque;
+friend class Deque;
#ifndef NDEBUG
mutable DequeIteratorBase* m_next;
@@ -149,11 +149,11 @@
#endif
};
-template
-class DequeIterator : public DequeIteratorBase {
+template
+class DequeIterator : public DequeIteratorBase {
private:
-typedef DequeIteratorBase Base;
-typedef DequeIterator Iterator;
+typedef DequeIteratorBase Base;
+typedef DequeIterator Iterator;
public:
typedef ptrdiff_t difference_type;
@@ -162,7 +162,8 @@
typedef T& reference;
typedef std::bidirectional_iterator_tag iterator_category;
-DequeIterator(Deque* deque, size_t index) : Base
[webkit-changes] [170696] trunk/Source/WebKit2
Title: [170696] trunk/Source/WebKit2 Revision 170696 Author commit-qu...@webkit.org Date 2014-07-01 21:49:27 -0700 (Tue, 01 Jul 2014) Log Message [EFL] Fix occurrence of two cursors on WK2 EFL. https://bugs.webkit.org/show_bug.cgi?id=134436 Patch by KwangHyuk Kim on 2014-07-01 Reviewed by Anders Carlsson. ecore_x_window_cursor is released when ecore_evas_object_cursor should be shown in order to avoid occurrence of two cursors. * UIProcess/API/efl/EwkView.cpp: (EwkView::updateCursor): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (170695 => 170696) --- trunk/Source/WebKit2/ChangeLog 2014-07-02 03:44:17 UTC (rev 170695) +++ trunk/Source/WebKit2/ChangeLog 2014-07-02 04:49:27 UTC (rev 170696) @@ -1,3 +1,15 @@ +2014-07-01 KwangHyuk Kim + +[EFL] Fix occurrence of two cursors on WK2 EFL. +https://bugs.webkit.org/show_bug.cgi?id=134436 + +Reviewed by Anders Carlsson. + +ecore_x_window_cursor is released when ecore_evas_object_cursor should be shown in order to avoid occurrence of two cursors. + +* UIProcess/API/efl/EwkView.cpp: +(EwkView::updateCursor): + 2014-07-01 Gyuyoung Kim Fix build break on EFL and GTK ports since r170683 Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (170695 => 170696) --- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2014-07-02 03:44:17 UTC (rev 170695) +++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2014-07-02 04:49:27 UTC (rev 170696) @@ -469,6 +469,10 @@ if (data) hotspotY = atoi(data); +#ifdef HAVE_ECORE_X +ecore_x_window_cursor_set(getEcoreXWindow(ecoreEvas), 0); +#endif + // ecore_evas takes care of freeing the cursor object. ecore_evas_object_cursor_set(ecoreEvas, cursorObject.release(), EVAS_LAYER_MAX, hotspotX, hotspotY); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170693] trunk/Source/WebKit2
Title: [170693] trunk/Source/WebKit2 Revision 170693 Author d...@apple.com Date 2014-07-01 20:21:43 -0700 (Tue, 01 Jul 2014) Log Message Make LogsPageMessagesToSystemConsoleEnabled a global debug preference https://bugs.webkit.org/show_bug.cgi?id=134534 Reviewed by Joseph Pecoraro. * Shared/WebPreferencesDefinitions.h: Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h Diff Modified: trunk/Source/WebKit2/ChangeLog (170692 => 170693) --- trunk/Source/WebKit2/ChangeLog 2014-07-02 03:06:15 UTC (rev 170692) +++ trunk/Source/WebKit2/ChangeLog 2014-07-02 03:21:43 UTC (rev 170693) @@ -1,3 +1,12 @@ +2014-07-01 Dean Jackson + +Make LogsPageMessagesToSystemConsoleEnabled a global debug preference +https://bugs.webkit.org/show_bug.cgi?id=134534 + +Reviewed by Joseph Pecoraro. + +* Shared/WebPreferencesDefinitions.h: + 2014-07-01 Tim Horton Handle invalid data more gracefully. Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170692 => 170693) --- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-02 03:06:15 UTC (rev 170692) +++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-02 03:21:43 UTC (rev 170693) @@ -178,7 +178,6 @@ macro(AggressiveTileRetentionEnabled, aggressiveTileRetentionEnabled, Bool, bool, false) \ macro(TemporaryTileCohortRetentionEnabled, temporaryTileCohortRetentionEnabled, Bool, bool, DEFAULT_TEMPORARY_TILE_COHORT_RETENTION_ENABLED) \ macro(QTKitEnabled, isQTKitEnabled, Bool, bool, true) \ -macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \ macro(PageVisibilityBasedProcessSuppressionEnabled, pageVisibilityBasedProcessSuppressionEnabled, Bool, bool, true) \ macro(SmartInsertDeleteEnabled, smartInsertDeleteEnabled, Bool, bool, true) \ macro(SelectTrailingWhitespaceEnabled, selectTrailingWhitespaceEnabled, Bool, bool, false) \ @@ -239,6 +238,8 @@ macro(CompositingBordersVisible, compositingBordersVisible, Bool, bool, false) \ macro(CompositingRepaintCountersVisible, compositingRepaintCountersVisible, Bool, bool, false) \ macro(TiledScrollingIndicatorVisible, tiledScrollingIndicatorVisible, Bool, bool, false) \ +macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \ +\ #if PLATFORM(COCOA) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170692] trunk/Source/WebKit2
Title: [170692] trunk/Source/WebKit2 Revision 170692 Author timothy_hor...@apple.com Date 2014-07-01 20:06:15 -0700 (Tue, 01 Jul 2014) Log Message Handle invalid data more gracefully. Reviewed by Anders Carlsson. * UIProcess/mac/LegacySessionStateCoding.cpp: (WebKit::decodeFormData): (WebKit::decodeBackForwardTreeNode): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (170691 => 170692) --- trunk/Source/WebKit2/ChangeLog 2014-07-02 02:50:09 UTC (rev 170691) +++ trunk/Source/WebKit2/ChangeLog 2014-07-02 03:06:15 UTC (rev 170692) @@ -1,3 +1,13 @@ +2014-07-01 Tim Horton + +Handle invalid data more gracefully. + +Reviewed by Anders Carlsson. + +* UIProcess/mac/LegacySessionStateCoding.cpp: +(WebKit::decodeFormData): +(WebKit::decodeBackForwardTreeNode): + 2014-07-01 Mark Rowe Add a missing return statement in WKPageCopySessionState. Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170691 => 170692) --- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 02:50:09 UTC (rev 170691) +++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 03:06:15 UTC (rev 170692) @@ -825,6 +825,9 @@ HTTPBody::Element formDataElement; decodeFormDataElement(decoder, formDataElement); +if (!decoder.isValid()) +return; + formData.elements.append(std::move(formDataElement)); } @@ -846,6 +849,10 @@ decoder >> childFrameState.urlString; decodeBackForwardTreeNode(decoder, childFrameState); + +if (!decoder.isValid()) +return; + frameState.children.append(std::move(childFrameState)); } @@ -858,6 +865,9 @@ String state; decoder >> state; +if (!decoder.isValid()) +return; + frameState.documentState.append(std::move(state)); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170691] trunk/LayoutTests
Title: [170691] trunk/LayoutTests
Revision 170691
Author simon.fra...@apple.com
Date 2014-07-01 19:50:09 -0700 (Tue, 01 Jul 2014)
Log Message
Fix this test; it was waiting about 32 years for the end of an animation.
What we really care about is the start of the animation.
* compositing/animation/keyframe-order.html:
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/compositing/animation/keyframe-order.html
Diff
Modified: trunk/LayoutTests/ChangeLog (170690 => 170691)
--- trunk/LayoutTests/ChangeLog 2014-07-02 02:43:32 UTC (rev 170690)
+++ trunk/LayoutTests/ChangeLog 2014-07-02 02:50:09 UTC (rev 170691)
@@ -1,3 +1,10 @@
+2014-07-01 Simon Fraser
+
+Fix this test; it was waiting about 32 years for the end of an animation.
+What we really care about is the start of the animation.
+
+* compositing/animation/keyframe-order.html:
+
2014-07-01 Chris Fleizach
AX: iOS does not expose ARIA toggle buttons at all (not even as a regular button)
Modified: trunk/LayoutTests/compositing/animation/keyframe-order.html (170690 => 170691)
--- trunk/LayoutTests/compositing/animation/keyframe-order.html 2014-07-02 02:43:32 UTC (rev 170690)
+++ trunk/LayoutTests/compositing/animation/keyframe-order.html 2014-07-02 02:50:09 UTC (rev 170691)
@@ -52,7 +52,7 @@
function doTest()
{
var box = document.getElementById('spinner');
-box.addEventListener('webkitAnimationEnd', function() {
+box.addEventListener('webkitAnimationStart', function() {
if (window.testRunner)
testRunner.notifyDone();
}, false);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170690] trunk/Source/WebCore
Title: [170690] trunk/Source/WebCore Revision 170690 Author simon.fra...@apple.com Date 2014-07-01 19:43:32 -0700 (Tue, 01 Jul 2014) Log Message Improve behavior of position:sticky on zoomed pages https://bugs.webkit.org/show_bug.cgi?id=134535 Reviewed by Dean Jackson. Despite r138036, position:sticky still had incorrect behavior in zoomed pages. Fix by removing the scaling of the rect from viewportConstrainedVisibleContentRect(), since all the other math happens in unscaled coordinates. * rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::constrainingRectForStickyPosition): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (170689 => 170690) --- trunk/Source/WebCore/ChangeLog 2014-07-02 02:24:44 UTC (rev 170689) +++ trunk/Source/WebCore/ChangeLog 2014-07-02 02:43:32 UTC (rev 170690) @@ -1,3 +1,19 @@ +2014-07-01 Simon Fraser + +Improve behavior of position:sticky on zoomed pages +https://bugs.webkit.org/show_bug.cgi?id=134535 + + +Reviewed by Dean Jackson. + +Despite r138036, position:sticky still had incorrect behavior in zoomed pages. + +Fix by removing the scaling of the rect from viewportConstrainedVisibleContentRect(), +since all the other math happens in unscaled coordinates. + +* rendering/RenderBoxModelObject.cpp: +(WebCore::RenderBoxModelObject::constrainingRectForStickyPosition): + 2014-07-01 Alex Christensen [WebGL] Fix PVRTC extension. Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (170689 => 170690) --- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-07-02 02:24:44 UTC (rev 170689) +++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-07-02 02:43:32 UTC (rev 170690) @@ -451,10 +451,7 @@ return constrainingRect; } -LayoutRect viewportRect = view().frameView().viewportConstrainedVisibleContentRect(); -float scale = frame().frameScaleFactor(); -viewportRect.scale(1 / scale); -return viewportRect; +return view().frameView().viewportConstrainedVisibleContentRect(); } LayoutSize RenderBoxModelObject::stickyPositionOffset() const ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170689] trunk/Source/WebKit2
Title: [170689] trunk/Source/WebKit2 Revision 170689 Author mr...@apple.com Date 2014-07-01 19:24:44 -0700 (Tue, 01 Jul 2014) Log Message Add a missing return statement in WKPageCopySessionState. Reviewed by Anders Carlsson. * UIProcess/API/C/WKPage.cpp: (WKPageCopySessionState): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp Diff Modified: trunk/Source/WebKit2/ChangeLog (170688 => 170689) --- trunk/Source/WebKit2/ChangeLog 2014-07-02 01:36:40 UTC (rev 170688) +++ trunk/Source/WebKit2/ChangeLog 2014-07-02 02:24:44 UTC (rev 170689) @@ -1,3 +1,12 @@ +2014-07-01 Mark Rowe + +Add a missing return statement in WKPageCopySessionState. + +Reviewed by Anders Carlsson. + +* UIProcess/API/C/WKPage.cpp: +(WKPageCopySessionState): + 2014-07-01 Anders Carlsson Don't encode/decode the snapshot UUID Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170688 => 170689) --- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 01:36:40 UTC (rev 170688) +++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 02:24:44 UTC (rev 170689) @@ -370,7 +370,7 @@ }); if (shouldReturnData) -toAPI(encodeLegacySessionState(sessionState).release().leakRef()); +return toAPI(encodeLegacySessionState(sessionState).release().leakRef()); return toAPI(API::SessionState::create(std::move(sessionState)).leakRef()); } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170688] trunk/Source/WebKit/mac
Title: [170688] trunk/Source/WebKit/mac
Revision 170688
Author m...@apple.com
Date 2014-07-01 18:36:40 -0700 (Tue, 01 Jul 2014)
Log Message
Remove WebChromeClient code that was only needed for Safari versions earlier than 3.1
https://bugs.webkit.org/show_bug.cgi?id=134531
Reviewed by Daniel Bates.
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::exceededDatabaseQuota):
Modified Paths
trunk/Source/WebKit/mac/ChangeLog
trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (170687 => 170688)
--- trunk/Source/WebKit/mac/ChangeLog 2014-07-02 01:27:55 UTC (rev 170687)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-07-02 01:36:40 UTC (rev 170688)
@@ -1,3 +1,13 @@
+2014-07-01 Dan Bernstein
+
+Remove WebChromeClient code that was only needed for Safari versions earlier than 3.1
+https://bugs.webkit.org/show_bug.cgi?id=134531
+
+Reviewed by Daniel Bates.
+
+* WebCoreSupport/WebChromeClient.mm:
+(WebChromeClient::exceededDatabaseQuota):
+
2014-06-29 Yoav Weiss
Add support for HTMLImageElement's sizes attribute
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (170687 => 170688)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-07-02 01:27:55 UTC (rev 170687)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2014-07-02 01:36:40 UTC (rev 170688)
@@ -684,14 +684,7 @@
BEGIN_BLOCK_OBJC_EXCEPTIONS;
WebSecurityOrigin *webOrigin = [[WebSecurityOrigin alloc] _initWithWebCoreSecurityOrigin:frame->document()->securityOrigin()];
-#if !PLATFORM(IOS)
-// FIXME: remove this workaround once shipping Safari has the necessary delegate implemented.
-if (WKAppVersionCheckLessThan(@"com.apple.Safari", -1, 3.1)) {
-const unsigned long long defaultQuota = 5 * 1024 * 1024; // 5 megabytes should hopefully be enough to test storage support.
-[[webOrigin databaseQuotaManager] setQuota:defaultQuota];
-} else
-#endif
-CallUIDelegate(m_webView, @selector(webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:), kit(frame), webOrigin, (NSString *)databaseName);
+CallUIDelegate(m_webView, @selector(webView:frame:exceededDatabaseQuotaForSecurityOrigin:database:), kit(frame), webOrigin, (NSString *)databaseName);
[webOrigin release];
END_BLOCK_OBJC_EXCEPTIONS;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170687] trunk/Source/WebKit2
Title: [170687] trunk/Source/WebKit2
Revision 170687
Author ander...@apple.com
Date 2014-07-01 18:27:55 -0700 (Tue, 01 Jul 2014)
Log Message
Don't encode/decode the snapshot UUID
https://bugs.webkit.org/show_bug.cgi?id=134532
Reviewed by Sam Weinig.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistory):
(WebKit::decodeSessionHistoryEntry):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170686 => 170687)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 01:24:17 UTC (rev 170686)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 01:27:55 UTC (rev 170687)
@@ -1,3 +1,14 @@
+2014-07-01 Anders Carlsson
+
+Don't encode/decode the snapshot UUID
+https://bugs.webkit.org/show_bug.cgi?id=134532
+
+Reviewed by Sam Weinig.
+
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistory):
+(WebKit::decodeSessionHistoryEntry):
+
2014-07-01 Commit Queue
Unreviewed, rolling out r170608.
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170686 => 170687)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 01:24:17 UTC (rev 170686)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 01:27:55 UTC (rev 170687)
@@ -52,7 +52,6 @@
static const CFStringRef sessionHistoryEntryURLKey = CFSTR("SessionHistoryEntryURL");
static CFStringRef sessionHistoryEntryTitleKey = CFSTR("SessionHistoryEntryTitle");
static CFStringRef sessionHistoryEntryOriginalURLKey = CFSTR("SessionHistoryEntryOriginalURL");
-static CFStringRef sessionHistoryEntrySnapshotUUIDKey = CFSTR("SessionHistoryEntrySnapshotUUID");
static CFStringRef sessionHistoryEntryDataKey = CFSTR("SessionHistoryEntryData");
// Session history entry data.
@@ -437,7 +436,7 @@
auto originalURL = item.pageState.mainFrameState.originalURLString.createCFString();
auto data = ""
-auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryOriginalURLKey, originalURL.get() }, { sessionHistoryEntryDataKey, data.get() }, { sessionHistoryEntrySnapshotUUIDKey, item.snapshotUUID.createCFString().get() }});
+auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryOriginalURLKey, originalURL.get() }, { sessionHistoryEntryDataKey, data.get() } });
CFArrayAppendValue(entries.get(), entryDictionary.get());
}
@@ -954,9 +953,6 @@
if (!decodeSessionHistoryEntryData(historyEntryData, backForwardListItemState.pageState.mainFrameState))
return false;
-if (auto snapshotUUID = WTF::dynamic_cf_cast(CFDictionaryGetValue(entryDictionary, sessionHistoryEntrySnapshotUUIDKey)))
-backForwardListItemState.snapshotUUID = snapshotUUID;
-
backForwardListItemState.pageState.title = title;
backForwardListItemState.pageState.mainFrameState.urlString = urlString;
backForwardListItemState.pageState.mainFrameState.originalURLString = originalURLString;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170686] trunk/Source/WebKit2
Title: [170686] trunk/Source/WebKit2
Revision 170686
Author commit-qu...@webkit.org
Date 2014-07-01 18:24:17 -0700 (Tue, 01 Jul 2014)
Log Message
Unreviewed, rolling out r170608.
https://bugs.webkit.org/show_bug.cgi?id=134533
Safari keeps crashing on device due to sandbox violation.
(Requested by enrica on #webkit).
Reverted changeset:
"Restrict network process sandbox"
https://bugs.webkit.org/show_bug.cgi?id=134360
http://trac.webkit.org/changeset/170608
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb
trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp
trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h
trunk/Source/WebKit2/Shared/mac/SandboxUtilities.cpp
trunk/Source/WebKit2/Shared/mac/SandboxUtilities.h
trunk/Source/WebKit2/UIProcess/WebContext.cpp
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170685 => 170686)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 00:57:52 UTC (rev 170685)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 01:24:17 UTC (rev 170686)
@@ -1,3 +1,17 @@
+2014-07-01 Commit Queue
+
+Unreviewed, rolling out r170608.
+https://bugs.webkit.org/show_bug.cgi?id=134533
+
+Safari keeps crashing on device due to sandbox violation.
+(Requested by enrica on #webkit).
+
+Reverted changeset:
+
+"Restrict network process sandbox"
+https://bugs.webkit.org/show_bug.cgi?id=134360
+http://trac.webkit.org/changeset/170608
+
2014-07-01 Pratik Solanki
Encode/decode CFURLRequestRefs when USE(CFNETWORK) is enabled
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (170685 => 170686)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-02 00:57:52 UTC (rev 170685)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2014-07-02 01:24:17 UTC (rev 170686)
@@ -60,23 +60,24 @@
void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessCreationParameters& parameters)
{
-SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
-m_diskCacheDirectory = parameters.diskCacheDirectory;
-
-if (!m_diskCacheDirectory.isNull()) {
-SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
#if PLATFORM(IOS)
+if (!parameters.uiProcessBundleIdentifier.isNull()) {
[NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
_initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
diskCapacity:parameters.nsURLCacheDiskCapacity
relativePath:parameters.uiProcessBundleIdentifier]).get()];
+}
#else
+m_diskCacheDirectory = parameters.diskCacheDirectory;
+
+if (!m_diskCacheDirectory.isNull()) {
+SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
[NSURLCache setSharedURLCache:adoptNS([[NSURLCache alloc]
initWithMemoryCapacity:parameters.nsURLCacheMemoryCapacity
diskCapacity:parameters.nsURLCacheDiskCapacity
diskPath:parameters.diskCacheDirectory]).get()];
+}
#endif
-}
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
RetainPtr cache = adoptCF(CFURLCacheCopySharedURLCache());
Modified: trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb (170685 => 170686)
--- trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-07-02 00:57:52 UTC (rev 170685)
+++ trunk/Source/WebKit2/Resources/SandboxProfiles/ios/com.apple.WebKit.Networking.sb 2014-07-02 01:24:17 UTC (rev 170686)
@@ -22,48 +22,7 @@
; THE POSSIBILITY OF SUCH DAMAGE.
(version 1)
-(deny default (with partial-symbolication))
-(allow system-audit file-read-metadata)
+(allow default)
(import "common.sb")
(import "removed-dev-nodes.sb")
-
-;; Access CFNetwork shared cookies
-;; This is too generous --
-(apple-cookie-access 'with-read-write)
-
-;; Sandbox extensions
-(allow file-read* (container-subpath "Library/")
- (extension "com.apple.webkit.read"))
-
-;; Access to client's cache folder & re-vending to CFNetwork.
-(allow file-read* file-write* (container-subpath "Library/")
- (extension "com.apple.nsurlstorage.extension-cache"))
-(allow file-issue-extension (container-subpath "Library/")
- (extension-class "com.apple.nsurlstorage.extension-cache"))
-
-;; App sandbox extensions
-(allow file-read* file-write* (container-subpath "Library/")
- (extension "com.apple.app-sandbox.read-write"))
-
-;; Access to own cache & temp folders.
-(allow file-read* file-write* (container-subpath "")
- (extension "com.apple.webkit.read-write"))
-
-;; IOKit user clients
-(allow
[webkit-changes] [170685] trunk
Title: [170685] trunk
Revision 170685
Author psola...@apple.com
Date 2014-07-01 17:57:52 -0700 (Tue, 01 Jul 2014)
Log Message
Encode/decode CFURLRequestRefs when USE(CFNETWORK) is enabled
https://bugs.webkit.org/show_bug.cgi?id=134454
Reviewed by Andreas Kling.
Source/WebKit2:
Use new helper methods to serialize/deserialize CFURLRequestRef directly so we can avoid
creating NSURLRequest.
* Shared/mac/WebCoreArgumentCodersMac.mm:
(IPC::ArgumentCoder::encodePlatformData):
(IPC::ArgumentCoder::decodePlatformData):
WebKitLibraries:
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceMavericks.a:
* libWebKitSystemInterfaceMountainLion.a:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
trunk/WebKitLibraries/ChangeLog
trunk/WebKitLibraries/WebKitSystemInterface.h
trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a
trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170684 => 170685)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 00:49:13 UTC (rev 170684)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 00:57:52 UTC (rev 170685)
@@ -1,3 +1,18 @@
+2014-07-01 Pratik Solanki
+
+Encode/decode CFURLRequestRefs when USE(CFNETWORK) is enabled
+https://bugs.webkit.org/show_bug.cgi?id=134454
+
+
+Reviewed by Andreas Kling.
+
+Use new helper methods to serialize/deserialize CFURLRequestRef directly so we can avoid
+creating NSURLRequest.
+
+* Shared/mac/WebCoreArgumentCodersMac.mm:
+(IPC::ArgumentCoder::encodePlatformData):
+(IPC::ArgumentCoder::decodePlatformData):
+
2014-07-01 Benjamin Poulain
[iOS][WK2] Fix a race between the short tap and long tap highlight
Modified: trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm (170684 => 170685)
--- trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-07-02 00:49:13 UTC (rev 170684)
+++ trunk/Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm 2014-07-02 00:57:52 UTC (rev 170685)
@@ -35,12 +35,45 @@
#import
#import
+#if USE(CFNETWORK)
+#import
+#endif
+
using namespace WebCore;
namespace IPC {
+#if USE(CFNETWORK)
void ArgumentCoder::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
{
+RetainPtr requestToSerialize = resourceRequest.cfURLRequest(DoNotUpdateHTTPBody);
+
+bool requestIsPresent = requestToSerialize;
+encoder << requestIsPresent;
+
+if (!requestIsPresent)
+return;
+
+// We don't send HTTP body over IPC for better performance.
+// Also, it's not always possible to do, as streams can only be created in process that does networking.
+RetainPtr requestHTTPBody = adoptCF(CFURLRequestCopyHTTPRequestBody(requestToSerialize.get()));
+RetainPtr requestHTTPBodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(requestToSerialize.get()));
+if (requestHTTPBody || requestHTTPBodyStream) {
+CFMutableURLRequestRef mutableRequest = CFURLRequestCreateMutableCopy(0, requestToSerialize.get());
+requestToSerialize = adoptCF(mutableRequest);
+CFURLRequestSetHTTPRequestBody(mutableRequest, nil);
+CFURLRequestSetHTTPRequestBodyStream(mutableRequest, nil);
+}
+
+RetainPtr dictionary = adoptCF(WKCFURLRequestCreateSerializableRepresentation(requestToSerialize.get(), IPC::tokenNullTypeRef()));
+IPC::encode(encoder, dictionary.get());
+
+// The fallback array is part of CFURLRequest, but it is not encoded by WKCFURLRequestCreateSerializableRepresentation.
+encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();
+}
+#else
+void ArgumentCoder::encodePlatformData(ArgumentEncoder& encoder, const ResourceRequest& resourceRequest)
+{
RetainPtr requestToSerialize = resourceRequest.nsURLRequest(DoNotUpdateHTTPBody);
bool requestIsPresent = requestToSerialize;
@@ -63,6 +96,7 @@
// The fallback array is part of NSURLRequest, but it is not encoded by WKNSURLRequestCreateSerializableRepresentation.
encoder << resourceRequest.responseContentDispositionEncodingFallbackArray();
}
+#endif
bool ArgumentCoder::decodePlatformData(ArgumentDecoder& decoder, ResourceRequest& resourceRequest)
{
@@ -79,11 +113,19 @@
if (!IPC::decode(decoder, dictionary))
return false;
+#if USE(CFNETWORK)
+RetainPtr cfURLRequest = adoptCF(WKCreateCFURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef()));
+if (!cfURLRequest)
+return false;
+
+resourceRequest = ResourceRequest(cfURLRequest.get());
+#else
RetainPtr nsURLRequest = WKNSURLRequestFromSerializableRepresentation(dictionary.get(), IPC::tokenNullTypeRef());
if (!nsURLRequest)
return false;
resourceRequest = ResourceRequest(nsURLRequest.get());
+#endif
Vector responseContentDispositionEncodingFallbackArray;
if (!decoder.decode(resp
[webkit-changes] [170684] trunk/Source/WebKit2
Title: [170684] trunk/Source/WebKit2
Revision 170684
Author benja...@webkit.org
Date 2014-07-01 17:49:13 -0700 (Tue, 01 Jul 2014)
Log Message
[iOS][WK2] Fix a race between the short tap and long tap highlight
https://bugs.webkit.org/show_bug.cgi?id=134530
Reviewed by Enrica Casucci.
There was a potential race of event that can theoretically cause WKContentViewInteraction
to call [WKContentView _showTapHighlight] after all interactions have been cancelled.
The race would be like this:
1) On a short tap, _singleTapRecognized: is called, a tap highlight ID is defined and
_potentialTapInProgress is set to YES.
2) For some reason, the gesture is cancelled. The method _singleTapDidReset is called,
setting _potentialTapInProgress but leaving the tap highlight ID as valid.
3) The UIProcess receives the tap highlight information from the WebProcess, _didGetTapHighlightForRequest:
has a valid ID, _potentialTapInProgress is false -> the highlight is shown right away as if a long tap
was in progress.
The missing piece that causes this is _singleTapDidReset: must also invalidate the tap highlight ID. This is done
in the new static function cancelPotentialTapIfNecessary().
Just invalidating the ID would create another race:
1) Short tap gesture recognizer starts.
2) The long press recognizer starts before (1) is commited.
3) The long press recognizers sets up its own tap highlight ID.
4) The short tap gesture recognizer resets, erasing the tap highlight ID defined in (3).
To avoid this, the long press gesture recognizers immediately cancels any potential tap in progress.
If _singleTapDidReset: is called before (3), this does nothing. If the reset is called after (3),
_singleTapDidReset does nothing.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _highlightLongPressRecognized:]):
(cancelPotentialTapIfNecessary):
(-[WKContentView _singleTapDidReset:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170683 => 170684)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 00:47:19 UTC (rev 170683)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 00:49:13 UTC (rev 170684)
@@ -1,3 +1,40 @@
+2014-07-01 Benjamin Poulain
+
+[iOS][WK2] Fix a race between the short tap and long tap highlight
+https://bugs.webkit.org/show_bug.cgi?id=134530
+
+Reviewed by Enrica Casucci.
+
+There was a potential race of event that can theoretically cause WKContentViewInteraction
+to call [WKContentView _showTapHighlight] after all interactions have been cancelled.
+
+The race would be like this:
+1) On a short tap, _singleTapRecognized: is called, a tap highlight ID is defined and
+ _potentialTapInProgress is set to YES.
+2) For some reason, the gesture is cancelled. The method _singleTapDidReset is called,
+ setting _potentialTapInProgress but leaving the tap highlight ID as valid.
+3) The UIProcess receives the tap highlight information from the WebProcess, _didGetTapHighlightForRequest:
+ has a valid ID, _potentialTapInProgress is false -> the highlight is shown right away as if a long tap
+ was in progress.
+
+The missing piece that causes this is _singleTapDidReset: must also invalidate the tap highlight ID. This is done
+in the new static function cancelPotentialTapIfNecessary().
+
+Just invalidating the ID would create another race:
+1) Short tap gesture recognizer starts.
+2) The long press recognizer starts before (1) is commited.
+3) The long press recognizers sets up its own tap highlight ID.
+4) The short tap gesture recognizer resets, erasing the tap highlight ID defined in (3).
+
+To avoid this, the long press gesture recognizers immediately cancels any potential tap in progress.
+If _singleTapDidReset: is called before (3), this does nothing. If the reset is called after (3),
+_singleTapDidReset does nothing.
+
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView _highlightLongPressRecognized:]):
+(cancelPotentialTapIfNecessary):
+(-[WKContentView _singleTapDidReset:]):
+
2014-07-01 Anders Carlsson
Add ABI hacks to allow WKPageRef to use WKSessionStateRef
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170683 => 170684)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-02 00:47:19 UTC (rev 170683)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-02 00:49:13 UTC (rev 170684)
@@ -877,6 +877,7 @@
switch ([gestureRecognizer state]) {
case UIGestureRecognizerStateBegan:
+cancelPotentialTapIfNecessary(self);
_page->tapHighlightAtPosition([gestureRecognizer startPoint], ++_latestTapHighlightID);
_isTapHighlightIDValid = YES;
[webkit-changes] [170683] trunk
Title: [170683] trunk
Revision 170683
Author ander...@apple.com
Date 2014-07-01 17:47:19 -0700 (Tue, 01 Jul 2014)
Log Message
Add ABI hacks to allow WKPageRef to use WKSessionStateRef
https://bugs.webkit.org/show_bug.cgi?id=134529
Reviewed by Sam Weinig.
* UIProcess/API/APISessionState.h:
Add a sessionState() getter.
* UIProcess/API/C/WKPage.cpp:
(WKPageCopySessionState):
Add a hack where we return a WKSessionStateRef if the least significant bit of the context pointer
is 1, and a WKDataRef otherwise.
(WKPageRestoreFromSessionState):
Handle both WKDataRef and WKSessionStateref.
* UIProcess/API/C/WKPage.h:
Use WKTypeRefs for state saving and restoration.
* UIProcess/API/C/WKSessionStateRef.cpp:
(WKSessionStateCopyData):
Add helper function.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APISessionState.h
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKPage.h
trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.h
trunk/Tools/TestWebKitAPI/Tests/WebKit2/RestoreSessionStateContainingFormData.cpp
trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPageGetScaleFactorNotZero.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170682 => 170683)
--- trunk/Source/WebKit2/ChangeLog 2014-07-02 00:43:42 UTC (rev 170682)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 00:47:19 UTC (rev 170683)
@@ -1,5 +1,30 @@
2014-07-01 Anders Carlsson
+Add ABI hacks to allow WKPageRef to use WKSessionStateRef
+https://bugs.webkit.org/show_bug.cgi?id=134529
+
+Reviewed by Sam Weinig.
+
+* UIProcess/API/APISessionState.h:
+Add a sessionState() getter.
+
+* UIProcess/API/C/WKPage.cpp:
+(WKPageCopySessionState):
+Add a hack where we return a WKSessionStateRef if the least significant bit of the context pointer
+is 1, and a WKDataRef otherwise.
+
+(WKPageRestoreFromSessionState):
+Handle both WKDataRef and WKSessionStateref.
+
+* UIProcess/API/C/WKPage.h:
+Use WKTypeRefs for state saving and restoration.
+
+* UIProcess/API/C/WKSessionStateRef.cpp:
+(WKSessionStateCopyData):
+Add helper function.
+
+2014-07-01 Anders Carlsson
+
WKPageRestoreFromSessionState should use the new session state restore code path
https://bugs.webkit.org/show_bug.cgi?id=134526
Modified: trunk/Source/WebKit2/UIProcess/API/APISessionState.h (170682 => 170683)
--- trunk/Source/WebKit2/UIProcess/API/APISessionState.h 2014-07-02 00:43:42 UTC (rev 170682)
+++ trunk/Source/WebKit2/UIProcess/API/APISessionState.h 2014-07-02 00:47:19 UTC (rev 170683)
@@ -36,6 +36,8 @@
static PassRefPtr create(WebKit::SessionState);
virtual ~SessionState();
+const WebKit::SessionState& sessionState() const { return m_sessionState; }
+
private:
explicit SessionState(WebKit::SessionState);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170682 => 170683)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 00:43:42 UTC (rev 170682)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 00:47:19 UTC (rev 170683)
@@ -32,6 +32,7 @@
#include "APIFindClient.h"
#include "APILoaderClient.h"
#include "APIPolicyClient.h"
+#include "APISessionState.h"
#include "APIUIClient.h"
#include "ImmutableDictionary.h"
#include "LegacySessionStateCoding.h"
@@ -350,8 +351,12 @@
return toAPI(sessionBackForwardListValueType);
}
-WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
+WKTypeRef WKPageCopySessionState(WKPageRef pageRef, void* context, WKPageSessionStateFilterCallback filter)
{
+// FIXME: This is a hack to make sure we return a WKDataRef to maintain compatibility with older versions of Safari.
+bool shouldReturnData = !(reinterpret_cast(context) & 1);
+context = reinterpret_cast(reinterpret_cast(context) & ~1);
+
auto sessionState = toImpl(pageRef)->sessionState([pageRef, context, filter](WebBackForwardListItem& item) {
if (filter) {
if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
@@ -364,15 +369,26 @@
return true;
});
-return toAPI(encodeLegacySessionState(sessionState).release().leakRef());
+if (shouldReturnData)
+toAPI(encodeLegacySessionState(sessionState).release().leakRef());
+
+return toAPI(API::SessionState::create(std::move(sessionState)).leakRef());
}
-void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
+void WKPageRestoreFromSessionState(WKPageRef pageRef, WKTypeRef sessionStateRef)
{
SessionState sessionState;
-if (!decodeLegacySessionState(*toImpl(sessionStateData), sessionState))
-return;
+// FIXME: This is for backwards compatibility with Safari. Remove it once Safari no longer depends
[webkit-changes] [170682] trunk/Source/WebCore
Title: [170682] trunk/Source/WebCore
Revision 170682
Author commit-qu...@webkit.org
Date 2014-07-01 17:43:42 -0700 (Tue, 01 Jul 2014)
Log Message
[WebGL] Fix PVRTC extension.
https://bugs.webkit.org/show_bug.cgi?id=134525
Patch by Alex Christensen on 2014-07-01
Reviewed by Dean Jackson.
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::validateCompressedTexDimensions):
Remove the return false which I mistakenly committed in r170128
and make the gl error match the S3TC error and the khronos test.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (170681 => 170682)
--- trunk/Source/WebCore/ChangeLog 2014-07-02 00:13:19 UTC (rev 170681)
+++ trunk/Source/WebCore/ChangeLog 2014-07-02 00:43:42 UTC (rev 170682)
@@ -1,3 +1,15 @@
+2014-07-01 Alex Christensen
+
+[WebGL] Fix PVRTC extension.
+https://bugs.webkit.org/show_bug.cgi?id=134525
+
+Reviewed by Dean Jackson.
+
+* html/canvas/WebGLRenderingContext.cpp:
+(WebCore::WebGLRenderingContext::validateCompressedTexDimensions):
+Remove the return false which I mistakenly committed in r170128
+and make the gl error match the S3TC error and the khronos test.
+
2014-07-01 Chris Fleizach
AX: iOS does not expose ARIA toggle buttons at all (not even as a regular button)
Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (170681 => 170682)
--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-07-02 00:13:19 UTC (rev 170681)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp 2014-07-02 00:43:42 UTC (rev 170682)
@@ -5450,10 +5450,9 @@
case Extensions3D::COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
case Extensions3D::COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
case Extensions3D::COMPRESSED_RGBA_PVRTC_2BPPV1_IMG:
-return false;
// Height and width must be powers of 2.
if ((width & (width - 1)) || (height & (height - 1))) {
-synthesizeGLError(GraphicsContext3D::INVALID_VALUE, functionName, "width or height invalid for level");
+synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "width or height invalid for level");
return false;
}
return true;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170681] trunk/Source/WebInspectorUI
Title: [170681] trunk/Source/WebInspectorUI
Revision 170681
Author jonowe...@apple.com
Date 2014-07-01 17:13:19 -0700 (Tue, 01 Jul 2014)
Log Message
Web Inspector: Hexadecimal color values in all CSS editors are purple when they should be blue
https://bugs.webkit.org/show_bug.cgi?id=133997
Reviewed by Joseph Pecoraro.
CodeMirror 4 removed the style for hex colors from the CSS tokenizer.
Feature has been added to CodeMirrorAdditions.js.
* UserInterface/Views/CodeMirrorAdditions.js: Added hex-color to style for a valid hexadecimal color.
* UserInterface/Views/SyntaxHighlightingDefaultTheme.css: Added selector for hexadecimal color.
Modified Paths
trunk/Source/WebInspectorUI/ChangeLog
trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js
trunk/Source/WebInspectorUI/UserInterface/Views/SyntaxHighlightingDefaultTheme.css
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (170680 => 170681)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-07-02 00:12:09 UTC (rev 170680)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-07-02 00:13:19 UTC (rev 170681)
@@ -1,3 +1,16 @@
+2014-07-01 Jonathan Wells
+
+Web Inspector: Hexadecimal color values in all CSS editors are purple when they should be blue
+https://bugs.webkit.org/show_bug.cgi?id=133997
+
+Reviewed by Joseph Pecoraro.
+
+CodeMirror 4 removed the style for hex colors from the CSS tokenizer.
+Feature has been added to CodeMirrorAdditions.js.
+
+* UserInterface/Views/CodeMirrorAdditions.js: Added hex-color to style for a valid hexadecimal color.
+* UserInterface/Views/SyntaxHighlightingDefaultTheme.css: Added selector for hexadecimal color.
+
2014-06-26 Jono Wells
Web Inspector: Command-/ (slash) now auto-comments code via CodeMirror 4. Should remove as command to pause
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js (170680 => 170681)
--- trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2014-07-02 00:12:09 UTC (rev 170680)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CodeMirrorAdditions.js 2014-07-02 00:13:19 UTC (rev 170681)
@@ -182,6 +182,8 @@
function extendedCSSToken(stream, state)
{
+const hexColorRegex = /#(?:[0-9a-fA-F]{6}|[0-9a-fA-F]{3})\b/g;
+
if (state._urlTokenize) {
// Call the link tokenizer instead.
var style = state._urlTokenize(stream, state);
@@ -193,29 +195,32 @@
var style = this._token(stream, state);
if (style) {
-if (style === "atom" && stream.current() === "url") {
-// If the current text is "url" then we should expect the next string token to be a link.
-state._expectLink = true;
-} else if (state._expectLink && style === "atom") {
-// We expected a string and got it. This is a link. Parse it the way we want it.
-delete state._expectLink;
+if (style === "atom") {
+if (stream.current() === "url") {
+// If the current text is "url" then we should expect the next string token to be a link.
+state._expectLink = true;
+} else if (state._expectLink) {
+// We expected a string and got it. This is a link. Parse it the way we want it.
+delete state._expectLink;
-// This is a link, so setup the state to process it next.
-state._urlTokenize = tokenizeCSSURLString;
-state._urlBaseStyle = style;
+// This is a link, so setup the state to process it next.
+state._urlTokenize = tokenizeCSSURLString;
+state._urlBaseStyle = style;
-// The url may or may not be quoted.
-var quote = stream.current()[0];
-state._urlQuoteCharacter = quote === "'" || quote === "\"" ? quote : ")";
-state._unquotedURLString = state._urlQuoteCharacter === ")";
+// The url may or may not be quoted.
+var quote = stream.current()[0];
+state._urlQuoteCharacter = quote === "'" || quote === "\"" ? quote : ")";
+state._unquotedURLString = state._urlQuoteCharacter === ")";
-// Rewind the steam to the start of this token.
-stream.pos = startPosition;
+// Rewind the steam to the start of this token.
+stream.pos = startPosition;
-// Eat the open quote of the string so the string style
-// will be used for the quote character.
-if (!state._unquotedURLString)
-stream.eat(state._urlQuoteCharacter);
+// Eat the open quote of the string so the string style
+// will be used for the quote character.
+
[webkit-changes] [170679] trunk/Source/WebKit2
Title: [170679] trunk/Source/WebKit2
Revision 170679
Author ander...@apple.com
Date 2014-07-01 17:08:13 -0700 (Tue, 01 Jul 2014)
Log Message
WKPageRestoreFromSessionState should use the new session state restore code path
https://bugs.webkit.org/show_bug.cgi?id=134526
Reviewed by Tim Horton.
* UIProcess/API/C/WKPage.cpp:
(WKPageRestoreFromSessionState):
Use the new code path.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::restoreFromState):
Only restore the back-forward state if we have a back-forward list.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistory):
Save the original URL string as well.
(WebKit::decodeV1SessionHistory):
If we don't have a current index, set it to Nullopt instead of 0.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170678 => 170679)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 23:57:07 UTC (rev 170678)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-02 00:08:13 UTC (rev 170679)
@@ -1,3 +1,25 @@
+2014-07-01 Anders Carlsson
+
+WKPageRestoreFromSessionState should use the new session state restore code path
+https://bugs.webkit.org/show_bug.cgi?id=134526
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/C/WKPage.cpp:
+(WKPageRestoreFromSessionState):
+Use the new code path.
+
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::restoreFromState):
+Only restore the back-forward state if we have a back-forward list.
+
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistory):
+Save the original URL string as well.
+
+(WebKit::decodeV1SessionHistory):
+If we don't have a current index, set it to Nullopt instead of 0.
+
2014-07-01 Gyuyoung Kim
Unreviewed. EFL and GTK build fix since r170654.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170678 => 170679)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 23:57:07 UTC (rev 170678)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-02 00:08:13 UTC (rev 170679)
@@ -369,7 +369,11 @@
void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
{
-toImpl(pageRef)->restoreFromSessionStateData(toImpl(sessionStateData));
+SessionState sessionState;
+if (!decodeLegacySessionState(*toImpl(sessionStateData), sessionState))
+return;
+
+toImpl(pageRef)->restoreFromState(std::move(sessionState));
}
double WKPageGetTextZoomFactor(WKPageRef pageRef)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170678 => 170679)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 23:57:07 UTC (rev 170678)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-02 00:08:13 UTC (rev 170679)
@@ -1865,18 +1865,27 @@
uint64_t WebPageProxy::restoreFromState(SessionState sessionState)
{
-m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
+bool hasBackForwardList = !!sessionState.backForwardListState.currentIndex;
-LegacySessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
-process().send(Messages::WebPage::RestoreSession(state), m_pageID);
+if (hasBackForwardList) {
+m_backForwardList->restoreFromState(std::move(sessionState.backForwardListState));
+for (const auto& entry : m_backForwardList->entries())
+process().registerNewWebBackForwardListItem(entry.get());
+LegacySessionState state(m_backForwardList->entries(), m_backForwardList->currentIndex());
+process().send(Messages::WebPage::RestoreSession(state), m_pageID);
+}
+
// FIXME: Navigating should be separate from state restoration.
if (!sessionState.provisionalURL.isNull())
return loadRequest(sessionState.provisionalURL);
-if (WebBackForwardListItem* item = m_backForwardList->currentItem())
-return goToBackForwardItem(item);
+if (hasBackForwardList) {
+// FIXME: Do we have to null check the back forward list item here?
+if (WebBackForwardListItem* item = m_backForwardList->currentItem())
+return goToBackForwardItem(item);
+}
return 0;
}
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170678 => 170679)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 23:57:07 UTC (rev 170678)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-02 00:08:13 UTC (rev 170679)
@@ -437,7 +437,7 @@
auto originalURL = item.pageState.mainFrameState.originalURLString.createCFString();
auto data = ""
-auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleK
[webkit-changes] [170678] trunk
Title: [170678] trunk
Revision 170678
Author cfleiz...@apple.com
Date 2014-07-01 16:57:07 -0700 (Tue, 01 Jul 2014)
Log Message
AX: iOS does not expose ARIA toggle buttons at all (not even as a regular button)
https://bugs.webkit.org/show_bug.cgi?id=133875
Reviewed by Enrica Casucci.
Source/WebCore:
Support the toggle button type in iOS.
Test: platform/ios-sim/accessibility/toggle-button.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
(-[WebAccessibilityObjectWrapper accessibilityTraits]):
(-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
LayoutTests:
* platform/ios-sim/accessibility/toggle-button-expected.txt: Added.
* platform/ios-sim/accessibility/toggle-button.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
Added Paths
trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button-expected.txt
trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button.html
Diff
Modified: trunk/LayoutTests/ChangeLog (170677 => 170678)
--- trunk/LayoutTests/ChangeLog 2014-07-01 23:40:32 UTC (rev 170677)
+++ trunk/LayoutTests/ChangeLog 2014-07-01 23:57:07 UTC (rev 170678)
@@ -1,3 +1,13 @@
+2014-07-01 Chris Fleizach
+
+AX: iOS does not expose ARIA toggle buttons at all (not even as a regular button)
+https://bugs.webkit.org/show_bug.cgi?id=133875
+
+Reviewed by Enrica Casucci.
+
+* platform/ios-sim/accessibility/toggle-button-expected.txt: Added.
+* platform/ios-sim/accessibility/toggle-button.html: Added.
+
2014-07-01 Dean Jackson
[iOS] Subsampled JPEG images do not draw correctly via the canvas APIs
Added: trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button-expected.txt (0 => 170678)
--- trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button-expected.txt 2014-07-01 23:57:07 UTC (rev 170678)
@@ -0,0 +1,14 @@
+Bold Italic
+This makes sure that toggle buttons are exposed properly on iOS
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Button1 : AXLabel: Bold
+Button1 : AXValue:
+Button2 : AXLabel: Italic
+Button2 : AXValue:
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button.html (0 => 170678)
--- trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button.html (rev 0)
+++ trunk/LayoutTests/platform/ios-sim/accessibility/toggle-button.html 2014-07-01 23:57:07 UTC (rev 170678)
@@ -0,0 +1,38 @@
+
+
+
+
+var successfullyParsed = false;
+
+
+
+
+Bold
+Italic
+
+
+
+
+
+
+description("This makes sure that toggle buttons are exposed properly on iOS");
+
+if (window.accessibilityController) {
+
+var button1 = accessibilityController.accessibleElementById("button1");
+debug("Button1 : " + button1.iphoneLabel);
+debug("Button1 : " + button1.iphoneValue);
+
+var button2 = accessibilityController.accessibleElementById("button2");
+debug("Button2 : " + button2.iphoneLabel);
+debug("Button2 : " + button2.iphoneValue);
+}
+
+successfullyParsed = true;
+
+
+
[webkit-changes] [170677] trunk/Source/JavaScriptCore
Title: [170677] trunk/Source/_javascript_Core
Revision 170677
Author mark@apple.com
Date 2014-07-01 16:40:32 -0700 (Tue, 01 Jul 2014)
Log Message
Debugger's breakpoint list should not be a Vector.
Reviewed by Geoffrey Garen.
The debugger currently stores breakpoint data as entries in a Vector (see
BreakpointsInLine). It also keeps a fast map look up of breakpoint IDs to
the breakpoint data (see m_breakpointIDToBreakpoint). Because a Vector can
compact or reallocate its backing store, this can causes all sorts of havoc.
The m_breakpointIDToBreakpoint map assumes that the breakpoint data doesn't
move in memory.
The fix is to replace the BreakpointsInLine Vector with a BreakpointsList
doubly linked list.
* debugger/Breakpoint.h:
(JSC::Breakpoint::Breakpoint):
(JSC::BreakpointsList::~BreakpointsList):
* debugger/Debugger.cpp:
(JSC::Debugger::setBreakpoint):
(JSC::Debugger::removeBreakpoint):
(JSC::Debugger::hasBreakpoint):
* debugger/Debugger.h:
Modified Paths
trunk/Source/_javascript_Core/ChangeLog
trunk/Source/_javascript_Core/debugger/Breakpoint.h
trunk/Source/_javascript_Core/debugger/Debugger.cpp
trunk/Source/_javascript_Core/debugger/Debugger.h
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (170676 => 170677)
--- trunk/Source/_javascript_Core/ChangeLog 2014-07-01 23:40:06 UTC (rev 170676)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-07-01 23:40:32 UTC (rev 170677)
@@ -1,3 +1,29 @@
+2014-07-01 Mark Lam
+
+Debugger's breakpoint list should not be a Vector.
+
+
+Reviewed by Geoffrey Garen.
+
+The debugger currently stores breakpoint data as entries in a Vector (see
+BreakpointsInLine). It also keeps a fast map look up of breakpoint IDs to
+the breakpoint data (see m_breakpointIDToBreakpoint). Because a Vector can
+compact or reallocate its backing store, this can causes all sorts of havoc.
+The m_breakpointIDToBreakpoint map assumes that the breakpoint data doesn't
+move in memory.
+
+The fix is to replace the BreakpointsInLine Vector with a BreakpointsList
+doubly linked list.
+
+* debugger/Breakpoint.h:
+(JSC::Breakpoint::Breakpoint):
+(JSC::BreakpointsList::~BreakpointsList):
+* debugger/Debugger.cpp:
+(JSC::Debugger::setBreakpoint):
+(JSC::Debugger::removeBreakpoint):
+(JSC::Debugger::hasBreakpoint):
+* debugger/Debugger.h:
+
2014-06-30 Michael Saboff
Add option to run-jsc-stress-testes to filter out tests that use large heaps
Modified: trunk/Source/_javascript_Core/debugger/Breakpoint.h (170676 => 170677)
--- trunk/Source/_javascript_Core/debugger/Breakpoint.h 2014-07-01 23:40:06 UTC (rev 170676)
+++ trunk/Source/_javascript_Core/debugger/Breakpoint.h 2014-07-01 23:40:32 UTC (rev 170677)
@@ -27,11 +27,13 @@
#define Breakpoint_h
#include "DebuggerPrimitives.h"
+#include
+#include
#include
namespace JSC {
-struct Breakpoint {
+struct Breakpoint : public DoublyLinkedListNode {
Breakpoint()
: id(noBreakpointID)
, sourceID(noSourceID)
@@ -51,6 +53,16 @@
{
}
+Breakpoint(const Breakpoint& other)
+: id(other.id)
+, sourceID(other.sourceID)
+, line(other.line)
+, column(other.column)
+, condition(other.condition)
+, autoContinue(other.autoContinue)
+{
+}
+
BreakpointID id;
SourceID sourceID;
unsigned line;
@@ -59,8 +71,26 @@
bool autoContinue;
static const unsigned unspecifiedColumn = UINT_MAX;
+
+private:
+Breakpoint* m_prev;
+Breakpoint* m_next;
+
+friend class WTF::DoublyLinkedListNode;
};
+class BreakpointsList : public DoublyLinkedList,
+public RefCounted {
+public:
+~BreakpointsList()
+{
+Breakpoint* breakpoint;
+while ((breakpoint = removeHead()))
+delete breakpoint;
+ASSERT(isEmpty());
+}
+};
+
} // namespace JSC
#endif // Breakpoint_h
Modified: trunk/Source/_javascript_Core/debugger/Debugger.cpp (170676 => 170677)
--- trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-07-01 23:40:06 UTC (rev 170676)
+++ trunk/Source/_javascript_Core/debugger/Debugger.cpp 2014-07-01 23:40:32 UTC (rev 170677)
@@ -357,18 +357,18 @@
it = m_sourceIDToBreakpoints.set(sourceID, LineToBreakpointsMap()).iterator;
LineToBreakpointsMap::iterator breaksIt = it->value.find(line);
if (breaksIt == it->value.end())
-breaksIt = it->value.set(line, BreakpointsInLine()).iterator;
+breaksIt = it->value.set(line, adoptRef(new BreakpointsList)).iterator;
-BreakpointsInLine& breakpoints = breaksIt->value;
-unsigned breakpointsCount = breakpoints.size();
-for (unsigned i = 0; i < breakpointsCount; i++)
-if (breakpoints[i].column == column) {
+BreakpointsList& breakpoints = *breaksIt->value;
+for (Breakpoint* current = breakpoints.head(); current; current =
[webkit-changes] [170675] trunk
Title: [170675] trunk Revision 170675 Author d...@apple.com Date 2014-07-01 16:26:12 -0700 (Tue, 01 Jul 2014) Log Message [iOS] Subsampled JPEG images do not draw correctly via the canvas APIs https://bugs.webkit.org/show_bug.cgi?id=134513 Reviewed by Tim Horton. Source/WebCore: Subsampled images (e.g. JPEG) were not consistently using their original dimensions and subsampled dimensions. This caused things like texImage2D to pack the pixels incorrectly, or drawImage to squish the rendering. Renamed m_scale to m_subsamplingScale on FrameData. Tests: fast/canvas/image-potential-subsample.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html * platform/graphics/BitmapImage.cpp: (WebCore::BitmapImage::cacheFrame): Rename to m_subsamplingScale. (WebCore::BitmapImage::frameAtIndex): Ditto. * platform/graphics/BitmapImage.h: (WebCore::FrameData::FrameData): Ditto. * platform/graphics/cg/BitmapImageCG.cpp: (WebCore::FrameData::clear): Ditto. (WebCore::BitmapImage::BitmapImage): Ditto. (WebCore::BitmapImage::draw): Use a scaledSrcRect that reflects the subsampled size, rather than assuming the srcRect accurately reflects how many pixels we have in the Bitmap. (WebCore::BitmapImage::copyUnscaledFrameAtIndex): * platform/graphics/cg/GraphicsContext3DCG.cpp: (WebCore::GraphicsContext3D::ImageExtractor::extractImage): Similar fix, although this time we just ask the image decoder to take into account the subsampled size when it is "generating" a frame, causing it to use the bitmap data it has already decoded. LayoutTests: Add Canvas2D and WebGL tests that exercise a very large JPEG image. The WebGL test is mostly copied from the WebGL test suite, so please excuse the coding style. * fast/canvas/image-potential-subsample-expected.txt: Added. * fast/canvas/image-potential-subsample.html: Added. * fast/canvas/resources/image-8000x8000.jpg: Added. * fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-potentially-subsampled-image.js: Added. (.init): (.runOneIteration): (.runTestOnImage): (.runTest): (generateTest): * fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image-expected.txt: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html: Added. Modified Paths trunk/LayoutTests/ChangeLog trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/platform/graphics/BitmapImage.cpp trunk/Source/WebCore/platform/graphics/BitmapImage.h trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp trunk/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp Added Paths trunk/LayoutTests/fast/canvas/image-potential-subsample-expected.txt trunk/LayoutTests/fast/canvas/image-potential-subsample.html trunk/LayoutTests/fast/canvas/resources/image-8000x8000.jpg trunk/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-potentially-subsampled-image.js trunk/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image-expected.txt trunk/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html Diff Modified: trunk/LayoutTests/ChangeLog (170674 => 170675) --- trunk/LayoutTests/ChangeLog 2014-07-01 23:22:03 UTC (rev 170674) +++ trunk/LayoutTests/ChangeLog 2014-07-01 23:26:12 UTC (rev 170675) @@ -1,3 +1,29 @@ +2014-07-01 Dean Jackson + +[iOS] Subsampled JPEG images do not draw correctly via the canvas APIs +https://bugs.webkit.org/show_bug.cgi?id=134513 + + + +Reviewed by Tim Horton. + +Add Canvas2D and WebGL tests that exercise a very large JPEG image. + +The WebGL test is mostly copied from the WebGL test suite, so please +excuse the coding style. + +* fast/canvas/image-potential-subsample-expected.txt: Added. +* fast/canvas/image-potential-subsample.html: Added. +* fast/canvas/resources/image-8000x8000.jpg: Added. +* fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-potentially-subsampled-image.js: Added. +(.init): +(.runOneIteration): +(.runTestOnImage): +(.runTest): +(generateTest): +* fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image-expected.txt: Added. +* fast/canvas/webgl/tex-image-and-sub-image-2d-with-potentially-subsampled-image.html: Added. + 2014-07-01 Chris Fleizach AX: HTML indeterminate IDL attribute not mapped to checkbox value=2 Added: trunk/LayoutTests/fast/canvas/image-potential-subsample-expected.txt (0 => 170675) --- trunk/LayoutTests/fast/canvas/image-potential-subsample-expected.txt (rev 0) +++ trunk/LayoutTests/fast/canvas/image-potential-subsample-expected.txt 2014-07-01 23:26:12 UTC (rev 170675) @@ -0,0 +1,5 @@ +PASS: Pixel (10, 10) was close to 255,0,0,255 + +PASS: Pixel (200, 200) was close to 0,255,0,255 + +PASS: Pixel (390, 390) was close to 0,0,255,255 Pr
[webkit-changes] [170674] trunk/Source/WebKit2
Title: [170674] trunk/Source/WebKit2
Revision 170674
Author m...@apple.com
Date 2014-07-01 16:22:03 -0700 (Tue, 01 Jul 2014)
Log Message
Crash in WebDocumentLoader::setNavigationID
https://bugs.webkit.org/show_bug.cgi?id=134520
Reviewed by Anders Carlsson.
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::didReceivePolicyDecision): Null-check the policy document loader.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170673 => 170674)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 23:01:51 UTC (rev 170673)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 23:22:03 UTC (rev 170674)
@@ -1,5 +1,15 @@
2014-07-01 Dan Bernstein
+Crash in WebDocumentLoader::setNavigationID
+https://bugs.webkit.org/show_bug.cgi?id=134520
+
+Reviewed by Anders Carlsson.
+
+* WebProcess/WebPage/WebFrame.cpp:
+(WebKit::WebFrame::didReceivePolicyDecision): Null-check the policy document loader.
+
+2014-07-01 Dan Bernstein
+
Build fix.
* UIProcess/API/APILoaderClient.h:
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (170673 => 170674)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-07-01 23:01:51 UTC (rev 170673)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2014-07-01 23:22:03 UTC (rev 170674)
@@ -235,8 +235,8 @@
m_policyDownloadID = downloadID;
if (navigationID) {
-WebDocumentLoader& documentLoader = static_cast(*m_coreFrame->loader().policyDocumentLoader());
-documentLoader.setNavigationID(navigationID);
+if (WebDocumentLoader* documentLoader = static_cast(m_coreFrame->loader().policyDocumentLoader()))
+documentLoader->setNavigationID(navigationID);
}
function(action);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170673] trunk/Source/WebKit2
Title: [170673] trunk/Source/WebKit2
Revision 170673
Author m...@apple.com
Date 2014-07-01 16:01:51 -0700 (Tue, 01 Jul 2014)
Log Message
Build fix.
* UIProcess/API/APILoaderClient.h:
(API::LoaderClient::didDestroyNavigation):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170672 => 170673)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 22:40:05 UTC (rev 170672)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 23:01:51 UTC (rev 170673)
@@ -1,3 +1,10 @@
+2014-07-01 Dan Bernstein
+
+Build fix.
+
+* UIProcess/API/APILoaderClient.h:
+(API::LoaderClient::didDestroyNavigation):
+
2014-07-01 Anders Carlsson
Use the new legacy session state coding in WKPageCopySessionState
Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (170672 => 170673)
--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-07-01 22:40:05 UTC (rev 170672)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-07-01 23:01:51 UTC (rev 170673)
@@ -65,7 +65,7 @@
virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) { }
virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) { }
virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
-virtual void didDestroyNavigation(WebKit::WebPageProxy*, uint64_t navigationID) { }
+virtual void didDestroyNavigation(WebKit::WebPageProxy*, uint64_t) { }
// FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.
virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170671] trunk/Source/WebKit2
Title: [170671] trunk/Source/WebKit2
Revision 170671
Author ander...@apple.com
Date 2014-07-01 15:34:10 -0700 (Tue, 01 Jul 2014)
Log Message
Use the new legacy session state coding in WKPageCopySessionState
https://bugs.webkit.org/show_bug.cgi?id=134516
Reviewed by Tim Horton.
* UIProcess/API/C/WKPage.cpp:
(WKPageCopySessionState):
Call encodeLegacySessionState.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistoryEntryData):
Use leakPtr() so we won't attempt to double-free the buffer.
(WebKit::createDictionary):
Fix a typo.
(WebKit::encodeLegacySessionState):
Don't encode the provisional URL if it's empty.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170670 => 170671)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 22:25:25 UTC (rev 170670)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 22:34:10 UTC (rev 170671)
@@ -1,3 +1,24 @@
+2014-07-01 Anders Carlsson
+
+Use the new legacy session state coding in WKPageCopySessionState
+https://bugs.webkit.org/show_bug.cgi?id=134516
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/C/WKPage.cpp:
+(WKPageCopySessionState):
+Call encodeLegacySessionState.
+
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistoryEntryData):
+Use leakPtr() so we won't attempt to double-free the buffer.
+
+(WebKit::createDictionary):
+Fix a typo.
+
+(WebKit::encodeLegacySessionState):
+Don't encode the provisional URL if it's empty.
+
2014-07-01 Chris Fleizach
AX: [iOS WebKit2] Support for Speak selection
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170670 => 170671)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 22:25:25 UTC (rev 170670)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 22:34:10 UTC (rev 170671)
@@ -34,6 +34,7 @@
#include "APIPolicyClient.h"
#include "APIUIClient.h"
#include "ImmutableDictionary.h"
+#include "LegacySessionStateCoding.h"
#include "NativeWebKeyboardEvent.h"
#include "NativeWebWheelEvent.h"
#include "NavigationActionData.h"
@@ -351,7 +352,7 @@
WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
{
-return toAPI(toImpl(pageRef)->sessionStateData([pageRef, context, filter](WebBackForwardListItem& item) {
+auto sessionState = toImpl(pageRef)->sessionState([pageRef, context, filter](WebBackForwardListItem& item) {
if (filter) {
if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
return false;
@@ -361,7 +362,9 @@
}
return true;
-}).leakRef());
+});
+
+return toAPI(encodeLegacySessionState(sessionState).release().leakRef());
}
void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170670 => 170671)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 22:25:25 UTC (rev 170670)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 22:34:10 UTC (rev 170671)
@@ -401,7 +401,7 @@
size_t bufferSize;
auto buffer = encodeSessionHistoryEntryData(frameState, bufferSize);
-return adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, buffer.get(), bufferSize, fastMallocDeallocator));
+return adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, buffer.leakPtr(), bufferSize, fastMallocDeallocator));
}
static RetainPtr createDictionary(std::initializer_list> keyValuePairs)
@@ -414,7 +414,7 @@
for (const auto& keyValuePair : keyValuePairs) {
keys.uncheckedAppend(keyValuePair.first);
-keys.uncheckedAppend(keyValuePair.second);
+values.uncheckedAppend(keyValuePair.second);
}
return adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys.data(), values.data(), keyValuePairs.size(), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
@@ -451,7 +451,7 @@
RefPtr encodeLegacySessionState(const SessionState& sessionState)
{
auto sessionHistoryDictionary = encodeSessionHistory(sessionState.backForwardListState);
-auto provisionalURLString = sessionState.provisionalURL.string().createCFString();
+auto provisionalURLString = sessionState.provisionalURL.isNull() ? nullptr : sessionState.provisionalURL.string().createCFString();
RetainPtr stateDictionary;
if (provisionalURLString)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170670] trunk/Source/WebKit2
Title: [170670] trunk/Source/WebKit2
Revision 170670
Author cfleiz...@apple.com
Date 2014-07-01 15:25:25 -0700 (Tue, 01 Jul 2014)
Log Message
AX: [iOS WebKit2] Support for Speak selection
https://bugs.webkit.org/show_bug.cgi?id=134512
Reviewed by Darin Adler.
Implement a method that Speak Selection can use to retrieve the selected content.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView accessibilityRetrieveSpeakSelectionContent]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170669 => 170670)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 22:19:55 UTC (rev 170669)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 22:25:25 UTC (rev 170670)
@@ -1,3 +1,15 @@
+2014-07-01 Chris Fleizach
+
+AX: [iOS WebKit2] Support for Speak selection
+https://bugs.webkit.org/show_bug.cgi?id=134512
+
+Reviewed by Darin Adler.
+
+Implement a method that Speak Selection can use to retrieve the selected content.
+
+* UIProcess/ios/WKContentViewInteraction.mm:
+(-[WKContentView accessibilityRetrieveSpeakSelectionContent]):
+
2014-07-01 Anders Carlsson
Update the highest back-forward list item ID in the other WebBackForwardListItem constructor
Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (170669 => 170670)
--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-01 22:19:55 UTC (rev 170669)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-01 22:25:25 UTC (rev 170670)
@@ -191,6 +191,10 @@
@end
+@interface WKContentView (WKInteractionPrivate)
+- (void)accessibilitySpeakSelectionSetContent:(NSString *)string;
+@end
+
@implementation WKContentView (WKInteraction)
static UIWebSelectionMode toUIWebSelectionMode(WKSelectionGranularity granularity)
@@ -1357,6 +1361,16 @@
});
}
+- (void)accessibilityRetrieveSpeakSelectionContent
+{
+_page->getSelectionOrContentsAsString([self](const String& string, CallbackBase::Error error) {
+if (error != CallbackBase::Error::None)
+return;
+if ([self respondsToSelector:@selector(accessibilitySpeakSelectionSetContent:)])
+[self accessibilitySpeakSelectionSetContent:string];
+});
+}
+
// UIWKInteractionViewProtocol
static inline GestureType toGestureType(UIWKGestureType gestureType)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170669] trunk/Source/WebKit2
Title: [170669] trunk/Source/WebKit2
Revision 170669
Author ander...@apple.com
Date 2014-07-01 15:19:55 -0700 (Tue, 01 Jul 2014)
Log Message
Update the highest back-forward list item ID in the other WebBackForwardListItem constructor
https://bugs.webkit.org/show_bug.cgi?id=134515
Reviewed by Tim Horton.
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::WebBackForwardListItem):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170668 => 170669)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 21:21:09 UTC (rev 170668)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 22:19:55 UTC (rev 170669)
@@ -1,3 +1,13 @@
+2014-07-01 Anders Carlsson
+
+Update the highest back-forward list item ID in the other WebBackForwardListItem constructor
+https://bugs.webkit.org/show_bug.cgi?id=134515
+
+Reviewed by Tim Horton.
+
+* Shared/WebBackForwardListItem.cpp:
+(WebKit::WebBackForwardListItem::WebBackForwardListItem):
+
2014-07-01 Brady Eidson
Fix ServicesOverlayController teardown
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp (170668 => 170669)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-01 21:21:09 UTC (rev 170668)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp 2014-07-01 22:19:55 UTC (rev 170669)
@@ -44,6 +44,8 @@
: m_itemID(itemID)
, m_itemState(std::move(backForwardListItemState))
{
+if (m_itemID > highestUsedItemID)
+highestUsedItemID = m_itemID;
}
WebBackForwardListItem::WebBackForwardListItem(const String& originalURL, const String& url, const String& title, const uint8_t* backForwardData, size_t backForwardDataSize, uint64_t itemID)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170668] trunk/Source/WebKit2
Title: [170668] trunk/Source/WebKit2
Revision 170668
Author beid...@apple.com
Date 2014-07-01 14:21:09 -0700 (Tue, 01 Jul 2014)
Log Message
Fix ServicesOverlayController teardown
and https://bugs.webkit.org/show_bug.cgi?id=134510
Reviewed by Mark Rowe.
* WebProcess/WebPage/mac/ServicesOverlayController.mm:
(WebKit::ServicesOverlayController::~ServicesOverlayController): Flipped logic on null-checking the overlay.
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170667 => 170668)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 21:16:14 UTC (rev 170667)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 21:21:09 UTC (rev 170668)
@@ -1,3 +1,13 @@
+2014-07-01 Brady Eidson
+
+Fix ServicesOverlayController teardown
+ and https://bugs.webkit.org/show_bug.cgi?id=134510
+
+Reviewed by Mark Rowe.
+
+* WebProcess/WebPage/mac/ServicesOverlayController.mm:
+(WebKit::ServicesOverlayController::~ServicesOverlayController): Flipped logic on null-checking the overlay.
+
2014-07-01 Sam Weinig
[Cocoa][Mac] WKWebView should automatically set topContentInset when beneath a toolbar
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (170667 => 170668)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-01 21:16:14 UTC (rev 170667)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-01 21:21:09 UTC (rev 170668)
@@ -83,7 +83,7 @@
ServicesOverlayController::~ServicesOverlayController()
{
-if (!m_servicesOverlay) {
+if (m_servicesOverlay) {
ASSERT(m_webPage);
m_webPage->uninstallPageOverlay(m_servicesOverlay, PageOverlay::FadeMode::DoNotFade);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170667] trunk
Title: [170667] trunk Revision 170667 Author wei...@apple.com Date 2014-07-01 14:16:14 -0700 (Tue, 01 Jul 2014) Log Message [Cocoa][Mac] WKWebView should automatically set topContentInset when beneath a toolbar https://bugs.webkit.org/show_bug.cgi?id=134496 Reviewed by Beth Dakin. Source/WebKit2: - Adds _automaticallyAdjustsContentInsets SPI to both WKView and WKWebView. - Defaults _automaticallyAdjustsContentInsets to NO for WKView to keep legacy clients working. - Defaults _automaticallyAdjustsContentInsets to YES for WKWebView. * UIProcess/API/Cocoa/WKViewPrivate.h: Add _automaticallyAdjustsContentInsets SPI. * UIProcess/API/Cocoa/WKWebView.mm: (-[WKWebView initWithFrame:configuration:]): Default _automaticallyAdjustsContentInsets to YES for WKWebView. (-[WKWebView _setTopContentInset:]): (-[WKWebView _topContentInset]): Change to forward to the WKView, since we now do coalescing and caching there. (-[WKWebView _setAutomaticallyAdjustsContentInsets:]): (-[WKWebView _automaticallyAdjustsContentInsets]): Forward to the WKView. * UIProcess/API/Cocoa/WKWebViewPrivate.h: Add _automaticallyAdjustsContentInsets SPI. * UIProcess/API/mac/WKView.mm: (-[WKView renewGState]): Ensure the contentInset is updated when the view changes, as its relative location to the toolbar may have changed. (-[WKView addWindowObserversForWindow:]): (-[WKView removeWindowObservers]): (-[WKView observeValueForKeyPath:ofObject:change:context:]): Add observers for the contentLayoutRect and titlebarAppearsTransparent properties on the window. If either of them change, we need to recalculate the content inset. (-[WKView _updateContentInsetsIfAutomatic]): If _automaticallyAdjustsContentInsets is YES, follow the same rules as AppKit in setting the top content inset. Like AppKit this is only done when: - The window's style mask has the NSFullSizeContentViewWindowMask bit. - The window does not have titlebarAppearsTransparent set. - And we are not in an enclosing NSScrollView. (-[WKView _setTopContentInset:]): (-[WKView _topContentInset]): Coalesce setting the topContentInset to avoid a visual lag when resizing the window that was caused by us sending multiple topContentInsets to the WebContentProcess per runloop cycle. The reason for the lag was that at the time we observe the contentLayoutRect changing, our view may not yet be in its final position yet, so the inset will be temporarily wrong. When the view is finally positioned correctly, we will get a renewGState, at which point we will again calculate the inset, which now will be correct. Since these both happen in the same runloop iteration, we can just defer sending the inset to the WebContentProcess. (-[WKView _setAutomaticallyAdjustsContentInsets:]): (-[WKView _automaticallyAdjustsContentInsets]): Add the new SPI. Tools: * MiniBrowser/mac/BrowserWindowController.m: (-[BrowserWindowController windowDidLoad]): Use the NSFullSizeContentViewWindowMask bit on Yosemite and later to enable toolbar blurring. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/UIProcess/API/Cocoa/WKViewPrivate.h trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm trunk/Tools/ChangeLog trunk/Tools/MiniBrowser/mac/BrowserWindowController.m Diff Modified: trunk/Source/WebKit2/ChangeLog (170666 => 170667) --- trunk/Source/WebKit2/ChangeLog 2014-07-01 21:13:42 UTC (rev 170666) +++ trunk/Source/WebKit2/ChangeLog 2014-07-01 21:16:14 UTC (rev 170667) @@ -1,3 +1,63 @@ +2014-07-01 Sam Weinig + +[Cocoa][Mac] WKWebView should automatically set topContentInset when beneath a toolbar + +https://bugs.webkit.org/show_bug.cgi?id=134496 + +Reviewed by Beth Dakin. + +- Adds _automaticallyAdjustsContentInsets SPI to both WKView and WKWebView. +- Defaults _automaticallyAdjustsContentInsets to NO for WKView to keep legacy clients working. +- Defaults _automaticallyAdjustsContentInsets to YES for WKWebView. + +* UIProcess/API/Cocoa/WKViewPrivate.h: +Add _automaticallyAdjustsContentInsets SPI. + +* UIProcess/API/Cocoa/WKWebView.mm: +(-[WKWebView initWithFrame:configuration:]): +Default _automaticallyAdjustsContentInsets to YES for WKWebView. + +(-[WKWebView _setTopContentInset:]): +(-[WKWebView _topContentInset]): +Change to forward to the WKView, since we now do coalescing and caching there. + +(-[WKWebView _setAutomaticallyAdjustsContentInsets:]): +(-[WKWebView _automaticallyAdjustsContentInsets]): +Forward to the WKView. + +* UIProcess/API/Cocoa/WKWebViewPrivate.h: +Add _automaticallyAdjustsContentInsets SPI. + +* UIProcess/API/mac/WKView.mm: +(-[WKView renewGState]): +Ensure the contentInset is updated when the view changes, as its relative location to the toolbar may have cha
[webkit-changes] [170666] trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej
Title: [170666] trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej Revision 170666 Author ander...@apple.com Date 2014-07-01 14:13:42 -0700 (Tue, 01 Jul 2014) Log Message Oops, didn't mean to commit this. Removed Paths trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej Diff Deleted: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej (170665 => 170666) --- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej 2014-07-01 21:12:08 UTC (rev 170665) +++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej 2014-07-01 21:13:42 UTC (rev 170666) @@ -1,44 +0,0 @@ -*** -*** 515,536 - - #if ENABLE(INSPECTOR_SERVER) -- if (pageGroup().preferences()->developerExtrasEnabled()) - inspector()->enableRemoteInspection(); - #endif - -- if (pageGroup().addProcess(process())) -- process().addWebPageGroup(pageGroup()); -- - initializeCreationParameters(); -- process().send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0); - - #if ENABLE(PAGE_VISIBILITY_API) -- process().send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID); - #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING) -- process().send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID); - #endif - - #if PLATFORM(MAC) -- process().send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID); - #endif - } 515,533 - - #if ENABLE(INSPECTOR_SERVER) -+ if (m_pageGroup->preferences()->developerExtrasEnabled()) - inspector()->enableRemoteInspection(); - #endif - - initializeCreationParameters(); -+ m_process->send(Messages::WebProcess::CreateWebPage(m_pageID, m_creationParameters), 0); - - #if ENABLE(PAGE_VISIBILITY_API) -+ m_process->send(Messages::WebPage::SetVisibilityState(m_visibilityState, /* isInitialState */ true), m_pageID); - #elif ENABLE(HIDDEN_PAGE_DOM_TIMER_THROTTLING) -+ m_process->send(Messages::WebPage::SetVisibilityState(isViewVisible() ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID); - #endif - - #if PLATFORM(MAC) -+ m_process->send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID); - #endif - } ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170665] trunk/Source/WebCore
Title: [170665] trunk/Source/WebCore
Revision 170665
Author commit-qu...@webkit.org
Date 2014-07-01 14:12:08 -0700 (Tue, 01 Jul 2014)
Log Message
Web Inspector: Selected DOM element highlights invisible near bottom of the viewport (topContentInset?)
https://bugs.webkit.org/show_bug.cgi?id=133818
Patch by Joseph Pecoraro on 2014-07-01
Reviewed by Beth Dakin.
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::update):
Take the topContentInset into account when sizing the InspectorOverlay's FrameView.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/inspector/InspectorOverlay.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (170664 => 170665)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 21:07:40 UTC (rev 170664)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 21:12:08 UTC (rev 170665)
@@ -1,3 +1,14 @@
+2014-07-01 Joseph Pecoraro
+
+Web Inspector: Selected DOM element highlights invisible near bottom of the viewport (topContentInset?)
+https://bugs.webkit.org/show_bug.cgi?id=133818
+
+Reviewed by Beth Dakin.
+
+* inspector/InspectorOverlay.cpp:
+(WebCore::InspectorOverlay::update):
+Take the topContentInset into account when sizing the InspectorOverlay's FrameView.
+
2014-07-01 Chris Fleizach
AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (170664 => 170665)
--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-07-01 21:07:40 UTC (rev 170664)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-07-01 21:12:08 UTC (rev 170665)
@@ -63,9 +63,7 @@
namespace WebCore {
-namespace {
-
-Path quadToPath(const FloatQuad& quad)
+static Path quadToPath(const FloatQuad& quad)
{
Path quadPath;
quadPath.moveTo(quad.p1());
@@ -76,7 +74,7 @@
return quadPath;
}
-void drawOutlinedQuad(GraphicsContext* context, const FloatQuad& quad, const Color& fillColor, const Color& outlineColor)
+static void drawOutlinedQuad(GraphicsContext* context, const FloatQuad& quad, const Color& fillColor, const Color& outlineColor)
{
static const int outlineThickness = 2;
@@ -237,8 +235,6 @@
highlight->quads.append(quad);
}
-} // anonymous namespace
-
InspectorOverlay::InspectorOverlay(Page& page, InspectorClient* client)
: m_page(page)
, m_client(client)
@@ -348,8 +344,8 @@
return;
FrameView* overlayView = overlayPage()->mainFrame().view();
-IntSize viewportSize = view->visibleContentRect().size();
-IntSize frameViewFullSize = view->visibleContentRectIncludingScrollbars().size();
+IntSize viewportSize = view->unscaledTotalVisibleContentSize();
+IntSize frameViewFullSize = view->unscaledTotalVisibleContentSize(ScrollableArea::IncludeScrollbars);
overlayPage()->setPageScaleFactor(m_page.pageScaleFactor(), IntPoint());
frameViewFullSize.scale(m_page.pageScaleFactor());
overlayView->resize(frameViewFullSize);
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170664] trunk/Source/WebKit2
Title: [170664] trunk/Source/WebKit2
Revision 170664
Author ander...@apple.com
Date 2014-07-01 14:07:40 -0700 (Tue, 01 Jul 2014)
Log Message
Add a function for restoring page state given a SessionState object
https://bugs.webkit.org/show_bug.cgi?id=134509
Reviewed by Tim Horton.
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::itemState):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::saveState):
* UIProcess/WebBackForwardList.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::saveState):
* UIProcess/WebPageProxy.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/WebBackForwardListItem.h
trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp
trunk/Source/WebKit2/UIProcess/WebBackForwardList.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
Added Paths
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp.rej
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170663 => 170664)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 21:07:40 UTC (rev 170664)
@@ -1,3 +1,19 @@
+2014-07-01 Anders Carlsson
+
+Add a function for restoring page state given a SessionState object
+https://bugs.webkit.org/show_bug.cgi?id=134509
+
+Reviewed by Tim Horton.
+
+* Shared/WebBackForwardListItem.h:
+(WebKit::WebBackForwardListItem::itemState):
+* UIProcess/WebBackForwardList.cpp:
+(WebKit::WebBackForwardList::saveState):
+* UIProcess/WebBackForwardList.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::saveState):
+* UIProcess/WebPageProxy.h:
+
2014-07-01 Dan Bernstein
[Cocoa] Navigation parameter in navigation delegate messages is nil for navigations started by the Web Content process
Modified: trunk/Source/WebKit2/Shared/WebBackForwardListItem.h (170663 => 170664)
--- trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/Shared/WebBackForwardListItem.h 2014-07-01 21:07:40 UTC (rev 170664)
@@ -54,6 +54,7 @@
virtual ~WebBackForwardListItem();
uint64_t itemID() const { return m_itemID; }
+const BackForwardListItemState& itemState() { return m_itemState; }
void setPageState(PageState pageState) { m_itemState.pageState = std::move(pageState); }
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp (170663 => 170664)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp 2014-07-01 21:07:40 UTC (rev 170664)
@@ -380,6 +380,30 @@
m_page->didChangeBackForwardList(nullptr, std::move(removedItems));
}
+BackForwardListState WebBackForwardList::backForwardListState(const std::function& filter) const
+{
+ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
+
+BackForwardListState backForwardListState;
+if (m_hasCurrentIndex)
+backForwardListState.currentIndex = m_currentIndex;
+
+for (size_t i = 0; i < m_entries.size(); ++i) {
+auto& entry = *m_entries[i];
+
+if (filter && !filter(entry)) {
+if (backForwardListState.currentIndex && i <= backForwardListState.currentIndex.value())
+--backForwardListState.currentIndex.value();
+
+continue;
+}
+
+backForwardListState.items.append(entry.itemState());
+}
+
+return backForwardListState;
+}
+
void WebBackForwardList::restoreFromState(BackForwardListState backForwardListState)
{
Vector> items;
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170663 => 170664)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 21:07:40 UTC (rev 170664)
@@ -79,6 +79,7 @@
bool restoreFromV1CFDictionaryRepresentation(CFDictionaryRef);
#endif
+BackForwardListState backForwardListState(const std::function&) const;
void restoreFromState(BackForwardListState);
private:
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170663 => 170664)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 20:45:47 UTC (rev 170663)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 21:07:40 UTC (rev 170664)
@@ -1847,6 +1847,22 @@
}
#endif
+SessionState WebPageProxy::sessionState(const std::function& filter) const
+{
+SessionState sessionState;
+
+sessionState.backForwardListState = m_backForwardList->backForwardListState(filter);
+
+String provisionalURLString = m_pageLoadState.pendingAPIRequestURL();
+if (provisionalURLString.isEmpty())
+provisionalURLString = m_pageLoadState.provisionalURL();
+
+if (!provisionalURLString.isEmpty())
+sessionState.provisionalURL = URL(URL(), provisionalURLString);
+
+
[webkit-changes] [170663] trunk
Title: [170663] trunk
Revision 170663
Author zandober...@gmail.com
Date 2014-07-01 13:45:47 -0700 (Tue, 01 Jul 2014)
Log Message
[CMake] Add necessary support for building for the Wayland target
https://bugs.webkit.org/show_bug.cgi?id=134160
Reviewed by Darin Adler.
.:
* Source/cmake/FindGTK3.cmake: Check for the gtk+-x11-3.0 package if the X11 target
is enabled, and that its version matches the version of the generic package. Same
for the gtk+-wayland-3.0 package and the Wayland target.
* Source/cmake/OptionsCommon.cmake: Don't add the -DXP_UNIX definition here.
* Source/cmake/OptionsEfl.cmake: Add -DXP_UNIX here for the EFL port, under the same
condition as in OptionsCommon.cmake. ENABLE_X11_TARGET is enabled by default for EFL
so they keep building the TestNetscapePlugin target.
* Source/cmake/OptionsGTK.cmake: Enable the X11 target and disable the Wayland target
by default. Group all the X11-specific macro definitions (WTF_PLATFORM_X11, MOZ_X11,
XP_UNIX) and only add them if the X11 target is enabled. Similar goes for the Wayland
target and WTF_PLATFORM_WAYLAND. The Wayland target requires GTK+ 3.12.0, so that's
the minimum required version as soon as that target is enabled. Only search for GLX
if the X11 target is enabled.
Tools:
* CMakeLists.txt: Only build the TestNetscapePlugIn target in case
the X11 windowing target is enabled.
Modified Paths
trunk/ChangeLog
trunk/Source/cmake/FindGTK3.cmake
trunk/Source/cmake/OptionsCommon.cmake
trunk/Source/cmake/OptionsEfl.cmake
trunk/Source/cmake/OptionsGTK.cmake
trunk/Tools/CMakeLists.txt
trunk/Tools/ChangeLog
Diff
Modified: trunk/ChangeLog (170662 => 170663)
--- trunk/ChangeLog 2014-07-01 20:38:37 UTC (rev 170662)
+++ trunk/ChangeLog 2014-07-01 20:45:47 UTC (rev 170663)
@@ -1,3 +1,24 @@
+2014-07-01 Zan Dobersek
+
+[CMake] Add necessary support for building for the Wayland target
+https://bugs.webkit.org/show_bug.cgi?id=134160
+
+Reviewed by Darin Adler.
+
+* Source/cmake/FindGTK3.cmake: Check for the gtk+-x11-3.0 package if the X11 target
+is enabled, and that its version matches the version of the generic package. Same
+for the gtk+-wayland-3.0 package and the Wayland target.
+* Source/cmake/OptionsCommon.cmake: Don't add the -DXP_UNIX definition here.
+* Source/cmake/OptionsEfl.cmake: Add -DXP_UNIX here for the EFL port, under the same
+condition as in OptionsCommon.cmake. ENABLE_X11_TARGET is enabled by default for EFL
+so they keep building the TestNetscapePlugin target.
+* Source/cmake/OptionsGTK.cmake: Enable the X11 target and disable the Wayland target
+by default. Group all the X11-specific macro definitions (WTF_PLATFORM_X11, MOZ_X11,
+XP_UNIX) and only add them if the X11 target is enabled. Similar goes for the Wayland
+target and WTF_PLATFORM_WAYLAND. The Wayland target requires GTK+ 3.12.0, so that's
+the minimum required version as soon as that target is enabled. Only search for GLX
+if the X11 target is enabled.
+
2014-06-29 Yoav Weiss
Add support for HTMLImageElement's sizes attribute
Modified: trunk/Source/cmake/FindGTK3.cmake (170662 => 170663)
--- trunk/Source/cmake/FindGTK3.cmake 2014-07-01 20:38:37 UTC (rev 170662)
+++ trunk/Source/cmake/FindGTK3.cmake 2014-07-01 20:45:47 UTC (rev 170663)
@@ -45,5 +45,19 @@
endif ()
endif ()
+if (GTK3_VERSION AND VERSION_OK AND ENABLE_X11_TARGET)
+pkg_check_modules(GTK3_X11 gtk+-x11-3.0)
+if (NOT("${GTK3_X11_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
+set(VERSION_OK FALSE)
+endif ()
+endif ()
+
+if (GTK3_VERSION AND VERSION_OK AND ENABLE_WAYLAND_TARGET)
+pkg_check_modules(GTK3_WAYLAND gtk+-wayland-3.0)
+if (NOT("${GTK3_WAYLAND_VERSION}" VERSION_EQUAL "${GTK3_VERSION}"))
+set(VERSION_OK FALSE)
+endif ()
+endif ()
+
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK3 DEFAULT_MSG GTK3_INCLUDE_DIRS GTK3_LIBRARIES VERSION_OK)
Modified: trunk/Source/cmake/OptionsCommon.cmake (170662 => 170663)
--- trunk/Source/cmake/OptionsCommon.cmake 2014-07-01 20:38:37 UTC (rev 170662)
+++ trunk/Source/cmake/OptionsCommon.cmake 2014-07-01 20:45:47 UTC (rev 170663)
@@ -1,10 +1,6 @@
add_definitions(-DBUILDING_WITH_CMAKE=1)
add_definitions(-DHAVE_CONFIG_H=1)
-if (WTF_OS_UNIX)
-add_definitions(-DXP_UNIX)
-endif (WTF_OS_UNIX)
-
# CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0. Since this
# version, -P does not output empty lines, which currently breaks make_names.pl in
# WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
Modified: trunk/Source/cmake/OptionsEfl.cmake (170662 => 170663)
--- trunk/Source/cmake/OptionsEfl.cmake 2014-07-01 20:38:37 UTC (rev 170662)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-07-01 20:45:47 UTC (rev 170663)
@@ -167,6 +167,11 @@
set(ENABLE_PLUGIN_PROCESS 1)
e
[webkit-changes] [170662] trunk/Source/WebKit2
Title: [170662] trunk/Source/WebKit2 Revision 170662 Author beid...@apple.com Date 2014-07-01 13:38:37 -0700 (Tue, 01 Jul 2014) Log Message Followup for: Combine the Telephone and Selection overlay controllers, updating UI behavior. https://bugs.webkit.org/show_bug.cgi?id=134461 Rubberstamped by Tim Horton. * WebProcess/WebPage/mac/ServicesOverlayController.mm: Include the correct constant. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm Diff Modified: trunk/Source/WebKit2/ChangeLog (170661 => 170662) --- trunk/Source/WebKit2/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661) +++ trunk/Source/WebKit2/ChangeLog 2014-07-01 20:38:37 UTC (rev 170662) @@ -313,6 +313,15 @@ 2014-07-01 Brady Eidson +Followup for: Combine the Telephone and Selection overlay controllers, updating UI behavior. +https://bugs.webkit.org/show_bug.cgi?id=134461 + +Rubberstamped by Tim Horton. + +* WebProcess/WebPage/mac/ServicesOverlayController.mm: Include the correct constant. + +2014-07-01 Brady Eidson + Build fix. Forgot to commit locally before pushing. Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm (170661 => 170662) --- trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-01 20:29:52 UTC (rev 170661) +++ trunk/Source/WebKit2/WebProcess/WebPage/mac/ServicesOverlayController.mm 2014-07-01 20:38:37 UTC (rev 170662) @@ -48,7 +48,7 @@ #endif typedef NSUInteger DDHighlightStyle; -static DDHighlightStyle DDHighlightNoOutlineWithArrow = 0; +static const DDHighlightStyle DDHighlightNoOutlineWithArrow = (1 << 16); SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectors) SOFT_LINK(DataDetectors, DDHighlightCreateWithRectsInVisibleRect, DDHighlightRef, (CFAllocatorRef allocator, CGRect * rects, CFIndex count, CGRect globalVisibleRect, Boolean withArrow), (allocator, rects, count, globalVisibleRect, withArrow)) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170661] trunk
Title: [170661] trunk
Revision 170661
Author cfleiz...@apple.com
Date 2014-07-01 13:29:52 -0700 (Tue, 01 Jul 2014)
Log Message
AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
https://bugs.webkit.org/show_bug.cgi?id=134492
Reviewed by Andreas Kling.
Source/WebCore:
Support the indeterminate attribute in AX code.
Test: Update existing test: accessibility/aria-checked-mixed-value
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::checkboxOrRadioValue):
Tools:
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::isIndeterminate):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::isIndeterminate):
LayoutTests:
* accessibility/aria-checked-mixed-value-expected.txt:
* accessibility/aria-checked-mixed-value.html:
* platform/mac/accessibility/aria-checked-mixed-value-expected.txt: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt
trunk/LayoutTests/accessibility/aria-checked-mixed-value.html
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
trunk/Tools/ChangeLog
trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm
trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm
Added Paths
trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt
Diff
Modified: trunk/LayoutTests/ChangeLog (170660 => 170661)
--- trunk/LayoutTests/ChangeLog 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661)
@@ -1,3 +1,14 @@
+2014-07-01 Chris Fleizach
+
+AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
+https://bugs.webkit.org/show_bug.cgi?id=134492
+
+Reviewed by Andreas Kling.
+
+* accessibility/aria-checked-mixed-value-expected.txt:
+* accessibility/aria-checked-mixed-value.html:
+* platform/mac/accessibility/aria-checked-mixed-value-expected.txt: Added.
+
2014-07-01 Simon Fraser
[UI-side compositing] Bad spinner on news.google.com: animations need to be ordered
Modified: trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt (170660 => 170661)
--- trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:29:52 UTC (rev 170661)
@@ -19,6 +19,14 @@
Mixed: true
+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: false
+
+
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/accessibility/aria-checked-mixed-value.html (170660 => 170661)
--- trunk/LayoutTests/accessibility/aria-checked-mixed-value.html 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/LayoutTests/accessibility/aria-checked-mixed-value.html 2014-07-01 20:29:52 UTC (rev 170661)
@@ -11,6 +11,8 @@
+
+
@@ -22,7 +24,7 @@
description("Tests whether mixed values are reported properly.");
if (window.accessibilityController) {
- for (var i = 1; i < 5; i++) {
+ for (var i = 1; i < 7; i++) {
var element = accessibilityController.accessibleElementById("element" + i);
debug("Role: " + element.role);
debug("Mixed: " + element.isIndeterminate);
Copied: trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt (from rev 170660, trunk/LayoutTests/accessibility/aria-checked-mixed-value-expected.txt) (0 => 170661)
--- trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-checked-mixed-value-expected.txt 2014-07-01 20:29:52 UTC (rev 170661)
@@ -0,0 +1,33 @@
+Tests whether mixed values are reported properly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role: AXRole: AXRadioButton
+Mixed: false
+
+
+Role: AXRole: AXMenuItem
+Mixed: false
+
+
+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXMenuItem
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: true
+
+
+Role: AXRole: AXCheckBox
+Mixed: false
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/Source/WebCore/ChangeLog (170660 => 170661)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 20:22:58 UTC (rev 170660)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 20:29:52 UTC (rev 170661)
@@ -1,3 +1,17 @@
+2014-07-01 Chris Fleizach
+
+AX: HTML indeterminate IDL attribute not mapped to checkbox value=2
+https://bugs.webkit.org/show_bug.cgi?id=134492
+
+Reviewed by Andreas Kling.
+
+Support the indeterminate attribute in AX code.
+
+Test: Update existing test: accessibility/aria-checked-mixed-value
+
+* accessibility/AccessibilityObject.cpp:
+(WebCore::Access
[webkit-changes] [170659] trunk/Source/WebKit2
Title: [170659] trunk/Source/WebKit2
Revision 170659
Author ander...@apple.com
Date 2014-07-01 12:43:48 -0700 (Tue, 01 Jul 2014)
Log Message
Fix build.
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170658 => 170659)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 19:42:03 UTC (rev 170658)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 19:43:48 UTC (rev 170659)
@@ -1,5 +1,11 @@
2014-07-01 Anders Carlsson
+Fix build.
+
+* WebKit2.xcodeproj/project.pbxproj:
+
+2014-07-01 Anders Carlsson
+
Temporarily encode and decode the snapshot UUID
https://bugs.webkit.org/show_bug.cgi?id=134507
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (170658 => 170659)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-01 19:42:03 UTC (rev 170658)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-01 19:43:48 UTC (rev 170659)
@@ -147,6 +147,7 @@
1A1C649B11F4174200553C19 /* WebContextMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A1C648611F415B700553C19 /* WebContextMac.mm */; };
1A1D8BA11731A36300141DA4 /* LocalStorageDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9F1731A36300141DA4 /* LocalStorageDatabase.cpp */; };
1A1D8BA21731A36300141DA4 /* LocalStorageDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8BA01731A36300141DA4 /* LocalStorageDatabase.h */; };
+ 1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 31607F3819627002009B87DA /* LegacySessionStateCoding.h */; };
1A1E093318861D3800D2DC49 /* WebProgressTrackerClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1E093118861D3800D2DC49 /* WebProgressTrackerClient.cpp */; };
1A1E093418861D3800D2DC49 /* WebProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1E093218861D3800D2DC49 /* WebProgressTrackerClient.h */; };
1A1EC69E1872092100B951F0 /* ImportanceAssertion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1EC69D1872092100B951F0 /* ImportanceAssertion.h */; };
@@ -619,7 +620,6 @@
3131261F148FF82C00BA2A39 /* NotificationPermissionRequestManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261A148FF82B00BA2A39 /* NotificationPermissionRequestManager.h */; };
31312620148FF82C00BA2A39 /* WebNotificationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3131261B148FF82B00BA2A39 /* WebNotificationManager.cpp */; };
31312621148FF82C00BA2A39 /* WebNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3131261C148FF82B00BA2A39 /* WebNotificationManager.h */; };
- 31607F3919627002009B87DA /* LegacySessionStateCoding.h in Copy Files */ = {isa = PBXBuildFile; fileRef = 31607F3819627002009B87DA /* LegacySessionStateCoding.h */; };
318BE17114743DB100A8FBB2 /* WKNotificationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 318BE17014743DB100A8FBB2 /* WKNotificationManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
318BE17514743DD700A8FBB2 /* WKNotificationManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE17414743DD600A8FBB2 /* WKNotificationManager.cpp */; };
318BE17714743E6000A8FBB2 /* WKNotification.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 318BE17614743E6000A8FBB2 /* WKNotification.cpp */; };
@@ -1908,7 +1908,6 @@
dstSubfolderSpec = 1;
files = (
510CC8491613C85C00D03ED3 /* NetworkProcess.app in Copy Files */,
-31607F3919627002009B87DA /* LegacySessionStateCoding.h in Copy Files */,
BCDE0ABF13272708001259FB /* PluginProcess.app in Copy Files */,
51A60B2A180CCEB500F3BF50 /* DatabaseProcess.app in Copy Files */,
1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */,
@@ -7261,6 +7260,7 @@
1A2D82A9127F4EAB001EB962 /* NPRemoteObjectMap.h in Headers */,
1A2161B011F37664008AD0F5 /* NPRuntimeObjectMap.h in Headers */,
2DA049B8180CCD0A00AAFA9E /* GraphicsLayerCARemote.h in Headers */,
+1A1DC340196346D700FF7059 /* LegacySessionStateCoding.h in Headers */,
2DA049B4180CCCD300AAFA9E /* PlatformCALayerRemote.h in Headers */,
1A2162B111F38971008AD0F5 /* NPRuntimeUtilities.h in Headers */,
1AB8A1EC1840080900E9AE69 /* WKPageLoaderClient.h in Headers */,
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170658] trunk/Source/WebKit2
Title: [170658] trunk/Source/WebKit2
Revision 170658
Author ander...@apple.com
Date 2014-07-01 12:42:03 -0700 (Tue, 01 Jul 2014)
Log Message
Temporarily encode and decode the snapshot UUID
https://bugs.webkit.org/show_bug.cgi?id=134507
Reviewed by Tim Horton.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistory):
(WebKit::decodeSessionHistoryEntry):
(WebKit::decodeSessionHistoryEntries):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170657 => 170658)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 19:34:57 UTC (rev 170657)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 19:42:03 UTC (rev 170658)
@@ -1,5 +1,17 @@
2014-07-01 Anders Carlsson
+Temporarily encode and decode the snapshot UUID
+https://bugs.webkit.org/show_bug.cgi?id=134507
+
+Reviewed by Tim Horton.
+
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistory):
+(WebKit::decodeSessionHistoryEntry):
+(WebKit::decodeSessionHistoryEntries):
+
+2014-07-01 Anders Carlsson
+
Implement encodeSessionHistoryEntryData
https://bugs.webkit.org/show_bug.cgi?id=134505
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170657 => 170658)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:34:57 UTC (rev 170657)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:42:03 UTC (rev 170658)
@@ -437,7 +437,7 @@
auto originalURL = item.pageState.mainFrameState.originalURLString.createCFString();
auto data = ""
-auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryDataKey, data.get() }});
+auto entryDictionary = createDictionary({ { sessionHistoryEntryURLKey, url.get() }, { sessionHistoryEntryTitleKey, title.get() }, { sessionHistoryEntryDataKey, data.get() }, { sessionHistoryEntrySnapshotUUIDKey, item.snapshotUUID.createCFString().get() }});
CFArrayAppendValue(entries.get(), entryDictionary.get());
}
@@ -933,7 +933,7 @@
return decodeSessionHistoryEntryData(CFDataGetBytePtr(historyEntryData), static_cast(CFDataGetLength(historyEntryData)), mainFrameState);
}
-static bool decodeSessionHistoryEntry(CFDictionaryRef entryDictionary, PageState& pageState)
+static bool decodeSessionHistoryEntry(CFDictionaryRef entryDictionary, BackForwardListItemState& backForwardListItemState)
{
auto title = dynamic_cf_cast(CFDictionaryGetValue(entryDictionary, sessionHistoryEntryTitleKey));
if (!title)
@@ -951,13 +951,16 @@
if (!historyEntryData)
return false;
-if (!decodeSessionHistoryEntryData(historyEntryData, pageState.mainFrameState))
+if (!decodeSessionHistoryEntryData(historyEntryData, backForwardListItemState.pageState.mainFrameState))
return false;
-pageState.title = title;
-pageState.mainFrameState.urlString = urlString;
-pageState.mainFrameState.originalURLString = originalURLString;
+if (auto snapshotUUID = WTF::dynamic_cf_cast(CFDictionaryGetValue(entryDictionary, sessionHistoryEntrySnapshotUUIDKey)))
+backForwardListItemState.snapshotUUID = snapshotUUID;
+backForwardListItemState.pageState.title = title;
+backForwardListItemState.pageState.mainFrameState.urlString = urlString;
+backForwardListItemState.pageState.mainFrameState.originalURLString = originalURLString;
+
return true;
}
@@ -969,7 +972,7 @@
return false;
BackForwardListItemState entry;
-if (!decodeSessionHistoryEntry(entryDictionary, entry.pageState))
+if (!decodeSessionHistoryEntry(entryDictionary, entry))
return false;
entries.append(std::move(entry));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170657] trunk/Source/WebKit2
Title: [170657] trunk/Source/WebKit2
Revision 170657
Author ander...@apple.com
Date 2014-07-01 12:34:57 -0700 (Tue, 01 Jul 2014)
Log Message
Implement encodeSessionHistoryEntryData
https://bugs.webkit.org/show_bug.cgi?id=134505
Reviewed by Tim Horton.
* UIProcess/API/C/WKPage.cpp:
(WKPageCopySessionState):
Add back a missing null check for the filter pointer.
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistoryEntryData):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170656 => 170657)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 19:15:39 UTC (rev 170656)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 19:34:57 UTC (rev 170657)
@@ -1,3 +1,17 @@
+2014-07-01 Anders Carlsson
+
+Implement encodeSessionHistoryEntryData
+https://bugs.webkit.org/show_bug.cgi?id=134505
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/C/WKPage.cpp:
+(WKPageCopySessionState):
+Add back a missing null check for the filter pointer.
+
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistoryEntryData):
+
2014-07-01 Simon Fraser
[UI-side compositing] Bad spinner on news.google.com: animations need to be ordered
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170656 => 170657)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 19:15:39 UTC (rev 170656)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 19:34:57 UTC (rev 170657)
@@ -352,11 +352,13 @@
WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
{
return toAPI(toImpl(pageRef)->sessionStateData([pageRef, context, filter](WebBackForwardListItem& item) {
-if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
-return false;
+if (filter) {
+if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
+return false;
-if (!filter(pageRef, WKPageGetSessionHistoryURLValueType(), toURLRef(item.originalURL().impl()), context))
-return false;
+if (!filter(pageRef, WKPageGetSessionHistoryURLValueType(), toURLRef(item.originalURL().impl()), context))
+return false;
+}
return true;
}).leakRef());
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170656 => 170657)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:15:39 UTC (rev 170656)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:34:57 UTC (rev 170657)
@@ -28,6 +28,7 @@
#include "APIData.h"
#include "SessionState.h"
+#include
#include
#include
#include
@@ -377,8 +378,30 @@
static RetainPtr encodeSessionHistoryEntryData(const FrameState& frameState)
{
+static CFAllocatorRef fastMallocDeallocator;
-return nullptr;
+static std::once_flag onceFlag;
+std::call_once(onceFlag, [] {
+CFAllocatorContext context = {
+0, // version
+nullptr, // info
+nullptr, // retain
+nullptr, // release
+nullptr, // copyDescription
+nullptr, // allocate
+nullptr, // reallocate
+[](void *ptr, void *info) {
+WTF::fastFree(ptr);
+},
+nullptr, // preferredSize
+};
+fastMallocDeallocator = CFAllocatorCreate(kCFAllocatorDefault, &context);
+});
+
+size_t bufferSize;
+auto buffer = encodeSessionHistoryEntryData(frameState, bufferSize);
+
+return adoptCF(CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, buffer.get(), bufferSize, fastMallocDeallocator));
}
static RetainPtr createDictionary(std::initializer_list> keyValuePairs)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170656] trunk
Title: [170656] trunk
Revision 170656
Author simon.fra...@apple.com
Date 2014-07-01 12:15:39 -0700 (Tue, 01 Jul 2014)
Log Message
[UI-side compositing] Bad spinner on news.google.com: animations need to be ordered
https://bugs.webkit.org/show_bug.cgi?id=134504
Reviewed by Tim Horton.
Source/WebKit2:
The layer's addedAnimations property needs to maintain order, since the order
in which transforms are applied is important.
* Shared/mac/RemoteLayerTreeTransaction.h: Use a Vector> for addedAnimations.
* Shared/mac/RemoteLayerTreeTransaction.mm:
(WebKit::dumpChangedLayers):
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.h:
* WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm:
(WebKit::PlatformCAAnimationRemote::updateLayerAnimations):
* WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
(WebKit::PlatformCALayerRemote::addAnimationForKey): If this is a new entry, we
can just append to addedAnimations, otherwise we have to find the existing one
and update its properties.
(WebKit::PlatformCALayerRemote::removeAnimationForKey): Do linear search to
find the animation to remove (this list will normally be short).
LayoutTests:
Test that the transforms from the animation are applied in the correct order.
* compositing/animation/keyframe-order-expected.html: Added.
* compositing/animation/keyframe-order.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h
trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.h
trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCAAnimationRemote.mm
trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp
Added Paths
trunk/LayoutTests/compositing/animation/keyframe-order-expected.html
trunk/LayoutTests/compositing/animation/keyframe-order.html
Diff
Modified: trunk/LayoutTests/ChangeLog (170655 => 170656)
--- trunk/LayoutTests/ChangeLog 2014-07-01 19:10:30 UTC (rev 170655)
+++ trunk/LayoutTests/ChangeLog 2014-07-01 19:15:39 UTC (rev 170656)
@@ -1,3 +1,16 @@
+2014-07-01 Simon Fraser
+
+[UI-side compositing] Bad spinner on news.google.com: animations need to be ordered
+https://bugs.webkit.org/show_bug.cgi?id=134504
+
+
+Reviewed by Tim Horton.
+
+Test that the transforms from the animation are applied in the correct order.
+
+* compositing/animation/keyframe-order-expected.html: Added.
+* compositing/animation/keyframe-order.html: Added.
+
2014-07-01 Zalan Bujtas
Subpixel rendering: Pixel crack in breadcrumbs at devforums.apple.com.
Added: trunk/LayoutTests/compositing/animation/keyframe-order-expected.html (0 => 170656)
--- trunk/LayoutTests/compositing/animation/keyframe-order-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/animation/keyframe-order-expected.html 2014-07-01 19:15:39 UTC (rev 170656)
@@ -0,0 +1,48 @@
+
+
+
+
+
+* {
+box-sizing: border-box;
+}
+.container {
+position: absolute;
+height: 100px;
+width: 100px;
+background-color: green;
+margin: 100px;
+}
+
+.spinner {
+position: absolute;
+top: -50px;
+left: -50px;
+-webkit-transform: rotateZ(0deg) translate3d(50px, 50px, 0);
+}
+
+.inner {
+width: 50px;
+height: 50px;
+/*overflow: hidden*/
+}
+
+.bordered {
+width: 100px;
+height: 100px;
+border: 20px solid black;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Added: trunk/LayoutTests/compositing/animation/keyframe-order.html (0 => 170656)
--- trunk/LayoutTests/compositing/animation/keyframe-order.html (rev 0)
+++ trunk/LayoutTests/compositing/animation/keyframe-order.html 2014-07-01 19:15:39 UTC (rev 170656)
@@ -0,0 +1,76 @@
+
+
+
+
+
+* {
+box-sizing: border-box;
+}
+.container {
+position: absolute;
+height: 100px;
+width: 100px;
+background-color: green;
+margin: 100px;
+}
+
+.spinner {
+position: absolute;
+top: -50px;
+left: -50px;
+}
+
+.spinner.animating {
+-webkit-animation: imageSpin 9s linear 0 infinite
+}
+
+.inner {
+width: 50px;
+height: 50px;
+}
+
+.bordered {
+width: 100px;
+height: 100px;
+border: 20px solid black;
+}
+
+@-webkit-keyframes imageSpin {
+from {
+-webkit-transform: rotateZ(0deg) translate3d(50px, 50px, 0)
+}
+
+to {
+-webkit-transform: rotateZ(360deg) translate3d(50px, 50px 0)
+}
+}
+
+
+if (window.testRunner)
+testRunner.waitUntilDone();
+
+function doTest()
+{
+var box = document.getElement
[webkit-changes] [170655] trunk/Source/WebCore
Title: [170655] trunk/Source/WebCore Revision 170655 Author mmaxfi...@apple.com Date 2014-07-01 12:10:30 -0700 (Tue, 01 Jul 2014) Log Message Typing an automatic text replacement phrase after a br in contenteditable is not rendered as expected https://bugs.webkit.org/show_bug.cgi?id=133883 Reviewed by Enrica Casucci. enclosingDeletableElement() makes sure that the element's container is editable, but not that it is capable of having content inside it (like how a can't). No new tests. I don't think this is testable because it requires setting some state in System Preferences. * editing/DeleteButtonController.cpp: (WebCore::enclosingDeletableElement): Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/editing/DeleteButtonController.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (170654 => 170655) --- trunk/Source/WebCore/ChangeLog 2014-07-01 19:04:54 UTC (rev 170654) +++ trunk/Source/WebCore/ChangeLog 2014-07-01 19:10:30 UTC (rev 170655) @@ -1,3 +1,18 @@ +2014-07-01 Myles C. Maxfield + +Typing an automatic text replacement phrase after a br in contenteditable is not rendered as expected +https://bugs.webkit.org/show_bug.cgi?id=133883 + +Reviewed by Enrica Casucci. + +enclosingDeletableElement() makes sure that the element's container is editable, but not +that it is capable of having content inside it (like how a can't). + +No new tests. I don't think this is testable because it requires setting some state in System Preferences. + +* editing/DeleteButtonController.cpp: +(WebCore::enclosingDeletableElement): + 2014-07-01 Alex Christensen [iOS] Unreviewed build fix after r170640. Modified: trunk/Source/WebCore/editing/DeleteButtonController.cpp (170654 => 170655) --- trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-07-01 19:04:54 UTC (rev 170654) +++ trunk/Source/WebCore/editing/DeleteButtonController.cpp 2014-07-01 19:10:30 UTC (rev 170655) @@ -145,18 +145,18 @@ RefPtr range = selection.toNormalizedRange(); if (!range) -return 0; +return nullptr; Node* container = range->commonAncestorContainer(ASSERT_NO_EXCEPTION); ASSERT(container); // The enclosingNodeOfType function only works on nodes that are editable -// (which is strange, given its name). -if (!container->hasEditableStyle()) -return 0; +// and capable of having editing positions inside them (which is strange, given its name). +if (!container->hasEditableStyle() || editingIgnoresContent(container)) +return nullptr; Node* element = enclosingNodeOfType(firstPositionInNode(container), &isDeletableElement); -return element && element->isHTMLElement() ? toHTMLElement(element) : 0; +return element && element->isHTMLElement() ? toHTMLElement(element) : nullptr; } void DeleteButtonController::respondToChangedSelection(const VisibleSelection& oldSelection) ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170654] trunk/Source/WebKit2
Title: [170654] trunk/Source/WebKit2
Revision 170654
Author ander...@apple.com
Date 2014-07-01 12:04:54 -0700 (Tue, 01 Jul 2014)
Log Message
Add a encodeLegacySessionState function
https://bugs.webkit.org/show_bug.cgi?id=134502
Reviewed by Tim Horton.
* UIProcess/LegacySessionStateCoding.h:
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::encodeSessionHistoryEntryData):
(WebKit::encodeLegacySessionHistoryEntryData):
(WebKit::createDictionary):
(WebKit::encodeSessionHistory):
(WebKit::encodeLegacySessionState):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170653 => 170654)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 19:04:54 UTC (rev 170654)
@@ -1,3 +1,18 @@
+2014-07-01 Anders Carlsson
+
+Add a encodeLegacySessionState function
+https://bugs.webkit.org/show_bug.cgi?id=134502
+
+Reviewed by Tim Horton.
+
+* UIProcess/LegacySessionStateCoding.h:
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::encodeSessionHistoryEntryData):
+(WebKit::encodeLegacySessionHistoryEntryData):
+(WebKit::createDictionary):
+(WebKit::encodeSessionHistory):
+(WebKit::encodeLegacySessionState):
+
2014-07-01 Alexey Proskuryakov
[Cocoa] WebProcess doesn't follow localization of UI process when run as a service
Modified: trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h (170653 => 170654)
--- trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/UIProcess/LegacySessionStateCoding.h 2014-07-01 19:04:54 UTC (rev 170654)
@@ -37,6 +37,7 @@
struct FrameState;
struct SessionState;
+RefPtr encodeLegacySessionState(const SessionState&);
RefPtr encodeLegacySessionHistoryEntryData(const FrameState&);
bool decodeLegacySessionState(const API::Data&, SessionState&);
Modified: trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp (170653 => 170654)
--- trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 18:41:27 UTC (rev 170653)
+++ trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp 2014-07-01 19:04:54 UTC (rev 170654)
@@ -41,6 +41,8 @@
static const CFStringRef provisionalURLKey = CFSTR("ProvisionalURL");
// Session history keys.
+static const uint32_t sessionHistoryVersion = 1;
+
static const CFStringRef sessionHistoryVersionKey = CFSTR("SessionHistoryVersion");
static const CFStringRef sessionHistoryCurrentIndexKey = CFSTR("SessionHistoryCurrentIndex");
static const CFStringRef sessionHistoryEntriesKey = CFSTR("SessionHistoryEntries");
@@ -353,7 +355,7 @@
#endif
}
-static MallocPtr encodeLegacySessionHistoryEntryData(const FrameState& frameState, size_t& bufferSize)
+static MallocPtr encodeSessionHistoryEntryData(const FrameState& frameState, size_t& bufferSize)
{
HistoryEntryDataEncoder encoder;
@@ -366,13 +368,105 @@
RefPtr encodeLegacySessionHistoryEntryData(const FrameState& frameState)
{
size_t bufferSize;
-auto buffer = encodeLegacySessionHistoryEntryData(frameState, bufferSize);
+auto buffer = encodeSessionHistoryEntryData(frameState, bufferSize);
return API::Data::createWithoutCopying(buffer.leakPtr(), bufferSize, [] (unsigned char* buffer, const void* context) {
fastFree(buffer);
}, nullptr);
}
+static RetainPtr encodeSessionHistoryEntryData(const FrameState& frameState)
+{
+
+return nullptr;
+}
+
+static RetainPtr createDictionary(std::initializer_list> keyValuePairs)
+{
+Vector keys;
+Vector values;
+
+keys.reserveInitialCapacity(keyValuePairs.size());
+values.reserveInitialCapacity(keyValuePairs.size());
+
+for (const auto& keyValuePair : keyValuePairs) {
+keys.uncheckedAppend(keyValuePair.first);
+keys.uncheckedAppend(keyValuePair.second);
+}
+
+return adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys.data(), values.data(), keyValuePairs.size(), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+}
+
+static RetainPtr encodeSessionHistory(const BackForwardListState& backForwardListState)
+{
+ASSERT(!backForwardListState.currentIndex || backForwardListState.currentIndex.value() < backForwardListState.items.size());
+
+auto sessionHistoryVersionNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &sessionHistoryVersion));
+
+if (!backForwardListState.currentIndex)
+return createDictionary({ { sessionHistoryVersionKey, sessionHistoryVersionNumber.get() } });
+
+auto entries = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, backForwardListState.items.size(), &kCFTypeArrayCallBacks));
+
+for (const auto& item : backForwardListState.items) {
+auto url = ""
+
[webkit-changes] [170653] trunk/Source/WebKit2
Title: [170653] trunk/Source/WebKit2 Revision 170653 Author timothy_hor...@apple.com Date 2014-07-01 11:41:27 -0700 (Tue, 01 Jul 2014) Log Message [Cocoa] WebProcess doesn't follow localization of UI process when run as a service https://bugs.webkit.org/show_bug.cgi?id=133126 Patch by Alexey Proskuryakov. Reviewed by Tim Horton. * Configurations/WebContentService.Development.xcconfig: * Configurations/WebContentService.xcconfig: Figure out which of the two keys to use. CFBundleAllowMixedLocalizations was a workaround before we got CFBundleFollowParentLocalization, and these cannot be used together. * UIProcess/Launcher/mac/ProcessLauncherMac.mm: (WebKit::connectToService): Set up XPC bootstrap for CFBundle to use. * WebKit2.xcodeproj/project.pbxproj: Added a script that applies the key to Info.plist. * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: Removed CFBundleAllowMixedLocalizations, we now add it programmatically. Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig trunk/Source/WebKit2/Configurations/WebContentService.xcconfig trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist trunk/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist Diff Modified: trunk/Source/WebKit2/ChangeLog (170652 => 170653) --- trunk/Source/WebKit2/ChangeLog 2014-07-01 18:29:53 UTC (rev 170652) +++ trunk/Source/WebKit2/ChangeLog 2014-07-01 18:41:27 UTC (rev 170653) @@ -1,3 +1,29 @@ +2014-07-01 Alexey Proskuryakov + +[Cocoa] WebProcess doesn't follow localization of UI process when run as a service +https://bugs.webkit.org/show_bug.cgi?id=133126 + + +Patch by Alexey Proskuryakov. +Reviewed by Tim Horton. + +* Configurations/WebContentService.Development.xcconfig: +* Configurations/WebContentService.xcconfig: +Figure out which of the two keys to use. CFBundleAllowMixedLocalizations was +a workaround before we got CFBundleFollowParentLocalization, and these cannot be +used together. + +* UIProcess/Launcher/mac/ProcessLauncherMac.mm: (WebKit::connectToService): Set up +XPC bootstrap for CFBundle to use. + +* WebKit2.xcodeproj/project.pbxproj: Added a script that applies the key to Info.plist. + +* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist: +* WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist: +* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist: +* WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist: +Removed CFBundleAllowMixedLocalizations, we now add it programmatically. + 2014-07-01 Alex Christensen [iOS] Unreviewed build fix after r170640. Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (170652 => 170653) --- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-07-01 18:29:53 UTC (rev 170652) +++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-07-01 18:41:27 UTC (rev 170653) @@ -1,4 +1,4 @@ -// Copyright (C) 2012, 2013 Apple Inc. All rights reserved. +// Copyright (C) 2012-2014 Apple Inc. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -31,6 +31,14 @@ INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist; INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos); +BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)); +BUNDLE_LOCALIZATION_KEY_iphoneos = CFBundleFollowParentLocalization; +BUNDLE_LOCALIZATION_KEY_iphonesimulator = CFBundleFollowParentLocalization; +BUNDLE_LOCALIZATION_KEY_macosx = $(BUNDLE_LOCALIZATION_KEY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR)); +BUNDLE_LOCALIZATION_KEY_macosx_1080 = CFBundleAllowMixedLocalizations; +BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations; +BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization; + CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAME
[webkit-changes] [170652] trunk/Source
Title: [170652] trunk/Source
Revision 170652
Author achristen...@apple.com
Date 2014-07-01 11:29:53 -0700 (Tue, 01 Jul 2014)
Log Message
[iOS] Unreviewed build fix after r170640.
Source/WebCore:
* page/EditorClient.h:
(WebCore::EditorClient::selectedTelephoneNumberRangesChanged):
Add ifdefs to make everything compile and link.
Source/WebKit2:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::selectedTelephoneNumberRangesChanged):
(WebKit::WebEditorClient::selectionRectsDidChange):
* WebProcess/WebCoreSupport/WebEditorClient.h:
* WebProcess/WebPage/WebPage.h:
Add ifdefs to make everything compile and link.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/page/EditorClient.h
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (170651 => 170652)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1,3 +1,11 @@
+2014-07-01 Alex Christensen
+
+[iOS] Unreviewed build fix after r170640.
+
+* page/EditorClient.h:
+(WebCore::EditorClient::selectedTelephoneNumberRangesChanged):
+Add ifdefs to make everything compile and link.
+
2014-07-01 Daniel Bates
Remove unnecessary calls to std::move()
Modified: trunk/Source/WebCore/page/EditorClient.h (170651 => 170652)
--- trunk/Source/WebCore/page/EditorClient.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebCore/page/EditorClient.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -179,11 +179,8 @@
virtual void willSetInputMethodState() = 0;
virtual void setInputMethodState(bool enabled) = 0;
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
virtual void selectedTelephoneNumberRangesChanged(const Vector>&) { }
-#endif
-
-#if ENABLE(SERVICE_CONTROLS)
virtual void selectionRectsDidChange(const Vector&) { }
#endif
Modified: trunk/Source/WebKit2/ChangeLog (170651 => 170652)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1,3 +1,14 @@
+2014-07-01 Alex Christensen
+
+[iOS] Unreviewed build fix after r170640.
+
+* WebProcess/WebCoreSupport/WebEditorClient.cpp:
+(WebKit::WebEditorClient::selectedTelephoneNumberRangesChanged):
+(WebKit::WebEditorClient::selectionRectsDidChange):
+* WebProcess/WebCoreSupport/WebEditorClient.h:
+* WebProcess/WebPage/WebPage.h:
+Add ifdefs to make everything compile and link.
+
2014-07-01 Anders Carlsson
Add WKSessionStateGetTypeID
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-01 18:29:53 UTC (rev 170652)
@@ -527,12 +527,16 @@
#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
void WebEditorClient::selectedTelephoneNumberRangesChanged(const Vector>& ranges)
{
+#if PLATFORM(MAC)
m_page->servicesOverlayController().selectedTelephoneNumberRangesChanged(ranges);
+#endif
}
void WebEditorClient::selectionRectsDidChange(const Vector& rects)
{
+#if PLATFORM(MAC)
if (m_page->serviceControlsEnabled())
m_page->servicesOverlayController().selectionRectsDidChange(rects);
+#endif
}
#endif // ENABLE(SERVICE_CONTROLS) && ENABLE(TELEPHONE_NUMBER_DETECTION)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -167,10 +167,8 @@
virtual bool supportsGlobalSelection() override;
-#if ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if ENABLE(TELEPHONE_NUMBER_DETECTION) || ENABLE(SERVICE_CONTROLS)
virtual void selectedTelephoneNumberRangesChanged(const Vector>&) override;
-#endif
-#if ENABLE(SERVICE_CONTROLS)
virtual void selectionRectsDidChange(const Vector&) override;
#endif
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (170651 => 170652)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-01 18:00:35 UTC (rev 170651)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-01 18:29:53 UTC (rev 170652)
@@ -1088,7 +1088,7 @@
RunLoop::Timer m_determinePrimarySnapshottedPlugInTimer;
#endif
-#if ENABLE(SERVICE_CONTROLS)
+#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
bool m_serviceControlsEnabled;
#en
[webkit-changes] [170651] trunk/Source/WebKit2
Title: [170651] trunk/Source/WebKit2
Revision 170651
Author ander...@apple.com
Date 2014-07-01 11:00:35 -0700 (Tue, 01 Jul 2014)
Log Message
Add WKSessionStateGetTypeID
https://bugs.webkit.org/show_bug.cgi?id=134499
Reviewed by Tim Horton.
* UIProcess/API/C/WKSessionStateRef.cpp:
(WKSessionStateGetTypeID):
* UIProcess/API/C/WKSessionStateRef.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp
trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170650 => 170651)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 17:49:47 UTC (rev 170650)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 18:00:35 UTC (rev 170651)
@@ -1,3 +1,14 @@
+2014-07-01 Anders Carlsson
+
+Add WKSessionStateGetTypeID
+https://bugs.webkit.org/show_bug.cgi?id=134499
+
+Reviewed by Tim Horton.
+
+* UIProcess/API/C/WKSessionStateRef.cpp:
+(WKSessionStateGetTypeID):
+* UIProcess/API/C/WKSessionStateRef.h:
+
2014-07-01 Daniel Bates
Remove unnecessary calls to std::move()
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp (170650 => 170651)
--- trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp 2014-07-01 17:49:47 UTC (rev 170650)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.cpp 2014-07-01 18:00:35 UTC (rev 170651)
@@ -31,6 +31,11 @@
#include "SessionState.h"
#include "WKAPICast.h"
+WKTypeID WKSessionStateGetTypeID()
+{
+return WebKit::toAPI(API::SessionState::APIType);
+}
+
WKSessionStateRef WKSessionStateCreateFromData(WKDataRef data)
{
WebKit::SessionState sessionState;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.h (170650 => 170651)
--- trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.h 2014-07-01 17:49:47 UTC (rev 170650)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKSessionStateRef.h 2014-07-01 18:00:35 UTC (rev 170651)
@@ -32,6 +32,8 @@
extern "C" {
#endif
+WK_EXPORT WKTypeID WKSessionStateGetTypeID();
+
WK_EXPORT WKSessionStateRef WKSessionStateCreateFromData(WKDataRef data);
#ifdef __cplusplus
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170650] trunk
Title: [170650] trunk
Revision 170650
Author dba...@webkit.org
Date 2014-07-01 10:49:47 -0700 (Tue, 01 Jul 2014)
Log Message
Remove unnecessary calls to std::move()
https://bugs.webkit.org/show_bug.cgi?id=134493
Reviewed by Anders Carlsson.
Source/WebCore:
* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::CDM):
* css/CSSGrammar.y.in:
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::formatNumberValue):
* css/MediaQuery.cpp:
(WebCore::MediaQuery::MediaQuery):
* platform/graphics/mac/FontMac.mm:
(WebCore::Font::dashesForIntersectionsWithRect):
Source/WebKit2:
* Shared/ShareableResource.cpp:
(WebKit::ShareableResource::Handle::tryWrapInCFData):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::certificateInfo): Return a WebCore::CertificateInfo instead
of const WebCore::CertificateInfo& to avoid returning a dangling reference to
a local variable. Also, remove the unnecessary calls to std::move() as the compiler
will invoke the move constructor for WebCore::CertificateInfo on return from the
function.
* WebProcess/WebPage/WebFrame.h:
Tools:
* TestWebKitAPI/Tests/WTF/HashSet.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/ns/RetainPtr.mm:
(TestWebKitAPI::TEST):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp
trunk/Source/WebCore/css/CSSGrammar.y.in
trunk/Source/WebCore/css/CSSPrimitiveValue.cpp
trunk/Source/WebCore/css/MediaQuery.cpp
trunk/Source/WebCore/platform/graphics/mac/FontMac.mm
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ShareableResource.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.h
trunk/Tools/ChangeLog
trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp
trunk/Tools/TestWebKitAPI/Tests/WTF/ns/RetainPtr.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (170649 => 170650)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 17:46:29 UTC (rev 170649)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 17:49:47 UTC (rev 170650)
@@ -1,3 +1,20 @@
+2014-07-01 Daniel Bates
+
+Remove unnecessary calls to std::move()
+https://bugs.webkit.org/show_bug.cgi?id=134493
+
+Reviewed by Anders Carlsson.
+
+* Modules/encryptedmedia/CDM.cpp:
+(WebCore::CDM::CDM):
+* css/CSSGrammar.y.in:
+* css/CSSPrimitiveValue.cpp:
+(WebCore::CSSPrimitiveValue::formatNumberValue):
+* css/MediaQuery.cpp:
+(WebCore::MediaQuery::MediaQuery):
+* platform/graphics/mac/FontMac.mm:
+(WebCore::Font::dashesForIntersectionsWithRect):
+
2014-07-01 Zalan Bujtas
Subpixel rendering: Pixel crack in breadcrumbs at devforums.apple.com.
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (170649 => 170650)
--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2014-07-01 17:46:29 UTC (rev 170649)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2014-07-01 17:49:47 UTC (rev 170650)
@@ -106,7 +106,7 @@
: m_keySystem(keySystem)
, m_client(0)
{
-m_private = std::move(CDMFactoryForKeySystem(keySystem)->constructor(this));
+m_private = CDMFactoryForKeySystem(keySystem)->constructor(this);
}
CDM::~CDM()
Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (170649 => 170650)
--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-07-01 17:46:29 UTC (rev 170649)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-07-01 17:49:47 UTC (rev 170650)
@@ -377,7 +377,7 @@
}
;
-webkit_mediaquery: WEBKIT_MEDIAQUERY_SYM WHITESPACE maybe_space media_query '}' { parser->m_mediaQuery = std::move(std::unique_ptr($4)); } ;
+webkit_mediaquery: WEBKIT_MEDIAQUERY_SYM WHITESPACE maybe_space media_query '}' { parser->m_mediaQuery = std::unique_ptr($4); } ;
webkit_selector:
WEBKIT_SELECTOR_SYM '{' maybe_space selector_list '}' {
@@ -558,7 +558,7 @@
;
webkit_source_size_list:
-WEBKIT_SIZESATTR_SYM WHITESPACE source_size_list '}' { parser->m_sourceSizeList = std::move(std::unique_ptr($3)); };
+WEBKIT_SIZESATTR_SYM WHITESPACE source_size_list '}' { parser->m_sourceSizeList = std::unique_ptr($3); };
source_size_list:
maybe_space source_size maybe_space {
Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (170649 => 170650)
--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-07-01 17:46:29 UTC (rev 170649)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2014-07-01 17:49:47 UTC (rev 170650)
@@ -940,7 +940,7 @@
template
ALWAYS_INLINE PassRef CSSPrimitiveValue::formatNumberValue(const char (&characters)[characterCount]) const
{
-return std::move(formatNumberValue(characters, characterCount - 1));
+return formatNumberValue(characters, characterCount - 1);
}
ALWAYS_INLINE String CSSPrimitiveValue::formatNumberForcustomCSSText() const
Modified: trunk/Source/WebCore/css/MediaQuery.cpp (170649 => 170650)
--- trunk/Source/WebCore/css/MediaQuery.cpp 2014-07-01 17:46:29 UTC (rev 170649)
+++ trunk/Source/WebCore/css/MediaQuery.cpp 20
[webkit-changes] [170649] trunk/Source/WebKit2
Title: [170649] trunk/Source/WebKit2
Revision 170649
Author ander...@apple.com
Date 2014-07-01 10:46:29 -0700 (Tue, 01 Jul 2014)
Log Message
Add a BackForwardListItemState struct and put the snapshot UUID there
https://bugs.webkit.org/show_bug.cgi?id=134497
Reviewed by Sam Weinig.
* Shared/SessionState.cpp:
(WebKit::PageState::encode):
(WebKit::PageState::decode):
(WebKit::BackForwardListItemState::encode):
(WebKit::BackForwardListItemState::decode):
* Shared/SessionState.h:
* Shared/WebBackForwardListItem.cpp:
(WebKit::WebBackForwardListItem::create):
(WebKit::WebBackForwardListItem::WebBackForwardListItem):
(WebKit::WebBackForwardListItem::backForwardData):
(WebKit::WebBackForwardListItem::setBackForwardData):
(WebKit::WebBackForwardListItem::encode):
* Shared/WebBackForwardListItem.h:
(WebKit::WebBackForwardListItem::setPageState):
(WebKit::WebBackForwardListItem::setOriginalURL):
(WebKit::WebBackForwardListItem::originalURL):
(WebKit::WebBackForwardListItem::setURL):
(WebKit::WebBackForwardListItem::url):
(WebKit::WebBackForwardListItem::setTitle):
(WebKit::WebBackForwardListItem::title):
(WebKit::WebBackForwardListItem::setSnapshotUUID):
(WebKit::WebBackForwardListItem::snapshotUUID):
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::restoreFromState):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::addBackForwardItem):
* UIProcess/mac/LegacySessionStateCoding.cpp:
(WebKit::decodeSessionHistoryEntries):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/SessionState.cpp
trunk/Source/WebKit2/Shared/SessionState.h
trunk/Source/WebKit2/Shared/WebBackForwardListItem.cpp
trunk/Source/WebKit2/Shared/WebBackForwardListItem.h
trunk/Source/WebKit2/UIProcess/WebBackForwardList.cpp
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
trunk/Source/WebKit2/UIProcess/mac/LegacySessionStateCoding.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170648 => 170649)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 17:46:29 UTC (rev 170649)
@@ -1,3 +1,39 @@
+2014-07-01 Anders Carlsson
+
+Add a BackForwardListItemState struct and put the snapshot UUID there
+https://bugs.webkit.org/show_bug.cgi?id=134497
+
+Reviewed by Sam Weinig.
+
+* Shared/SessionState.cpp:
+(WebKit::PageState::encode):
+(WebKit::PageState::decode):
+(WebKit::BackForwardListItemState::encode):
+(WebKit::BackForwardListItemState::decode):
+* Shared/SessionState.h:
+* Shared/WebBackForwardListItem.cpp:
+(WebKit::WebBackForwardListItem::create):
+(WebKit::WebBackForwardListItem::WebBackForwardListItem):
+(WebKit::WebBackForwardListItem::backForwardData):
+(WebKit::WebBackForwardListItem::setBackForwardData):
+(WebKit::WebBackForwardListItem::encode):
+* Shared/WebBackForwardListItem.h:
+(WebKit::WebBackForwardListItem::setPageState):
+(WebKit::WebBackForwardListItem::setOriginalURL):
+(WebKit::WebBackForwardListItem::originalURL):
+(WebKit::WebBackForwardListItem::setURL):
+(WebKit::WebBackForwardListItem::url):
+(WebKit::WebBackForwardListItem::setTitle):
+(WebKit::WebBackForwardListItem::title):
+(WebKit::WebBackForwardListItem::setSnapshotUUID):
+(WebKit::WebBackForwardListItem::snapshotUUID):
+* UIProcess/WebBackForwardList.cpp:
+(WebKit::WebBackForwardList::restoreFromState):
+* UIProcess/WebProcessProxy.cpp:
+(WebKit::WebProcessProxy::addBackForwardItem):
+* UIProcess/mac/LegacySessionStateCoding.cpp:
+(WebKit::decodeSessionHistoryEntries):
+
2014-07-01 Yongjun Zhang
Add encodeInteger and decodeInteger for remote object encoder and decoder.
Modified: trunk/Source/WebKit2/Shared/SessionState.cpp (170648 => 170649)
--- trunk/Source/WebKit2/Shared/SessionState.cpp 2014-07-01 17:33:43 UTC (rev 170648)
+++ trunk/Source/WebKit2/Shared/SessionState.cpp 2014-07-01 17:46:29 UTC (rev 170649)
@@ -168,17 +168,33 @@
void PageState::encode(IPC::ArgumentEncoder& encoder) const
{
+encoder << title;
encoder << mainFrameState;
}
bool PageState::decode(IPC::ArgumentDecoder& decoder, PageState& result)
{
+if (!decoder.decode(result.title))
+return false;
if (!decoder.decode(result.mainFrameState))
return false;
return true;
}
+void BackForwardListItemState::encode(IPC::ArgumentEncoder& encoder) const
+{
+encoder << pageState;
+}
+
+bool BackForwardListItemState::decode(IPC::ArgumentDecoder& decoder, BackForwardListItemState& result)
+{
+if (!decoder.decode(result.pageState))
+return false;
+
+return true;
+}
+
void BackForwardListState::encode(IPC::ArgumentEncoder& encoder) const
{
encoder << items;
Modified: trunk/Source/WebKit2/Shared/SessionState.h (170648 => 170649)
--- trunk/Source/
[webkit-changes] [170648] trunk/Source/WebKit/ios
Title: [170648] trunk/Source/WebKit/ios Revision 170648 Author achristen...@apple.com Date 2014-07-01 10:33:43 -0700 (Tue, 01 Jul 2014) Log Message [iOS] Compile fix with pointer lock enabled. https://bugs.webkit.org/show_bug.cgi?id=134472 Reviewed by Pratik Solanki. * WebView/WebPDFViewPlaceholder.mm: (-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]): Add parameters required for pointer lock. Modified Paths trunk/Source/WebKit/ios/ChangeLog trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm Diff Modified: trunk/Source/WebKit/ios/ChangeLog (170647 => 170648) --- trunk/Source/WebKit/ios/ChangeLog 2014-07-01 17:29:15 UTC (rev 170647) +++ trunk/Source/WebKit/ios/ChangeLog 2014-07-01 17:33:43 UTC (rev 170648) @@ -1,3 +1,14 @@ +2014-07-01 Alex Christensen + +[iOS] Compile fix with pointer lock enabled. +https://bugs.webkit.org/show_bug.cgi?id=134472 + +Reviewed by Pratik Solanki. + +* WebView/WebPDFViewPlaceholder.mm: +(-[WebPDFViewPlaceholder simulateClickOnLinkToURL:]): +Add parameters required for pointer lock. + 2014-06-05 Benjamin Poulain [iOS][WK2] Add device orientation Modified: trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm (170647 => 170648) --- trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-07-01 17:29:15 UTC (rev 170647) +++ trunk/Source/WebKit/ios/WebView/WebPDFViewPlaceholder.mm 2014-07-01 17:33:43 UTC (rev 170648) @@ -500,7 +500,11 @@ return; // Construct an event to simulate a click. -RefPtr event = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), 0, 1, 0, 0, 0, 0, false, false, false, false, 0, 0, 0, true); +RefPtr event = MouseEvent::create(eventNames().clickEvent, true, true, currentTime(), 0, 1, 0, 0, 0, 0, +#if ENABLE(POINTER_LOCK) +0, 0, +#endif +false, false, false, false, 0, 0, 0, true); // Call to the frame loader because this is where our security checks are made. Frame* frame = core([_dataSource webFrame]); ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170647] trunk/Tools
Title: [170647] trunk/Tools
Revision 170647
Author psola...@apple.com
Date 2014-07-01 10:29:15 -0700 (Tue, 01 Jul 2014)
Log Message
Unreviewed. Adding myself to the reviewers list to make commit bot happy.
* Scripts/webkitpy/common/config/contributors.json:
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/config/contributors.json
Diff
Modified: trunk/Tools/ChangeLog (170646 => 170647)
--- trunk/Tools/ChangeLog 2014-07-01 17:25:10 UTC (rev 170646)
+++ trunk/Tools/ChangeLog 2014-07-01 17:29:15 UTC (rev 170647)
@@ -1,3 +1,9 @@
+2014-07-01 Pratik Solanki
+
+Unreviewed. Adding myself to the reviewers list to make commit bot happy.
+
+* Scripts/webkitpy/common/config/contributors.json:
+
2014-07-01 Youenn Fablet
webkit-patch apply-from-bug / apply-attachment should not ask for credentials if none are required
Modified: trunk/Tools/Scripts/webkitpy/common/config/contributors.json (170646 => 170647)
--- trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2014-07-01 17:25:10 UTC (rev 170646)
+++ trunk/Tools/Scripts/webkitpy/common/config/contributors.json 2014-07-01 17:29:15 UTC (rev 170647)
@@ -2142,14 +2142,6 @@
"pol"
]
},
- "Pratik Solanki" : {
- "emails" : [
-"psola...@apple.com"
- ],
- "nicks" : [
-"psolanki"
- ]
- },
"Pravin D" : {
"emails" : [
"prav...@webkit.org",
@@ -4364,6 +4356,14 @@
"philn"
]
},
+ "Pratik Solanki" : {
+ "emails" : [
+"psola...@apple.com"
+ ],
+ "nicks" : [
+"psolanki"
+ ]
+ },
"Richard Williamson" : {
"emails" : [
"r...@apple.com"
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170646] trunk
Title: [170646] trunk
Revision 170646
Author za...@apple.com
Date 2014-07-01 10:25:10 -0700 (Tue, 01 Jul 2014)
Log Message
Subpixel rendering: Pixel crack in breadcrumbs at devforums.apple.com.
https://bugs.webkit.org/show_bug.cgi?id=134491
Reviewed by Simon Fraser.
Do not early round geometry values, while computing background image position. It changes the final
subpixel values and that could lead to wrong snap positions.
pixelSnapBackgroundImageGeometryForPainting() takes care of geometry snapping.
Source/WebCore:
Test: fast/backgrounds/background-image-size-double-rounding.html
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
LayoutTests:
* fast/backgrounds/background-image-size-double-rounding-expected.html: Added.
* fast/backgrounds/background-image-size-double-rounding.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp
Added Paths
trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding-expected.html
trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding.html
Diff
Modified: trunk/LayoutTests/ChangeLog (170645 => 170646)
--- trunk/LayoutTests/ChangeLog 2014-07-01 17:14:35 UTC (rev 170645)
+++ trunk/LayoutTests/ChangeLog 2014-07-01 17:25:10 UTC (rev 170646)
@@ -1,3 +1,17 @@
+2014-07-01 Zalan Bujtas
+
+Subpixel rendering: Pixel crack in breadcrumbs at devforums.apple.com.
+https://bugs.webkit.org/show_bug.cgi?id=134491
+
+Reviewed by Simon Fraser.
+
+Do not early round geometry values, while computing background image position. It changes the final
+subpixel values and that could lead to wrong snap positions.
+pixelSnapBackgroundImageGeometryForPainting() takes care of geometry snapping.
+
+* fast/backgrounds/background-image-size-double-rounding-expected.html: Added.
+* fast/backgrounds/background-image-size-double-rounding.html: Added.
+
2014-06-30 Myles C. Maxfield
All Indic text is rendered as boxes on iOS
Added: trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding-expected.html (0 => 170646)
--- trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding-expected.html (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding-expected.html 2014-07-01 17:25:10 UTC (rev 170646)
@@ -0,0 +1,44 @@
+
+
+This tests that background image size is rounded properly when no-repeat attribute is present.
+
+ .outer {
+ position: absolute;
+width: 10px;
+height: 10px;
+ background-color: blue;
+ }
+
+ .inner {
+height: 10px;
+width: 10.5px;
+ background: url(data:image/png;base64,iVBORw0KGgoNSUhEUgAAACcaCAY0R0VGAXNSR0IArs4c6QlwSFlzAAAK6wAACusBgosNWgAAAq5pVFh0WE1MOmNvbS5hZG9iZS54bXAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIj4KICAgICAgICAgPHhtcDpDcmVhdGVEYXRlPjIwMDgtMDktMjBUMTA6MTY6MjNaPC94bXA6Q3JlYXRlRGF0ZT4KICAgICAgICAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBGaXJld29ya3MgQ1MzPC94bXA6Q3JlYXRvclRvb2w+CiAgICAgICAgIDx4bXA6TW9kaWZ5RGF0ZT4yMDA4LTA5LTIwVDEzOjEyOjQ4WjwveG1wOk1vZGlmeURhdGU+CiAgICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2UvcG5nPC9kYzpmb3JtYXQ+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgIDwvcmRmOkRlc2NyaXB0aW9uPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgqSlUo2TUlEQVRIDe3SsQ3AMAwDQcf7j5o2dQx4hK9UnHoCxInP965/Db09tNetpVz9DjlyVaDmbI5cFag5myNXBWrO5shVgZqzOXJVoOZsrsodgj4DFBo/NegASUVORK5CYII=);
+ }
+
+
+
+
+
+ var container = document.getElementById("container");
+ adjustment = 0.1;
+ for (i = 0; i < 20; ++i) {
+adjustment += 0.1;
+size = 8;
+for (j = 0; j < 20; ++j) {
+ size += 0.1;
+ var outer = document.createElement("div");
+ outer.className = "outer";
+ outer.style.top = (20 * i + j * adjustment) + "px";
+ outer.style.left = (20 * j + i * adjustment) + "px";
+
+ var inner = document.createElement("div");
+ inner.className = "inner";
+ inner.style.width = size + "px";
+
+ outer.appendChild(inner);
+ container.appendChild(outer);
+}
+ }
+
+
+
Added: trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding.html (0 => 170646)
--- trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding.html (rev 0)
+++ trunk/LayoutTests/fast/backgrounds/background-image-size-double-rounding.html 2014-07-01 17:25:10 UTC (rev 170646)
@@ -0,0 +1,44 @@
+
+
+This tests that background
[webkit-changes] [170645] trunk/Source/WebKit2
Title: [170645] trunk/Source/WebKit2
Revision 170645
Author commit-qu...@webkit.org
Date 2014-07-01 10:14:35 -0700 (Tue, 01 Jul 2014)
Log Message
Add encodeInteger and decodeInteger for remote object encoder and decoder.
https://bugs.webkit.org/show_bug.cgi?id=134453
In 64bit system, encodeInteger/decodeInteger is by default mapped into encodeInt64/decodeInt64. For
32bit system, they are mapped to encodeInt32/decodeInt32. However, since we don't have encodeInt32/decodeInt32
implementation in WKRemoteObjectCoder, we could hit crash in 32bit systems.
Patch by Yongjun Zhang on 2014-07-01
Reviewed by Sam Weinig.
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(-[WKRemoteObjectEncoder encodeInteger:forKey:]): Instead of creating a new number type UInt32, use encodeInt64 for
encoding NSInteger.
(-[WKRemoteObjectDecoder decodeIntegerForKey:]):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170644 => 170645)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 17:04:30 UTC (rev 170644)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 17:14:35 UTC (rev 170645)
@@ -1,3 +1,19 @@
+2014-07-01 Yongjun Zhang
+
+Add encodeInteger and decodeInteger for remote object encoder and decoder.
+https://bugs.webkit.org/show_bug.cgi?id=134453
+
+In 64bit system, encodeInteger/decodeInteger is by default mapped into encodeInt64/decodeInt64. For
+32bit system, they are mapped to encodeInt32/decodeInt32. However, since we don't have encodeInt32/decodeInt32
+implementation in WKRemoteObjectCoder, we could hit crash in 32bit systems.
+
+Reviewed by Sam Weinig.
+
+* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+(-[WKRemoteObjectEncoder encodeInteger:forKey:]): Instead of creating a new number type UInt32, use encodeInt64 for
+encoding NSInteger.
+(-[WKRemoteObjectDecoder decodeIntegerForKey:]):
+
2014-06-30 Anders Carlsson
Use an std::function for filtering session state data
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (170644 => 170645)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2014-07-01 17:04:30 UTC (rev 170644)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2014-07-01 17:14:35 UTC (rev 170645)
@@ -295,6 +295,11 @@
_currentDictionary->set(escapeKey(key), API::UInt64::create(value));
}
+- (void)encodeInteger:(NSInteger)intv forKey:(NSString *)key
+{
+return [self encodeInt64:intv forKey:key];
+}
+
- (void)encodeDouble:(double)value forKey:(NSString *)key
{
_currentDictionary->set(escapeKey(key), API::Double::create(value));
@@ -575,6 +580,11 @@
return value->value();
}
+- (NSInteger)decodeIntegerForKey:(NSString *)key
+{
+return [self decodeInt64ForKey:key];
+}
+
- (double)decodeDoubleForKey:(NSString *)key
{
const API::Double* value = _currentDictionary->get(escapeKey(key));
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170644] trunk/Source/WebKit2
Title: [170644] trunk/Source/WebKit2
Revision 170644
Author ander...@apple.com
Date 2014-07-01 10:04:30 -0700 (Tue, 01 Jul 2014)
Log Message
Use an std::function for filtering session state data
https://bugs.webkit.org/show_bug.cgi?id=134481
Reviewed by Sam Weinig.
* UIProcess/API/C/WKPage.cpp:
(WKPageCopySessionState):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _sessionState]):
* UIProcess/WebBackForwardList.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::sessionStateData):
* UIProcess/WebPageProxy.h:
* UIProcess/cf/WebBackForwardListCF.cpp:
(WebKit::WebBackForwardList::createCFDictionaryRepresentation):
* UIProcess/cf/WebPageProxyCF.cpp:
(WebKit::WebPageProxy::sessionStateData):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
trunk/Source/WebKit2/UIProcess/WebBackForwardList.h
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
trunk/Source/WebKit2/UIProcess/cf/WebBackForwardListCF.cpp
trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170643 => 170644)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 17:04:30 UTC (rev 170644)
@@ -1,3 +1,23 @@
+2014-06-30 Anders Carlsson
+
+Use an std::function for filtering session state data
+https://bugs.webkit.org/show_bug.cgi?id=134481
+
+Reviewed by Sam Weinig.
+
+* UIProcess/API/C/WKPage.cpp:
+(WKPageCopySessionState):
+* UIProcess/API/Cocoa/WKWebView.mm:
+(-[WKWebView _sessionState]):
+* UIProcess/WebBackForwardList.h:
+* UIProcess/WebPageProxy.cpp:
+(WebKit::WebPageProxy::sessionStateData):
+* UIProcess/WebPageProxy.h:
+* UIProcess/cf/WebBackForwardListCF.cpp:
+(WebKit::WebBackForwardList::createCFDictionaryRepresentation):
+* UIProcess/cf/WebPageProxyCF.cpp:
+(WebKit::WebPageProxy::sessionStateData):
+
2014-07-01 Rohit Kumar
Clean up the WebKit build from unused parameter warning in Webkit2/UIProcess module
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (170643 => 170644)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-07-01 17:04:30 UTC (rev 170644)
@@ -351,7 +351,15 @@
WKDataRef WKPageCopySessionState(WKPageRef pageRef, void *context, WKPageSessionStateFilterCallback filter)
{
-return toAPI(toImpl(pageRef)->sessionStateData(filter, context).leakRef());
+return toAPI(toImpl(pageRef)->sessionStateData([pageRef, context, filter](WebBackForwardListItem& item) {
+if (!filter(pageRef, WKPageGetSessionBackForwardListItemValueType(), toAPI(&item), context))
+return false;
+
+if (!filter(pageRef, WKPageGetSessionHistoryURLValueType(), toURLRef(item.originalURL().impl()), context))
+return false;
+
+return true;
+}).leakRef());
}
void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (170643 => 170644)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-07-01 17:04:30 UTC (rev 170644)
@@ -1560,7 +1560,7 @@
- (NSData *)_sessionState
{
-return [wrapper(*_page->sessionStateData(nullptr, nullptr).leakRef()) autorelease];
+return [wrapper(*_page->sessionStateData(nullptr).leakRef()) autorelease];
}
static void releaseNSData(unsigned char*, const void* data)
Modified: trunk/Source/WebKit2/UIProcess/WebBackForwardList.h (170643 => 170644)
--- trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/WebBackForwardList.h 2014-07-01 17:04:30 UTC (rev 170644)
@@ -73,7 +73,7 @@
PassRefPtr forwardListAsAPIArrayWithLimit(unsigned limit) const;
#if USE(CF)
-CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
+CFDictionaryRef createCFDictionaryRepresentation(std::function) const;
bool restoreFromCFDictionaryRepresentation(CFDictionaryRef);
bool restoreFromV0CFDictionaryRepresentation(CFDictionaryRef);
bool restoreFromV1CFDictionaryRepresentation(CFDictionaryRef);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170643 => 170644)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 16:59:00 UTC (rev 170643)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-01 17:04:30 UTC (rev 170644)
@@ -1834,7 +1834,7 @@
}
#if !USE(CF)
-PassRefPtr WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* /*context*/) const
+PassRefPtr WebPageProxy::sessionStateDa
[webkit-changes] [170643] trunk/Source/WebKit2
Title: [170643] trunk/Source/WebKit2
Revision 170643
Author commit-qu...@webkit.org
Date 2014-07-01 09:59:00 -0700 (Tue, 01 Jul 2014)
Log Message
Clean up the WebKit build from unused parameter warning in Webkit2/UIProcess module
https://bugs.webkit.org/show_bug.cgi?id=134294
Patch by Rohit Kumar on 2014-07-01
Reviewed by Darin Adler.
* UIProcess/API/APIUIClient.h:
(API::UIClient::reachedApplicationCacheOriginQuota):
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/APIUIClient.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170642 => 170643)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 16:45:03 UTC (rev 170642)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 16:59:00 UTC (rev 170643)
@@ -1,3 +1,13 @@
+2014-07-01 Rohit Kumar
+
+Clean up the WebKit build from unused parameter warning in Webkit2/UIProcess module
+https://bugs.webkit.org/show_bug.cgi?id=134294
+
+Reviewed by Darin Adler.
+
+* UIProcess/API/APIUIClient.h:
+(API::UIClient::reachedApplicationCacheOriginQuota):
+
2014-07-01 Brady Eidson
Build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (170642 => 170643)
--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-07-01 16:45:03 UTC (rev 170642)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-07-01 16:59:00 UTC (rev 170643)
@@ -115,7 +115,7 @@
completionHandler(currentQuota);
}
-virtual void reachedApplicationCacheOriginQuota(WebKit::WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t totalBytesNeeded, std::function completionHandler)
+virtual void reachedApplicationCacheOriginQuota(WebKit::WebPageProxy*, const WebCore::SecurityOrigin&, uint64_t currentQuota, uint64_t, std::function completionHandler)
{
completionHandler(currentQuota);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170642] trunk/Source/WebCore
Title: [170642] trunk/Source/WebCore
Revision 170642
Author psola...@apple.com
Date 2014-07-01 09:45:03 -0700 (Tue, 01 Jul 2014)
Log Message
Create NSURLRequest lazily when USE(CFNETWORK) is enabled
https://bugs.webkit.org/show_bug.cgi?id=134441
Reviewed by Andreas Kling.
No new tests. Should be covered by existing tests.
* platform/network/cf/ResourceRequest.h:
(WebCore::ResourceRequest::ResourceRequest):
(WebCore::ResourceRequest::encodingRequiresPlatformData):
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
(WebCore::ResourceRequest::setStorageSession):
* platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::nsURLRequest):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/cf/ResourceRequest.h
trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
Diff
Modified: trunk/Source/WebCore/ChangeLog (170641 => 170642)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 16:45:03 UTC (rev 170642)
@@ -1,3 +1,22 @@
+2014-07-01 Pratik Solanki
+
+Create NSURLRequest lazily when USE(CFNETWORK) is enabled
+https://bugs.webkit.org/show_bug.cgi?id=134441
+
+Reviewed by Andreas Kling.
+
+No new tests. Should be covered by existing tests.
+
+* platform/network/cf/ResourceRequest.h:
+(WebCore::ResourceRequest::ResourceRequest):
+(WebCore::ResourceRequest::encodingRequiresPlatformData):
+* platform/network/cf/ResourceRequestCFNet.cpp:
+(WebCore::ResourceRequest::doUpdatePlatformRequest):
+(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+(WebCore::ResourceRequest::setStorageSession):
+* platform/network/cocoa/ResourceRequestCocoa.mm:
+(WebCore::ResourceRequest::nsURLRequest):
+
2014-07-01 Brady Eidson
Combine the Telephone and Selection overlay controllers, updating UI behavior.
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequest.h (170641 => 170642)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequest.h 2014-07-01 16:45:03 UTC (rev 170642)
@@ -72,9 +72,6 @@
: ResourceRequestBase()
, m_cfRequest(cfRequest)
{
-#if PLATFORM(COCOA)
-updateNSURLRequest();
-#endif
}
#else
ResourceRequest(NSURLRequest *nsRequest)
@@ -90,7 +87,11 @@
void applyWebArchiveHackForMail();
#endif
#if PLATFORM(COCOA)
+#if USE(CFNETWORK)
+bool encodingRequiresPlatformData() const { return m_httpBody || m_cfRequest; }
+#else
bool encodingRequiresPlatformData() const { return m_httpBody || m_nsRequest; }
+#endif
NSURLRequest *nsURLRequest(HTTPBodyUpdatePolicy) const;
#endif
Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (170641 => 170642)
--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-07-01 16:45:03 UTC (rev 170642)
@@ -196,7 +196,7 @@
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
#endif
}
@@ -231,7 +231,7 @@
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
#endif
}
@@ -343,7 +343,7 @@
wkSetRequestStorageSession(storageSession, cfRequest);
m_cfRequest = adoptCF(cfRequest);
#if PLATFORM(COCOA)
-updateNSURLRequest();
+m_nsRequest = nullptr;
#endif
}
Modified: trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm (170641 => 170642)
--- trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-07-01 16:43:03 UTC (rev 170641)
+++ trunk/Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm 2014-07-01 16:45:03 UTC (rev 170642)
@@ -53,6 +53,10 @@
NSURLRequest *ResourceRequest::nsURLRequest(HTTPBodyUpdatePolicy bodyPolicy) const
{
updatePlatformRequest(bodyPolicy);
+#if USE(CFNETWORK)
+if (!m_nsRequest)
+const_cast(this)->updateNSURLRequest();
+#endif
return [[m_nsRequest.get() retain] autorelease];
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170641] trunk/Source/WebKit2
Title: [170641] trunk/Source/WebKit2
Revision 170641
Author beid...@apple.com
Date 2014-07-01 09:43:03 -0700 (Tue, 01 Jul 2014)
Log Message
Build fix.
Forgot to commit locally before pushing.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::servicesOverlayController): s/this/*this/
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170640 => 170641)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 16:22:01 UTC (rev 170640)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 16:43:03 UTC (rev 170641)
@@ -1,5 +1,14 @@
2014-07-01 Brady Eidson
+Build fix.
+
+Forgot to commit locally before pushing.
+
+* WebProcess/WebPage/WebPage.cpp:
+(WebKit::WebPage::servicesOverlayController): s/this/*this/
+
+2014-07-01 Brady Eidson
+
Combine the Telephone and Selection overlay controllers, updating UI behavior.
https://bugs.webkit.org/show_bug.cgi?id=134461
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170640 => 170641)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-01 16:22:01 UTC (rev 170640)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-01 16:43:03 UTC (rev 170641)
@@ -4738,7 +4738,7 @@
ServicesOverlayController& WebPage::servicesOverlayController()
{
if (!m_servicesOverlayController)
-m_servicesOverlayController = std::make_unique(this);
+m_servicesOverlayController = std::make_unique(*this);
return *m_servicesOverlayController;
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170639] trunk/Tools
Title: [170639] trunk/Tools
Revision 170639
Author commit-qu...@webkit.org
Date 2014-07-01 08:22:44 -0700 (Tue, 01 Jul 2014)
Log Message
webkit-patch apply-from-bug / apply-attachment should not ask for credentials if none are required
https://bugs.webkit.org/show_bug.cgi?id=40095
Patch by Youenn Fablet on 2014-07-01
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
(Bugzilla.fetch_attachment_contents): make a first fetch on bugzilla without authentication. If failing, use authentication (similar to fetch_bug_dictionary).
(Bugzilla):
(Bugzilla.bug_id_for_attachment_id): ditto.
Modified Paths
trunk/Tools/ChangeLog
trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py
Diff
Modified: trunk/Tools/ChangeLog (170638 => 170639)
--- trunk/Tools/ChangeLog 2014-07-01 15:16:24 UTC (rev 170638)
+++ trunk/Tools/ChangeLog 2014-07-01 15:22:44 UTC (rev 170639)
@@ -1,3 +1,15 @@
+2014-07-01 Youenn Fablet
+
+webkit-patch apply-from-bug / apply-attachment should not ask for credentials if none are required
+https://bugs.webkit.org/show_bug.cgi?id=40095
+
+Reviewed by Csaba Osztrogonác.
+
+* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+(Bugzilla.fetch_attachment_contents): make a first fetch on bugzilla without authentication. If failing, use authentication (similar to fetch_bug_dictionary).
+(Bugzilla):
+(Bugzilla.bug_id_for_attachment_id): ditto.
+
2014-07-01 Eva Balazsfalvi
[webkitpy] Refactor pluralizer in grammar.py
Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py (170638 => 170639)
--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2014-07-01 15:16:24 UTC (rev 170638)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2014-07-01 15:22:44 UTC (rev 170639)
@@ -483,9 +483,12 @@
def fetch_attachment_contents(self, attachment_id):
attachment_url = self.attachment_url_for_id(attachment_id)
-# We need to authenticate to download patches from security bugs.
-self.authenticate()
-return self.browser.open(attachment_url).read()
+# We may need to authenticate to download patches from security bugs.
+try:
+return self.browser.open(attachment_url).read()
+except:
+self.authenticate()
+return self.browser.open(attachment_url).read()
def _parse_bug_id_from_attachment_page(self, page):
# The "Up" relation happens to point to the bug.
@@ -498,11 +501,13 @@
return int(match.group('bug_id'))
def bug_id_for_attachment_id(self, attachment_id):
-self.authenticate()
-
attachment_url = self.attachment_url_for_id(attachment_id, 'edit')
_log.info("Fetching: %s" % attachment_url)
-page = self.browser.open(attachment_url)
+try:
+page = self.browser.open(attachment_url)
+except:
+self.authenticate()
+page = self.browser.open(attachment_url)
return self._parse_bug_id_from_attachment_page(page)
# FIXME: This should just return Attachment(id), which should be able to
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [170638] trunk/Source/WebCore
Title: [170638] trunk/Source/WebCore
Revision 170638
Author an...@apple.com
Date 2014-07-01 08:16:24 -0700 (Tue, 01 Jul 2014)
Log Message
REGRESSION(160908): vube.com video won't play after going into and out of fullscreen
https://bugs.webkit.org/show_bug.cgi?id=134489
Reviewed by Zalan Bujtas.
Test: fullscreen/full-screen-plugin.html
It is difficult to restore the render tree correctly in all cases after removing a full screen
renderer from the tree. r160908 avoided dealing with this by simply always reconstructing the subtree.
Unfortunately plugin lifetime is currently tied to its renderer so this would cause the plugin to restart.
With this patch we avoid reconstruction in normal cases and only force it if the render tree is complicated.
* dom/Document.cpp:
(WebCore::unwrapFullScreenRenderer):
Force reconstruction conditionally.
(WebCore::Document::webkitWillEnterFullScreenForElement):
(WebCore::Document::webkitDidExitFullScreenForElement):
* rendering/RenderFullScreen.cpp:
(WebCore::RenderFullScreen::wrapRenderer):
(WebCore::RenderFullScreen::unwrapRenderer):
Deal with the simple case of single child, possibly in anonymous wrapper.
In other cases request reconstruction.
This is covered by the existing fullscreen tests.
* rendering/RenderFullScreen.h:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/dom/Document.cpp
trunk/Source/WebCore/rendering/RenderFullScreen.cpp
trunk/Source/WebCore/rendering/RenderFullScreen.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (170637 => 170638)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 13:10:18 UTC (rev 170637)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 15:16:24 UTC (rev 170638)
@@ -1,3 +1,35 @@
+2014-07-01 Antti Koivisto
+
+REGRESSION(160908): vube.com video won't play after going into and out of fullscreen
+https://bugs.webkit.org/show_bug.cgi?id=134489
+
+Reviewed by Zalan Bujtas.
+
+Test: fullscreen/full-screen-plugin.html
+
+It is difficult to restore the render tree correctly in all cases after removing a full screen
+renderer from the tree. r160908 avoided dealing with this by simply always reconstructing the subtree.
+Unfortunately plugin lifetime is currently tied to its renderer so this would cause the plugin to restart.
+
+With this patch we avoid reconstruction in normal cases and only force it if the render tree is complicated.
+
+* dom/Document.cpp:
+(WebCore::unwrapFullScreenRenderer):
+
+Force reconstruction conditionally.
+
+(WebCore::Document::webkitWillEnterFullScreenForElement):
+(WebCore::Document::webkitDidExitFullScreenForElement):
+* rendering/RenderFullScreen.cpp:
+(WebCore::RenderFullScreen::wrapRenderer):
+(WebCore::RenderFullScreen::unwrapRenderer):
+
+Deal with the simple case of single child, possibly in anonymous wrapper.
+In other cases request reconstruction.
+This is covered by the existing fullscreen tests.
+
+* rendering/RenderFullScreen.h:
+
2014-07-01 Zan Dobersek
Remove remaining Vector<> copies in WebCore accessibility code
Modified: trunk/Source/WebCore/dom/Document.cpp (170637 => 170638)
--- trunk/Source/WebCore/dom/Document.cpp 2014-07-01 13:10:18 UTC (rev 170637)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-07-01 15:16:24 UTC (rev 170638)
@@ -5311,6 +5311,17 @@
return isAttributeOnAllOwners(allowfullscreenAttr, webkitallowfullscreenAttr, ownerElement());
}
+static void unwrapFullScreenRenderer(RenderFullScreen* fullScreenRenderer, Element* fullScreenElement)
+{
+if (!fullScreenRenderer)
+return;
+bool requiresRenderTreeRebuild;
+fullScreenRenderer->unwrapRenderer(requiresRenderTreeRebuild);
+
+if (requiresRenderTreeRebuild && fullScreenElement && fullScreenElement->parentNode())
+fullScreenElement->parentNode()->setNeedsStyleRecalc(ReconstructRenderTree);
+}
+
void Document::webkitWillEnterFullScreenForElement(Element* element)
{
if (!hasLivingRenderTree() || inPageCache())
@@ -5324,8 +5335,7 @@
ASSERT(page()->settings().fullScreenEnabled());
-if (m_fullScreenRenderer)
-m_fullScreenRenderer->unwrapRenderer();
+unwrapFullScreenRenderer(m_fullScreenRenderer, m_fullScreenElement.get());
m_fullScreenElement = element;
@@ -5388,16 +5398,12 @@
m_fullScreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
m_areKeysEnabledInFullScreen = false;
-
-if (m_fullScreenRenderer)
-m_fullScreenRenderer->unwrapRenderer();
-if (m_fullScreenElement->parentNode())
-m_fullScreenElement->parentNode()->setNeedsStyleRecalc(ReconstructRenderTree);
+unwrapFullScreenRenderer(m_fullScreenRenderer, m_fullScreenElement.get());
m_fullScreenElement = nullptr;
scheduleForcedStyleReca
[webkit-changes] [170637] trunk/Tools
Title: [170637] trunk/Tools Revision 170637 Author commit-qu...@webkit.org Date 2014-07-01 06:10:18 -0700 (Tue, 01 Jul 2014) Log Message [webkitpy] Refactor pluralizer in grammar.py https://bugs.webkit.org/show_bug.cgi?id=133067 Patch by Eva Balazsfalvi on 2014-07-01 Reviewed by Csaba Osztrogonác. * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py: (LayoutTestRunner.run_tests): * Scripts/webkitpy/layout_tests/controllers/manager.py: (Manager.run): * Scripts/webkitpy/layout_tests/views/printing.py: (Printer.print_found): (Printer.print_workers_and_shards): (Printer._print_one_line_summary): * Scripts/webkitpy/test/printer.py: (Printer.print_result): * Scripts/webkitpy/tool/bot/feeders.py: (EWSFeeder.feed): * Scripts/webkitpy/tool/bot/flakytestreporter.py: (FlakyTestReporter._lookup_bug_for_flaky_test): * Scripts/webkitpy/tool/bot/irc_command.py: (Rollout._check_diff_failure): * Scripts/webkitpy/tool/bot/irc_command_unittest.py: (IRCCommandTest.test_rollout): * Scripts/webkitpy/tool/commands/download.py: (AbstractPatchProcessingCommand._process_patch.execute): (ProcessBugsMixin._fetch_list_of_patches_to_process): (ProcessURLsMixin._fetch_list_of_patches_to_process): * Scripts/webkitpy/tool/commands/queries.py: (WhatBroke.execute): * Scripts/webkitpy/tool/commands/suggestnominations.py: (SuggestNominations._print_nominations): (SuggestNominations._print_counts): * Scripts/webkitpy/tool/commands/suggestnominations_unittest.py: (_make_options): (test_basic): (test_with_verbose): * Scripts/webkitpy/tool/commands/upload.py: (PostCommits.execute): * Scripts/webkitpy/tool/grammar.py: (pluralize): * Scripts/webkitpy/tool/grammar_unittest.py: (GrammarTest.test_join_with_separators): (GrammarTest): (GrammarTest.test_plural): (GrammarTest.test_pluralize): * Scripts/webkitpy/tool/multicommandtool.py: (Command.check_arguments_and_execute): * Scripts/webkitpy/tool/steps/obsoletepatches.py: (ObsoletePatches.run): * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py: (PrepareChangeLogForRevert._message_for_revert): Modified Paths trunk/Tools/ChangeLog trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py trunk/Tools/Scripts/webkitpy/test/printer.py trunk/Tools/Scripts/webkitpy/tool/bot/feeders.py trunk/Tools/Scripts/webkitpy/tool/bot/flakytestreporter.py trunk/Tools/Scripts/webkitpy/tool/bot/irc_command.py trunk/Tools/Scripts/webkitpy/tool/bot/irc_command_unittest.py trunk/Tools/Scripts/webkitpy/tool/commands/download.py trunk/Tools/Scripts/webkitpy/tool/commands/queries.py trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations.py trunk/Tools/Scripts/webkitpy/tool/commands/suggestnominations_unittest.py trunk/Tools/Scripts/webkitpy/tool/commands/upload.py trunk/Tools/Scripts/webkitpy/tool/grammar.py trunk/Tools/Scripts/webkitpy/tool/grammar_unittest.py trunk/Tools/Scripts/webkitpy/tool/multicommandtool.py trunk/Tools/Scripts/webkitpy/tool/steps/obsoletepatches.py trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py Diff Modified: trunk/Tools/ChangeLog (170636 => 170637) --- trunk/Tools/ChangeLog 2014-07-01 12:07:08 UTC (rev 170636) +++ trunk/Tools/ChangeLog 2014-07-01 13:10:18 UTC (rev 170637) @@ -1,3 +1,57 @@ +2014-07-01 Eva Balazsfalvi + +[webkitpy] Refactor pluralizer in grammar.py +https://bugs.webkit.org/show_bug.cgi?id=133067 + +Reviewed by Csaba Osztrogonác. + +* Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py: +(LayoutTestRunner.run_tests): +* Scripts/webkitpy/layout_tests/controllers/manager.py: +(Manager.run): +* Scripts/webkitpy/layout_tests/views/printing.py: +(Printer.print_found): +(Printer.print_workers_and_shards): +(Printer._print_one_line_summary): +* Scripts/webkitpy/test/printer.py: +(Printer.print_result): +* Scripts/webkitpy/tool/bot/feeders.py: +(EWSFeeder.feed): +* Scripts/webkitpy/tool/bot/flakytestreporter.py: +(FlakyTestReporter._lookup_bug_for_flaky_test): +* Scripts/webkitpy/tool/bot/irc_command.py: +(Rollout._check_diff_failure): +* Scripts/webkitpy/tool/bot/irc_command_unittest.py: +(IRCCommandTest.test_rollout): +* Scripts/webkitpy/tool/commands/download.py: +(AbstractPatchProcessingCommand._process_patch.execute): +(ProcessBugsMixin._fetch_list_of_patches_to_process): +(ProcessURLsMixin._fetch_list_of_patches_to_process): +* Scripts/webkitpy/tool/commands/queries.py: +(WhatBroke.execute): +* Scripts/webkitpy/tool/commands/suggestnominations.py: +(SuggestNominations._print_nominations): +(SuggestNominations._print_counts): +* Scripts/webkitpy/tool/commands/suggestnominations_unittest.py: +(_make_options): +
[webkit-changes] [170636] releases/WebKitGTK/webkit-2.4
Title: [170636] releases/WebKitGTK/webkit-2.4 Revision 170636 Author carlo...@webkit.org Date 2014-07-01 05:07:08 -0700 (Tue, 01 Jul 2014) Log Message Merge r169799 - [GTK] Use a different user agent string depending on the site https://bugs.webkit.org/show_bug.cgi?id=132681 Reviewed by Anders Carlsson. Source/WebCore: We have changed the user agent string several times to try to fix broken websites that require specific things in the UA string to properly work. But everytime we change the UA string to fix a website we break others. We could use different UA string depending on the website. UserAgentGtk code has also been cleaned up, using NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL and avoiding unneeded conversions to UTF-8. * platform/gtk/UserAgentGtk.cpp: (WebCore::UserAgentQuirks::UserAgentQuirks): New helper private class to handle user agent quirks. (WebCore::UserAgentQuirks::add): (WebCore::UserAgentQuirks::contains): (WebCore::UserAgentQuirks::isEmpty): (WebCore::platformForUAString): Bring back this method that was removed to always pretend to be Macintosh. (WebCore::platformVersionForUAString): Return a different platform version depending on the actual platform. (WebCore::versionForUAString): Return the WebKit version. (WebCore::buildUserAgentString): Helper function to build the user agent taking into account the UserAgentQuirks received. (WebCore::standardUserAgentStatic): Standard user agent string when no quirks are present. (WebCore::standardUserAgent): (WebCore::standardUserAgentForURL): New method that returns the user agent string for the given URL. * platform/gtk/UserAgentGtk.h: Source/WebKit2: * UIProcess/API/gtk/WebKitSettings.cpp: (webkit_settings_class_init): Enable site specific quirks setting by default. * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: (WebKit::WebFrameLoaderClient::userAgent): Pass the given URL to WebPage. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::userAgent): Try to get the user agent for the URL received falling back to the current one otherwise. * WebProcess/WebPage/WebPage.h: (WebKit::WebPage::platformUserAgent): Added. * WebProcess/WebPage/efl/WebPageEfl.cpp: (WebKit::WebPage::platformUserAgent): Return null String. * WebProcess/WebPage/gtk/WebPageGtk.cpp: (WebKit::WebPage::platformUserAgent): Use WebCore::standardUserAgentForURL() when site specific quirks setting is enabled. * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::platformUserAgent): Return null String. * WebProcess/WebPage/mac/WebPageMac.mm: (WebKit::WebPage::platformUserAgent): Return null String. Tools: Add a unit test to check user agent quirks. * TestWebKitAPI/PlatformGTK.cmake: * TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp: Added. (TestWebKitAPI::TEST): * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: (testWebKitSettings): Site specific quirks setting is now enabled by default. Modified Paths releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/UserAgentGtk.cpp releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/UserAgentGtk.h releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.cpp releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/WebPage.h releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm releases/WebKitGTK/webkit-2.4/Tools/ChangeLog releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/GNUmakefile.am releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp Added Paths releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebCore/gtk/ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebCore/gtk/UserAgentQuirks.cpp Diff Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (170635 => 170636) --- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-01 11:32:36 UTC (rev 170635) +++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-01 12:07:08 UTC (rev 170636) @@ -1,3 +1,38 @@ +2014-06-11 Carlos Garcia Campos + +[GTK] Use a different user agent string depending on the site +https://bugs.webkit.org/show_bug.cgi?id=132681 + +Reviewed by Anders Carlsson. + +We have changed the user agent string several times to try to fix +broken websites that require specific things in the UA string to +properly work. But everytime we change the UA string to fix a +website we break others. We could use different UA string +depending on the website. UserAgentGtk code has also be
[webkit-changes] [170635] trunk/Source/WebKit2
Title: [170635] trunk/Source/WebKit2 Revision 170635 Author zandober...@gmail.com Date 2014-07-01 04:32:36 -0700 (Tue, 01 Jul 2014) Log Message [WK2] IPC messages' arguments() method returns const std::tuple<> copies https://bugs.webkit.org/show_bug.cgi?id=131975 Reviewed by Darin Adler. The arguments() method of the different IPC message objects should return a const reference to the std::tuple<> containing the arguments, instead of a const value. This avoids copying the std::tuple<> every time the arguments are encoded, and works best with the ArgumentEncoder::encode>(const std::tuple<...>&) template instantiation. The unit test baselines are updated accordingly. * Scripts/webkit2/LegacyMessages-expected.h: (Messages::WebPage::LoadURL::arguments): (Messages::WebPage::LoadSomething::arguments): (Messages::WebPage::TouchEvent::arguments): (Messages::WebPage::AddEvent::arguments): (Messages::WebPage::LoadSomethingElse::arguments): (Messages::WebPage::DidReceivePolicyDecision::arguments): (Messages::WebPage::Close::arguments): (Messages::WebPage::PreferencesDidChange::arguments): (Messages::WebPage::SendDoubleAndFloat::arguments): (Messages::WebPage::SendInts::arguments): (Messages::WebPage::CreatePlugin::arguments): (Messages::WebPage::RunJavaScriptAlert::arguments): (Messages::WebPage::GetPlugins::arguments): (Messages::WebPage::GetPluginProcessConnection::arguments): (Messages::WebPage::TestMultipleAttributes::arguments): (Messages::WebPage::TestParameterAttributes::arguments): (Messages::WebPage::TemplateTest::arguments): (Messages::WebPage::SetVideoLayerID::arguments): (Messages::WebPage::DidCreateWebProcessConnection::arguments): (Messages::WebPage::InterpretKeyEvent::arguments): (Messages::WebPage::DeprecatedOperation::arguments): (Messages::WebPage::ExperimentalOperation::arguments): * Scripts/webkit2/Messages-expected.h: (Messages::WebPage::LoadURL::arguments): (Messages::WebPage::LoadSomething::arguments): (Messages::WebPage::TouchEvent::arguments): (Messages::WebPage::AddEvent::arguments): (Messages::WebPage::LoadSomethingElse::arguments): (Messages::WebPage::DidReceivePolicyDecision::arguments): (Messages::WebPage::Close::arguments): (Messages::WebPage::PreferencesDidChange::arguments): (Messages::WebPage::SendDoubleAndFloat::arguments): (Messages::WebPage::SendInts::arguments): (Messages::WebPage::CreatePlugin::arguments): (Messages::WebPage::RunJavaScriptAlert::arguments): (Messages::WebPage::GetPlugins::arguments): (Messages::WebPage::GetPluginProcessConnection::arguments): (Messages::WebPage::TestMultipleAttributes::arguments): (Messages::WebPage::TestParameterAttributes::arguments): (Messages::WebPage::TemplateTest::arguments): (Messages::WebPage::SetVideoLayerID::arguments): (Messages::WebPage::DidCreateWebProcessConnection::arguments): (Messages::WebPage::InterpretKeyEvent::arguments): (Messages::WebPage::DeprecatedOperation::arguments): (Messages::WebPage::ExperimentalOperation::arguments): * Scripts/webkit2/MessagesSuperclass-expected.h: (Messages::WebPage::LoadURL::arguments): * Scripts/webkit2/messages.py: (message_to_struct_declaration): Modified Paths trunk/Source/WebKit2/ChangeLog trunk/Source/WebKit2/Scripts/webkit2/LegacyMessages-expected.h trunk/Source/WebKit2/Scripts/webkit2/Messages-expected.h trunk/Source/WebKit2/Scripts/webkit2/MessagesSuperclass-expected.h trunk/Source/WebKit2/Scripts/webkit2/messages.py Diff Modified: trunk/Source/WebKit2/ChangeLog (170634 => 170635) --- trunk/Source/WebKit2/ChangeLog 2014-07-01 11:29:24 UTC (rev 170634) +++ trunk/Source/WebKit2/ChangeLog 2014-07-01 11:32:36 UTC (rev 170635) @@ -1,3 +1,68 @@ +2014-07-01 Zan Dobersek + +[WK2] IPC messages' arguments() method returns const std::tuple<> copies +https://bugs.webkit.org/show_bug.cgi?id=131975 + +Reviewed by Darin Adler. + +The arguments() method of the different IPC message objects should return a const reference +to the std::tuple<> containing the arguments, instead of a const value. This avoids copying +the std::tuple<> every time the arguments are encoded, and works best with the +ArgumentEncoder::encode>(const std::tuple<...>&) template instantiation. + +The unit test baselines are updated accordingly. + +* Scripts/webkit2/LegacyMessages-expected.h: +(Messages::WebPage::LoadURL::arguments): +(Messages::WebPage::LoadSomething::arguments): +(Messages::WebPage::TouchEvent::arguments): +(Messages::WebPage::AddEvent::arguments): +(Messages::WebPage::LoadSomethingElse::arguments): +(Messages::WebPage::DidReceivePolicyDecision::arguments): +(Messages::WebPage::Close::arguments): +(Messages::WebPage::PreferencesDidChange::arguments): +(Messages::WebPage::SendDoubleAndFloat::arguments): +(Messages::WebPage::SendInts::arguments): +(Messages::WebPage::CreatePlugin::arguments): +(Messages::WebPage::RunJavaScriptAl
[webkit-changes] [170634] trunk/Source/WebCore
Title: [170634] trunk/Source/WebCore
Revision 170634
Author zandober...@gmail.com
Date 2014-07-01 04:29:24 -0700 (Tue, 01 Jul 2014)
Log Message
Remove remaining Vector<> copies in WebCore accessibility code
https://bugs.webkit.org/show_bug.cgi?id=133263
Reviewed by Darin Adler.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::notificationPostTimerFired): Don't copy the Vector member and
then clear it -- move it into the local variable instead.
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::ariaLabeledByText): Move the axElements Vector into
the AccessibilityText constructor.
(WebCore::AccessibilityNodeObject::stringValue): Create a const reference to the Vector of
HTMLSelectElement's list items instead of copying it.
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityText::AccessibilityText): Take the Vector parameter by non-const
value and move it into the member variable.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::stringValue): Create a const reference to the Vector
of HTMLSelectElement's list items instead of copying it.
(WebCore::AccessibilityRenderObject::ariaSelectedRows): Wrap the AccessibilityChildrenVector
iteration in a lambda. Use it to iterate over either the newly-constructed Vector (in case
the object has the tree role) or the reference to the vector returned by
AccessibilityTable::rows() (in case the object is an AccessibilityTable instance).
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/accessibility/AXObjectCache.cpp
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
trunk/Source/WebCore/accessibility/AccessibilityObject.h
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (170633 => 170634)
--- trunk/Source/WebCore/ChangeLog 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 11:29:24 UTC (rev 170634)
@@ -1,3 +1,29 @@
+2014-07-01 Zan Dobersek
+
+Remove remaining Vector<> copies in WebCore accessibility code
+https://bugs.webkit.org/show_bug.cgi?id=133263
+
+Reviewed by Darin Adler.
+
+* accessibility/AXObjectCache.cpp:
+(WebCore::AXObjectCache::notificationPostTimerFired): Don't copy the Vector member and
+then clear it -- move it into the local variable instead.
+* accessibility/AccessibilityNodeObject.cpp:
+(WebCore::AccessibilityNodeObject::ariaLabeledByText): Move the axElements Vector into
+the AccessibilityText constructor.
+(WebCore::AccessibilityNodeObject::stringValue): Create a const reference to the Vector of
+HTMLSelectElement's list items instead of copying it.
+* accessibility/AccessibilityObject.h:
+(WebCore::AccessibilityText::AccessibilityText): Take the Vector parameter by non-const
+value and move it into the member variable.
+* accessibility/AccessibilityRenderObject.cpp:
+(WebCore::AccessibilityRenderObject::stringValue): Create a const reference to the Vector
+of HTMLSelectElement's list items instead of copying it.
+(WebCore::AccessibilityRenderObject::ariaSelectedRows): Wrap the AccessibilityChildrenVector
+iteration in a lambda. Use it to iterate over either the newly-constructed Vector (in case
+the object has the tree role) or the reference to the vector returned by
+AccessibilityTable::rows() (in case the object is an AccessibilityTable instance).
+
2014-06-30 Commit Queue
Unreviewed, rolling out r170605.
Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (170633 => 170634)
--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-07-01 11:29:24 UTC (rev 170634)
@@ -704,8 +704,7 @@
// In DRT, posting notifications has a tendency to immediately queue up other notifications, which can lead to unexpected behavior
// when the notification list is cleared at the end. Instead copy this list at the start.
-auto notifications = m_notificationsToPost;
-m_notificationsToPost.clear();
+auto notifications = std::move(m_notificationsToPost);
for (const auto& note : notifications) {
AccessibilityObject* obj = note.first.get();
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (170633 => 170634)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-07-01 11:29:24 UTC (rev 170634)
@@ -1438,7 +1438,7 @@
axElements.append(axElement);
}
-textOrder.append(AccessibilityText(ariaLabeledBy, AlternativeText, axElements));
+textOrder.append(AccessibilityText(ariaLabeledBy, AlternativeText, std::move(axElements)));
[webkit-changes] [170633] trunk/Source/WebKit2
Title: [170633] trunk/Source/WebKit2
Revision 170633
Author commit-qu...@webkit.org
Date 2014-07-01 02:10:56 -0700 (Tue, 01 Jul 2014)
Log Message
[GTK] Annotations for WebResource.get_data produce wrong signature in Vala binding
https://bugs.webkit.org/show_bug.cgi?id=134476
Patch by Evan Nemerson on 2014-07-01
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitWebResource.cpp: Add array length and
element-type annotations to return value of webkit_web_resource_get_data_finish().
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170632 => 170633)
--- trunk/Source/WebKit2/ChangeLog 2014-07-01 08:17:46 UTC (rev 170632)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-01 09:10:56 UTC (rev 170633)
@@ -1,3 +1,13 @@
+2014-07-01 Evan Nemerson
+
+[GTK] Annotations for WebResource.get_data produce wrong signature in Vala binding
+https://bugs.webkit.org/show_bug.cgi?id=134476
+
+Reviewed by Carlos Garcia Campos.
+
+* UIProcess/API/gtk/WebKitWebResource.cpp: Add array length and
+element-type annotations to return value of webkit_web_resource_get_data_finish().
+
2014-07-01 Gyuyoung Kim
[WK2] Can not convert ‘sessionState.WebKit::SessionState::provisionalURL’ from ‘WebCore::URL’ to ‘bool’
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (170632 => 170633)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-07-01 08:17:46 UTC (rev 170632)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-07-01 09:10:56 UTC (rev 170633)
@@ -355,13 +355,14 @@
* webkit_web_resource_get_data_finish:
* @resource: a #WebKitWebResource
* @result: a #GAsyncResult
- * @length: (out): return location for the length of the resource data
+ * @length: (out) (allow-none): return location for the length of the resource data
* @error: return location for error or %NULL to ignore
*
* Finish an asynchronous operation started with webkit_web_resource_get_data().
*
- * Returns: (transfer full): a string with the data of @resource, or %NULL in case
- *of error. if @length is not %NULL, the size of the data will be assigned to it.
+ * Returns: (transfer full) (array length=length) (element-type guint8): a
+ *string with the data of @resource, or %NULL in case of error. if @length
+ *is not %NULL, the size of the data will be assigned to it.
*/
guchar* webkit_web_resource_get_data_finish(WebKitWebResource* resource, GAsyncResult* result, gsize* length, GError** error)
{
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
