[webkit-changes] [138228] trunk
Title: [138228] trunk
Revision 138228
Author yu...@chromium.org
Date 2012-12-19 22:41:31 -0800 (Wed, 19 Dec 2012)
Log Message
Web Inspector: deny access from injected script to nodes from document with another origin
https://bugs.webkit.org/show_bug.cgi?id=105423
Reviewed by Pavel Feldman.
Source/WebCore:
Check that calling context can access the document inspected node belong to
before returning JS wrapper for the node.
Test: http/tests/inspector-protocol/access-inspected-object.html
* bindings/js/JSInjectedScriptHostCustom.cpp:
(WebCore::JSInjectedScriptHost::inspectedObject):
* bindings/v8/custom/V8InjectedScriptHostCustom.cpp:
(WebCore::InjectedScriptHost::nodeAsScriptValue):
LayoutTests:
Test that $0 is ineaccible in the main frame if it is a node from an iframe that
is not accassible beacause of cross origin access checks.
* http/tests/inspector-protocol/access-inspected-object-expected.txt: Added.
* http/tests/inspector-protocol/access-inspected-object.html: Added.
* http/tests/inspector-protocol/resources/test-page.html: Added.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp
trunk/Source/WebCore/bindings/v8/custom/V8InjectedScriptHostCustom.cpp
Added Paths
trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object-expected.txt
trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object.html
trunk/LayoutTests/http/tests/inspector-protocol/resources/test-page.html
Diff
Modified: trunk/LayoutTests/ChangeLog (138227 => 138228)
--- trunk/LayoutTests/ChangeLog 2012-12-20 06:08:11 UTC (rev 138227)
+++ trunk/LayoutTests/ChangeLog 2012-12-20 06:41:31 UTC (rev 138228)
@@ -1,3 +1,17 @@
+2012-12-19 Yury Semikhatsky
+
+Web Inspector: deny access from injected script to nodes from document with another origin
+https://bugs.webkit.org/show_bug.cgi?id=105423
+
+Reviewed by Pavel Feldman.
+
+Test that $0 is ineaccible in the main frame if it is a node from an iframe that
+is not accassible beacause of cross origin access checks.
+
+* http/tests/inspector-protocol/access-inspected-object-expected.txt: Added.
+* http/tests/inspector-protocol/access-inspected-object.html: Added.
+* http/tests/inspector-protocol/resources/test-page.html: Added.
+
2012-12-19 Eric Carlson
Crash in TextTrack::trackIndexRelativeToRenderedTracks()
Added: trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object-expected.txt (0 => 138228)
--- trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object-expected.txt 2012-12-20 06:41:31 UTC (rev 138228)
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: Unsafe _javascript_ attempt to access frame with URL http://localhost:8000/inspector-protocol/resources/test-page.html from frame with URL http://127.0.0.1:8000/inspector-protocol/access-inspected-object.html. Domains, protocols and ports must match.
+
+Test that code evaluated in the main frame cannot access $0 that resolves into a node in a frame from a different domain. Bug 105423.
+
+
Property changes on: trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object-expected.txt
___
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object.html (0 => 138228)
--- trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector-protocol/access-inspected-object.html 2012-12-20 06:41:31 UTC (rev 138228)
@@ -0,0 +1,75 @@
+
+
+
+if (window.testRunner) {
+testRunner.dumpAsText();
+testRunner.waitUntilDone();
+}
+
+function test()
+{
+InspectorTest.sendCommand("DOM.getDocument", {}, didGetDocument);
+
+function didGetDocument(messageObject)
+{
+InspectorTest.sendCommand("DOM.querySelector", {
+"nodeId": messageObject.result.root.nodeId,
+"selector": "iframe#myframe"
+}, didFindIframe);
+InspectorTest.eventHandler["DOM.setChildNodes"] = iframeRequestHandler;
+}
+
+function didFindIframe(messageObject)
+{
+if (messageObject.error) {
+InspectorTest.log("FAIL: " + messageObject.error);
+InspectorTest.completeTest();
+}
+}
+
+function iframeRequestHandler(messageObject)
+{
+var node = messageObject.params.nodes[0];
+if (!node || node.nodeName !== "IFRAME")
+return;
+InspectorTest.eventHandler["DOM.setChildNodes"] = null;
+InspectorTest.sendCommand("DOM.querySelector", {
+"nodeId": node.contentDocument.nodeId,
+"selector": "div#rootDiv"
+}, didFindDiv);
+}
+
+func
[webkit-changes] [138227] trunk/Source/WebCore
Title: [138227] trunk/Source/WebCore
Revision 138227
Author tha...@chromium.org
Date 2012-12-19 22:08:11 -0800 (Wed, 19 Dec 2012)
Log Message
Remove slighly confusing "} if" pattern
https://bugs.webkit.org/show_bug.cgi?id=105492
Reviewed by Andreas Kling.
ADVANCE_TO ends in a goto statement, so this doesn't change behavior.
* html/parser/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::nextToken):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (138226 => 138227)
--- trunk/Source/WebCore/ChangeLog 2012-12-20 05:57:47 UTC (rev 138226)
+++ trunk/Source/WebCore/ChangeLog 2012-12-20 06:08:11 UTC (rev 138227)
@@ -1,3 +1,15 @@
+2012-12-19 Nico Weber
+
+Remove slighly confusing "} if" pattern
+https://bugs.webkit.org/show_bug.cgi?id=105492
+
+Reviewed by Andreas Kling.
+
+ADVANCE_TO ends in a goto statement, so this doesn't change behavior.
+
+* html/parser/HTMLTokenizer.cpp:
+(WebCore::HTMLTokenizer::nextToken):
+
2012-12-19 Mark Pilgrim
[Chromium] Remove idbFactory from PlatformSupport
Modified: trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp (138226 => 138227)
--- trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp 2012-12-20 05:57:47 UTC (rev 138226)
+++ trunk/Source/WebCore/html/parser/HTMLTokenizer.cpp 2012-12-20 06:08:11 UTC (rev 138227)
@@ -348,7 +348,7 @@
else if (isASCIIUpper(cc)) {
m_token->appendToName(toLowerCase(cc));
HTML_ADVANCE_TO(TagNameState);
-} if (cc == InputStreamPreprocessor::endOfFileMarker) {
+} else if (cc == InputStreamPreprocessor::endOfFileMarker) {
parseError();
HTML_RECONSUME_IN(DataState);
} else {
@@ -616,7 +616,7 @@
else if (cc == '>') {
bufferCharacter(cc);
HTML_ADVANCE_TO(ScriptDataState);
-} if (cc == InputStreamPreprocessor::endOfFileMarker) {
+} else if (cc == InputStreamPreprocessor::endOfFileMarker) {
parseError();
HTML_RECONSUME_IN(DataState);
} else {
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138226] trunk
Title: [138226] trunk
Revision 138226
Author commit-qu...@webkit.org
Date 2012-12-19 21:57:47 -0800 (Wed, 19 Dec 2012)
Log Message
Adopt new assertion SPI for process suppression on Mac
https://bugs.webkit.org/show_bug.cgi?id=105378
Patch by Kiran Muppala on 2012-12-19
Reviewed by Mark Rowe.
Source/WebKit2:
Process suppression for WebKit2 child processes is currently enabled or disabled using AutomaticTermination.
This should be replaced with a new assertion SPI specific to process suppression.
* Shared/ChildProcess.cpp:
(WebKit::ChildProcess::ChildProcess): Remove unused member variable m_applicationIsOccluded.
* Shared/ChildProcess.h:
(WebKit::ChildProcess::applicationIsOccluded): Infer occlusion state from m_processVisibleAssertion.
* Shared/mac/ChildProcessMac.mm:
(WebKit::ChildProcess::setApplicationIsOccluded): Use applicationIsOccluded() accessor to check if the
occlusion state has changed and take or release a process visible assertion accordingly.
(WebKit::ChildProcess::platformInitialize): Remove call to initializeTimerCoalescingPolicy(), since taking
a process visible assertion also sets the timer coalescing policy appropriately. Set the occlusion
state to false on initialization.
WebKitLibraries:
Add WKNSProcessInfoProcessAssertionWithTypes().
* WebKitSystemInterface.h:
Modified Paths
trunk/Source/WebKit2/ChangeLog
trunk/Source/WebKit2/Shared/ChildProcess.cpp
trunk/Source/WebKit2/Shared/ChildProcess.h
trunk/Source/WebKit2/Shared/mac/ChildProcessMac.mm
trunk/WebKitLibraries/ChangeLog
trunk/WebKitLibraries/WebKitSystemInterface.h
Diff
Modified: trunk/Source/WebKit2/ChangeLog (138225 => 138226)
--- trunk/Source/WebKit2/ChangeLog 2012-12-20 05:52:36 UTC (rev 138225)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-20 05:57:47 UTC (rev 138226)
@@ -1,3 +1,24 @@
+2012-12-19 Kiran Muppala
+
+Adopt new assertion SPI for process suppression on Mac
+https://bugs.webkit.org/show_bug.cgi?id=105378
+
+Reviewed by Mark Rowe.
+
+Process suppression for WebKit2 child processes is currently enabled or disabled using AutomaticTermination.
+This should be replaced with a new assertion SPI specific to process suppression.
+
+* Shared/ChildProcess.cpp:
+(WebKit::ChildProcess::ChildProcess): Remove unused member variable m_applicationIsOccluded.
+* Shared/ChildProcess.h:
+(WebKit::ChildProcess::applicationIsOccluded): Infer occlusion state from m_processVisibleAssertion.
+* Shared/mac/ChildProcessMac.mm:
+(WebKit::ChildProcess::setApplicationIsOccluded): Use applicationIsOccluded() accessor to check if the
+occlusion state has changed and take or release a process visible assertion accordingly.
+(WebKit::ChildProcess::platformInitialize): Remove call to initializeTimerCoalescingPolicy(), since taking
+a process visible assertion also sets the timer coalescing policy appropriately. Set the occlusion
+state to false on initialization.
+
2012-12-19 Alexey Proskuryakov
[WK2 NetworkProcess] Client doesn't receive SSL certificates
Modified: trunk/Source/WebKit2/Shared/ChildProcess.cpp (138225 => 138226)
--- trunk/Source/WebKit2/Shared/ChildProcess.cpp 2012-12-20 05:52:36 UTC (rev 138225)
+++ trunk/Source/WebKit2/Shared/ChildProcess.cpp 2012-12-20 05:57:47 UTC (rev 138226)
@@ -60,9 +60,6 @@
: m_terminationTimeout(0)
, m_terminationCounter(0)
, m_terminationTimer(RunLoop::main(), this, &ChildProcess::terminationTimerFired)
-#if PLATFORM(MAC)
-, m_applicationIsOccluded(false)
-#endif
{
// FIXME: The termination timer should not be scheduled on the main run loop.
// It won't work with the threaded mode, but it's not really useful anyway as is.
Modified: trunk/Source/WebKit2/Shared/ChildProcess.h (138225 => 138226)
--- trunk/Source/WebKit2/Shared/ChildProcess.h 2012-12-20 05:52:36 UTC (rev 138225)
+++ trunk/Source/WebKit2/Shared/ChildProcess.h 2012-12-20 05:57:47 UTC (rev 138226)
@@ -28,6 +28,7 @@
#include "Connection.h"
#include
+#include
#if PLATFORM(MAC)
OBJC_CLASS NSString;
@@ -62,7 +63,7 @@
};
#if PLATFORM(MAC)
-bool applicationIsOccluded() const { return m_applicationIsOccluded; }
+bool applicationIsOccluded() const { return !m_processVisibleAssertion; }
void setApplicationIsOccluded(bool);
#endif
@@ -80,13 +81,6 @@
virtual bool shouldTerminate() = 0;
virtual void terminate();
-#if PLATFORM(MAC)
-void disableProcessSuppression(NSString *reason);
-void enableProcessSuppression(NSString *reason);
-
-static NSString * const processSuppressionVisibleApplicationReason;
-#endif
-
void platformInitialize();
// The timeout, in seconds, before this process will be terminated if termination
@@ -100,7 +94,7 @@
WebCore::RunLoop::Timer m_terminationTimer;
#if PLATFORM(MAC)
-bool m_applicationIsOccluded;
+RetainPtr m_processVisibleAssertion;
#endif
};
[webkit-changes] [138225] trunk/Source
Title: [138225] trunk/Source Revision 138225 Author pilg...@chromium.org Date 2012-12-19 21:52:36 -0800 (Wed, 19 Dec 2012) Log Message [Chromium] Remove idbFactory from PlatformSupport https://bugs.webkit.org/show_bug.cgi?id=105460 Reviewed by Darin Fisher. Part of a larger refactoring series; see tracking bug 82948. Source/WebCore: * WebCore.gyp/WebCore.gyp: * WebCore.gypi: * platform/chromium/PlatformSupport.h: Removed. * storage/chromium: Removed. * storage/chromium/IDBFactoryBackendInterface.cpp: Removed. Source/WebKit/chromium: * WebKit.gyp: * src/IDBFactoryBackendInterface.cpp: Added. (WebCore): (WebCore::IDBFactoryBackendInterface::create): * src/PlatformSupport.cpp: Removed. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.gyp/WebCore.gyp trunk/Source/WebCore/WebCore.gypi trunk/Source/WebKit/chromium/ChangeLog trunk/Source/WebKit/chromium/WebKit.gyp Added Paths trunk/Source/WebKit/chromium/src/IDBFactoryBackendInterface.cpp Removed Paths trunk/Source/WebCore/platform/chromium/PlatformSupport.h trunk/Source/WebCore/storage/chromium/IDBFactoryBackendInterface.cpp trunk/Source/WebKit/chromium/src/PlatformSupport.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (138224 => 138225) --- trunk/Source/WebCore/ChangeLog 2012-12-20 05:50:34 UTC (rev 138224) +++ trunk/Source/WebCore/ChangeLog 2012-12-20 05:52:36 UTC (rev 138225) @@ -1,3 +1,18 @@ +2012-12-19 Mark Pilgrim + +[Chromium] Remove idbFactory from PlatformSupport +https://bugs.webkit.org/show_bug.cgi?id=105460 + +Reviewed by Darin Fisher. + +Part of a larger refactoring series; see tracking bug 82948. + +* WebCore.gyp/WebCore.gyp: +* WebCore.gypi: +* platform/chromium/PlatformSupport.h: Removed. +* storage/chromium: Removed. +* storage/chromium/IDBFactoryBackendInterface.cpp: Removed. + 2012-12-19 Eric Carlson Crash in TextTrack::trackIndexRelativeToRenderedTracks() Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (138224 => 138225) --- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-12-20 05:50:34 UTC (rev 138224) +++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-12-20 05:52:36 UTC (rev 138225) @@ -144,7 +144,6 @@ '../rendering/style', '../rendering/svg', '../storage', - '../storage/chromium', '../svg', '../svg/animation', '../svg/graphics', Modified: trunk/Source/WebCore/WebCore.gypi (138224 => 138225) --- trunk/Source/WebCore/WebCore.gypi 2012-12-20 05:50:34 UTC (rev 138224) +++ trunk/Source/WebCore/WebCore.gypi 2012-12-20 05:52:36 UTC (rev 138225) @@ -2579,7 +2579,6 @@ 'storage/StorageTrackerClient.h', 'storage/StorageTracker.cpp', 'storage/StorageTracker.h', -'storage/chromium/IDBFactoryBackendInterface.cpp', 'workers/AbstractWorker.cpp', 'workers/AbstractWorker.h', 'workers/DedicatedWorkerContext.cpp', @@ -3653,7 +3652,6 @@ 'platform/chromium/PasteboardChromium.cpp', 'platform/chromium/PlatformKeyboardEventChromium.cpp', 'platform/chromium/PlatformScreenChromium.cpp', -'platform/chromium/PlatformSupport.h', 'platform/chromium/PlatformThemeChromiumDefault.cpp', 'platform/chromium/PlatformThemeChromiumDefault.h', 'platform/chromium/PlatformWidget.h', Deleted: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (138224 => 138225) --- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-12-20 05:50:34 UTC (rev 138224) +++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-12-20 05:52:36 UTC (rev 138225) @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2010, Google Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROC
[webkit-changes] [138224] trunk
Title: [138224] trunk Revision 138224 Author eric.carl...@apple.com Date 2012-12-19 21:50:34 -0800 (Wed, 19 Dec 2012) Log Message Crash in TextTrack::trackIndexRelativeToRenderedTracks() https://bugs.webkit.org/show_bug.cgi?id=105371 Reviewed by Simon Fraser. Source/WebCore: Add an RAII object to manage text track update blocking, use it to always process the current cues to ensure that cues from a track that is deleted are removed from the shadow DOM before the next layout. No new tests, this fixes a crash in media/video-controls-captions-trackmenu.html. * html/HTMLMediaElement.cpp: (WebCore::TrackDisplayUpdateScope::TrackDisplayUpdateScope): New, call beginIgnoringTrackDisplayUpdateRequests. (WebCore::TrackDisplayUpdateScope::~TrackDisplayUpdateScope): New, call endIgnoringTrackDisplayUpdateRequests. (WebCore::HTMLMediaElement::beginIgnoringTrackDisplayUpdateRequests): (WebCore::HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests): Call updateActiveTextTrackCues when the ignore count reaches zero. (WebCore::HTMLMediaElement::textTrackAddCues): Use TrackDisplayUpdateScope instead of calling beginIgnoringTrackDisplayUpdateRequests and endIgnoringTrackDisplayUpdateRequests directly. (WebCore::HTMLMediaElement::textTrackRemoveCues): Ditto. (WebCore::HTMLMediaElement::removeTrack): Ditto. (WebCore::HTMLMediaElement::removeAllInbandTracks): Ditto. (WebCore::HTMLMediaElement::didRemoveTrack): Ditto. Call removeTrack. * html/HTMLMediaElement.h: Declare TrackDisplayUpdateScope as a friend of HTMLMediaElement so it can call protected methods. LayoutTests: * platform/mac/TestExpectations: Unskip video-controls-captions-trackmenu.html. Modified Paths trunk/LayoutTests/ChangeLog trunk/LayoutTests/platform/mac/TestExpectations trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/html/HTMLMediaElement.cpp trunk/Source/WebCore/html/HTMLMediaElement.h Diff Modified: trunk/LayoutTests/ChangeLog (138223 => 138224) --- trunk/LayoutTests/ChangeLog 2012-12-20 05:50:30 UTC (rev 138223) +++ trunk/LayoutTests/ChangeLog 2012-12-20 05:50:34 UTC (rev 138224) @@ -1,5 +1,14 @@ 2012-12-19 Eric Carlson +Crash in TextTrack::trackIndexRelativeToRenderedTracks() +https://bugs.webkit.org/show_bug.cgi?id=105371 + +Reviewed by Simon Fraser. + +* platform/mac/TestExpectations: Unskip video-controls-captions-trackmenu.html. + +2012-12-19 Eric Carlson + Update video-controls-captions-trackmenu.html https://bugs.webkit.org/show_bug.cgi?id=105455 Modified: trunk/LayoutTests/platform/mac/TestExpectations (138223 => 138224) --- trunk/LayoutTests/platform/mac/TestExpectations 2012-12-20 05:50:30 UTC (rev 138223) +++ trunk/LayoutTests/platform/mac/TestExpectations 2012-12-20 05:50:34 UTC (rev 138224) @@ -473,9 +473,6 @@ media/track/track-cue-rendering-vertical.html media/track/track-webvtt-tc028-unsupported-markup.html -# Asserts: https://bugs.webkit.org/show_bug.cgi?id=105371 -[ Debug ] media/video-controls-captions-trackmenu.html - # Opera-submitted tests to W3C for , a lot of failures still. # Opera-submitted tests to W3C for , a lot of failures still. webkit.org/b/103926 media/track/opera/idl/media-idl-tests.html [ Skip ] Modified: trunk/Source/WebCore/ChangeLog (138223 => 138224) --- trunk/Source/WebCore/ChangeLog 2012-12-20 05:50:30 UTC (rev 138223) +++ trunk/Source/WebCore/ChangeLog 2012-12-20 05:50:34 UTC (rev 138224) @@ -1,3 +1,31 @@ +2012-12-19 Eric Carlson + +Crash in TextTrack::trackIndexRelativeToRenderedTracks() +https://bugs.webkit.org/show_bug.cgi?id=105371 + +Reviewed by Simon Fraser. + +Add an RAII object to manage text track update blocking, use it to always process the +current cues to ensure that cues from a track that is deleted are removed from the +shadow DOM before the next layout. + +No new tests, this fixes a crash in media/video-controls-captions-trackmenu.html. + +* html/HTMLMediaElement.cpp: +(WebCore::TrackDisplayUpdateScope::TrackDisplayUpdateScope): New, call beginIgnoringTrackDisplayUpdateRequests. +(WebCore::TrackDisplayUpdateScope::~TrackDisplayUpdateScope): New, call endIgnoringTrackDisplayUpdateRequests. +(WebCore::HTMLMediaElement::beginIgnoringTrackDisplayUpdateRequests): +(WebCore::HTMLMediaElement::endIgnoringTrackDisplayUpdateRequests): Call updateActiveTextTrackCues +when the ignore count reaches zero. +(WebCore::HTMLMediaElement::textTrackAddCues): Use TrackDisplayUpdateScope instead of calling +beginIgnoringTrackDisplayUpdateRequests and endIgnoringTrackDisplayUpdateRequests directly. +(WebCore::HTMLMediaElement::textTrackRemoveCues): Ditto. +(WebCore::HTMLMediaElement::removeTrack): Ditto. +(WebCore::HTMLMediaElement::removeAllInbandTracks): Ditto. +(WebCore::HTMLMediaElement::didRemoveTrack): Ditto. Call removeTrack. +*
[webkit-changes] [138223] trunk/Source/WebKit/chromium
Title: [138223] trunk/Source/WebKit/chromium
Revision 138223
Author pi...@chromium.org
Date 2012-12-19 21:50:30 -0800 (Wed, 19 Dec 2012)
Log Message
[chromium] Remove old setBackingTextureId/setBackingIOSurfaceId API on WebPluginContainer
https://bugs.webkit.org/show_bug.cgi?id=105472
Reviewed by James Robinson.
This is not called anymore by chromium (as of r173545), using
setWebPlugin instead.
* public/WebPluginContainer.h:
* src/WebPluginContainerImpl.cpp:
(WebKit::WebPluginContainerImpl::WebPluginContainerImpl):
* src/WebPluginContainerImpl.h:
(WebPluginContainerImpl):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebPluginContainer.h
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138222 => 138223)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:50:30 UTC (rev 138223)
@@ -1,3 +1,19 @@
+2012-12-19 Antoine Labour
+
+[chromium] Remove old setBackingTextureId/setBackingIOSurfaceId API on WebPluginContainer
+https://bugs.webkit.org/show_bug.cgi?id=105472
+
+Reviewed by James Robinson.
+
+This is not called anymore by chromium (as of r173545), using
+setWebPlugin instead.
+
+* public/WebPluginContainer.h:
+* src/WebPluginContainerImpl.cpp:
+(WebKit::WebPluginContainerImpl::WebPluginContainerImpl):
+* src/WebPluginContainerImpl.h:
+(WebPluginContainerImpl):
+
2012-12-19 Mark Pilgrim
[Chromium] add setIDBFactory method for embedders to call
Modified: trunk/Source/WebKit/chromium/public/WebPluginContainer.h (138222 => 138223)
--- trunk/Source/WebKit/chromium/public/WebPluginContainer.h 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/public/WebPluginContainer.h 2012-12-20 05:50:30 UTC (rev 138223)
@@ -64,25 +64,7 @@
// Causes the container to report its current geometry via
// WebPlugin::updateGeometry.
virtual void reportGeometry() = 0;
-
-// Sets the id of the texture used for hw-accel compositing.
-// The default value for id is zero which indicates software rendering.
-// A non-zero value will trigger hw-accelerated compositing.
-virtual void setBackingTextureId(unsigned) = 0;
-// Notifies the container that the plugin allocated a new IOSurface for
-// its rendering, and that the compositor should bind to this texture
-// and use it for subsequent rendering. A non-zero ioSurfaceId triggers
-// hardware-accelerated compositing; a zero value switches back to the
-// software rendered path. (This entry point is used only on Mac OS,
-// but is defined on all platforms for simplicity.)
-virtual void setBackingIOSurfaceId(int width,
- int height,
- uint32_t ioSurfaceId) = 0;
-// Called when the backing texture is ready to be composited.
-// FIXME: consider renaming to something more general, now that
-// there are multiple providers. One idea: commitBackingStore.
-virtual void commitBackingTexture() {}
-
+
// Drop any references to script objects allocated by the plugin.
// These are objects derived from WebPlugin::scriptableObject. This is
// called when the plugin is being destroyed or if it needs to be
@@ -111,9 +93,6 @@
// Note, this does NOT affect pageScaleFactor or pageZoomFactor
virtual void zoomLevelChanged(double zoomLevel) = 0;
-// Notifies whether the contents of the plugin are entirely opaque.
-virtual void setOpaque(bool) = 0;
-
// Determines whether the given rectangle in this plugin is above all other
// content. The rectangle is in the plugin's coordinate system.
virtual bool isRectTopmost(const WebRect&) = 0;
Modified: trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (138222 => 138223)
--- trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-12-20 05:44:54 UTC (rev 138222)
+++ trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-12-20 05:50:30 UTC (rev 138223)
@@ -390,50 +390,6 @@
}
}
-void WebPluginContainerImpl::setBackingTextureId(unsigned textureId)
-{
-#if USE(ACCELERATED_COMPOSITING)
-if (m_textureId == textureId)
-return;
-
-ASSERT(!m_ioSurfaceLayer);
-
-if (!m_textureLayer)
-m_textureLayer = adoptPtr(Platform::current()->compositorSupport()->createExternalTextureLayer());
-m_textureLayer->setTextureId(textureId);
-m_textureId = textureId;
-
-setWebLayer(m_textureId ? m_textureLayer->layer() : 0);
-#endif
-}
-
-void WebPluginContainerImpl::setBackingIOSurfaceId(int width,
- int height,
- uint32_t ioSurfaceI
[webkit-changes] [138222] trunk/Source/WebCore
Title: [138222] trunk/Source/WebCore
Revision 138222
Author jap...@chromium.org
Date 2012-12-19 21:44:54 -0800 (Wed, 19 Dec 2012)
Log Message
REGRESSION(r137607): resource load client callbacks are not called for the main resource when loading HTML string
https://bugs.webkit.org/show_bug.cgi?id=105330
Reviewed by Brady Eidson.
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::responseReceived):
(WebCore::MainResourceLoader::dataReceived):
(WebCore::MainResourceLoader::didFinishLoading):
(WebCore::MainResourceLoader::load):
(WebCore::MainResourceLoader::identifier):
* loader/MainResourceLoader.h:
(MainResourceLoader):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/loader/MainResourceLoader.cpp
trunk/Source/WebCore/loader/MainResourceLoader.h
Diff
Modified: trunk/Source/WebCore/ChangeLog (138221 => 138222)
--- trunk/Source/WebCore/ChangeLog 2012-12-20 05:44:24 UTC (rev 138221)
+++ trunk/Source/WebCore/ChangeLog 2012-12-20 05:44:54 UTC (rev 138222)
@@ -1,3 +1,19 @@
+2012-12-19 Nate Chapin
+
+REGRESSION(r137607): resource load client callbacks are not called for the main resource when loading HTML string
+https://bugs.webkit.org/show_bug.cgi?id=105330
+
+Reviewed by Brady Eidson.
+
+* loader/MainResourceLoader.cpp:
+(WebCore::MainResourceLoader::responseReceived):
+(WebCore::MainResourceLoader::dataReceived):
+(WebCore::MainResourceLoader::didFinishLoading):
+(WebCore::MainResourceLoader::load):
+(WebCore::MainResourceLoader::identifier):
+* loader/MainResourceLoader.h:
+(MainResourceLoader):
+
2012-12-19 Cosmin Truta
[BlackBerry] RSS reader mangles UTF-8
Modified: trunk/Source/WebCore/loader/MainResourceLoader.cpp (138221 => 138222)
--- trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-12-20 05:44:24 UTC (rev 138221)
+++ trunk/Source/WebCore/loader/MainResourceLoader.cpp 2012-12-20 05:44:54 UTC (rev 138222)
@@ -73,6 +73,7 @@
, m_loadingMultipartContent(false)
, m_waitingForContentPolicy(false)
, m_timeOfLastDataReceived(0.0)
+, m_substituteDataLoadIdentifier(0)
#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
, m_filter(0)
#endif
@@ -412,6 +413,9 @@
m_response = r;
+if (!loader())
+frameLoader()->notifier()->dispatchDidReceiveResponse(documentLoader(), identifier(), m_response, 0);
+
ASSERT(!m_waitingForContentPolicy);
m_waitingForContentPolicy = true;
ref(); // balanced by deref in continueAfterContentPolicy and cancel
@@ -476,6 +480,9 @@
}
#endif
+if (!loader())
+frameLoader()->notifier()->dispatchDidReceiveData(documentLoader(), identifier(), data, length, -1);
+
documentLoader()->applicationCacheHost()->mainResourceDataReceived(data, length, -1, false);
// The additional processing can do anything including possibly removing the last
@@ -513,6 +520,9 @@
RefPtr protect(this);
RefPtr dl = documentLoader();
+if (!loader())
+frameLoader()->notifier()->dispatchDidFinishLoading(documentLoader(), identifier(), finishTime);
+
#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
if (m_filter) {
int length;
@@ -634,6 +644,9 @@
if (m_substituteData.isValid()) {
handleSubstituteDataLoadSoon(request);
+m_substituteDataLoadIdentifier = m_documentLoader->frame()->page()->progress()->createUniqueIdentifier();
+frameLoader()->notifier()->assignIdentifierToInitialRequest(m_substituteDataLoadIdentifier, documentLoader(), request);
+frameLoader()->notifier()->dispatchWillSendRequest(documentLoader(), m_substituteDataLoadIdentifier, request, ResourceResponse());
return;
}
@@ -679,6 +692,9 @@
unsigned long MainResourceLoader::identifier() const
{
+ASSERT(!m_substituteDataLoadIdentifier || !loader() || !loader()->identifier());
+if (m_substituteDataLoadIdentifier)
+return m_substituteDataLoadIdentifier;
if (ResourceLoader* resourceLoader = loader())
return resourceLoader->identifier();
return 0;
Modified: trunk/Source/WebCore/loader/MainResourceLoader.h (138221 => 138222)
--- trunk/Source/WebCore/loader/MainResourceLoader.h 2012-12-20 05:44:24 UTC (rev 138221)
+++ trunk/Source/WebCore/loader/MainResourceLoader.h 2012-12-20 05:44:54 UTC (rev 138222)
@@ -128,6 +128,7 @@
bool m_loadingMultipartContent;
bool m_waitingForContentPolicy;
double m_timeOfLastDataReceived;
+unsigned long m_substituteDataLoadIdentifier;
#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
WebFilterEvaluator *m_filter;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138221] trunk/Source/WebKit/chromium
Title: [138221] trunk/Source/WebKit/chromium
Revision 138221
Author pilg...@chromium.org
Date 2012-12-19 21:44:24 -0800 (Wed, 19 Dec 2012)
Log Message
[Chromium] add setIDBFactory method for embedders to call
https://bugs.webkit.org/show_bug.cgi?id=105465
Reviewed by Darin Fisher.
This is step 1 of getting rid of WebKitPlatform::idbFactory. This
adds a setter for embedders to call upon initialization, which (if
set) will be used instead of calling the idbFactory()
method. Eventually the idbFactory() method will go away, and this
setter will be the only way to initialize the Indexed Database API.
* public/WebIDBFactory.h:
(WebKit):
* src/IDBFactoryBackendProxy.cpp:
(WebKit):
(WebKit::setIDBFactory):
(WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/WebIDBFactory.h
trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138220 => 138221)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:39:39 UTC (rev 138220)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:44:24 UTC (rev 138221)
@@ -1,3 +1,23 @@
+2012-12-19 Mark Pilgrim
+
+[Chromium] add setIDBFactory method for embedders to call
+https://bugs.webkit.org/show_bug.cgi?id=105465
+
+Reviewed by Darin Fisher.
+
+This is step 1 of getting rid of WebKitPlatform::idbFactory. This
+adds a setter for embedders to call upon initialization, which (if
+set) will be used instead of calling the idbFactory()
+method. Eventually the idbFactory() method will go away, and this
+setter will be the only way to initialize the Indexed Database API.
+
+* public/WebIDBFactory.h:
+(WebKit):
+* src/IDBFactoryBackendProxy.cpp:
+(WebKit):
+(WebKit::setIDBFactory):
+(WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):
+
2012-12-19 Rachel Blum
[Chromium] Check Document now should work with continuous check off
Modified: trunk/Source/WebKit/chromium/public/WebIDBFactory.h (138220 => 138221)
--- trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-12-20 05:39:39 UTC (rev 138220)
+++ trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-12-20 05:44:24 UTC (rev 138221)
@@ -63,6 +63,9 @@
virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
};
+// Initializes IndexedDB support.
+WEBKIT_EXPORT void setIDBFactory(WebIDBFactory*);
+
} // namespace WebKit
#endif // WebIDBFactory_h
Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (138220 => 138221)
--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-12-20 05:39:39 UTC (rev 138220)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2012-12-20 05:44:24 UTC (rev 138221)
@@ -61,14 +61,24 @@
namespace WebKit {
+static WebIDBFactory* s_webIDBFactory = 0;
+
+void setIDBFactory(WebIDBFactory* factory)
+{
+s_webIDBFactory = factory;
+}
+
PassRefPtr IDBFactoryBackendProxy::create()
{
return adoptRef(new IDBFactoryBackendProxy());
}
IDBFactoryBackendProxy::IDBFactoryBackendProxy()
-: m_webIDBFactory(webKitPlatformSupport()->idbFactory())
{
+if (s_webIDBFactory)
+m_webIDBFactory = s_webIDBFactory;
+else
+m_webIDBFactory = webKitPlatformSupport()->idbFactory();
}
IDBFactoryBackendProxy::~IDBFactoryBackendProxy()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138220] trunk/Source/WebKit/chromium
Title: [138220] trunk/Source/WebKit/chromium
Revision 138220
Author commit-qu...@webkit.org
Date 2012-12-19 21:39:39 -0800 (Wed, 19 Dec 2012)
Log Message
[Chromium] Check Document now should work with continuous check off
https://bugs.webkit.org/show_bug.cgi?id=105228
Patch by Rachel Blum on 2012-12-19
Reviewed by Anders Carlsson.
* src/EditorClientImpl.cpp:
(WebKit::EditorClientImpl::checkSpellingOfString):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138219 => 138220)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:30:25 UTC (rev 138219)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:39:39 UTC (rev 138220)
@@ -1,5 +1,15 @@
2012-12-19 Rachel Blum
+[Chromium] Check Document now should work with continuous check off
+https://bugs.webkit.org/show_bug.cgi?id=105228
+
+Reviewed by Anders Carlsson.
+
+* src/EditorClientImpl.cpp:
+(WebKit::EditorClientImpl::checkSpellingOfString):
+
+2012-12-19 Rachel Blum
+
[Chromium] Spellchecker should provide suggestions for non-caret selection, too
https://bugs.webkit.org/show_bug.cgi?id=104841
Modified: trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp (138219 => 138220)
--- trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2012-12-20 05:30:25 UTC (rev 138219)
+++ trunk/Source/WebKit/chromium/src/EditorClientImpl.cpp 2012-12-20 05:39:39 UTC (rev 138220)
@@ -726,7 +726,7 @@
int spellLength = 0;
// Check to see if the provided text is spelled correctly.
-if (isContinuousSpellCheckingEnabled() && m_webView->spellCheckClient())
+if (m_webView->spellCheckClient())
m_webView->spellCheckClient()->spellCheck(WebString(text, length), spellLocation, spellLength, 0);
else {
spellLocation = 0;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138219] trunk/LayoutTests
Title: [138219] trunk/LayoutTests
Revision 138219
Author eric.carl...@apple.com
Date 2012-12-19 21:30:25 -0800 (Wed, 19 Dec 2012)
Log Message
Update video-controls-captions-trackmenu.html
https://bugs.webkit.org/show_bug.cgi?id=105455
Reviewed by Dean Jackson.
* media/video-controls-captions-trackmenu-expected.txt: Update results.
* media/video-controls-captions-trackmenu.html: Update test to account for sorted menu.
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/media/video-controls-captions-trackmenu-expected.txt
trunk/LayoutTests/media/video-controls-captions-trackmenu.html
Diff
Modified: trunk/LayoutTests/ChangeLog (138218 => 138219)
--- trunk/LayoutTests/ChangeLog 2012-12-20 05:28:21 UTC (rev 138218)
+++ trunk/LayoutTests/ChangeLog 2012-12-20 05:30:25 UTC (rev 138219)
@@ -1,3 +1,13 @@
+2012-12-19 Eric Carlson
+
+Update video-controls-captions-trackmenu.html
+https://bugs.webkit.org/show_bug.cgi?id=105455
+
+Reviewed by Dean Jackson.
+
+* media/video-controls-captions-trackmenu-expected.txt: Update results.
+* media/video-controls-captions-trackmenu.html: Update test to account for sorted menu.
+
2012-12-19 Filip Pizlo
JSObject::ensure should gracefully handle InterceptsGetOwn..., and should never be called when the 'this' is not an object
Modified: trunk/LayoutTests/media/video-controls-captions-trackmenu-expected.txt (138218 => 138219)
--- trunk/LayoutTests/media/video-controls-captions-trackmenu-expected.txt 2012-12-20 05:28:21 UTC (rev 138218)
+++ trunk/LayoutTests/media/video-controls-captions-trackmenu-expected.txt 2012-12-20 05:30:25 UTC (rev 138219)
@@ -12,10 +12,10 @@
*** Turning captions on
Found 5 menu items OK
EXPECTED (video.textTracks.length == '4') OK
-Track 0 should be disabled
-EXPECTED (video.textTracks[0].mode == 'disabled') OK
-Track 1 should be showing
-EXPECTED (video.textTracks[1].mode == 'showing') OK
+Track 0 should be showing
+EXPECTED (video.textTracks[0].mode == 'showing') OK
+Track 1 should be disabled
+EXPECTED (video.textTracks[1].mode == 'disabled') OK
Track 2 should be disabled
EXPECTED (video.textTracks[2].mode == 'disabled') OK
Track 3 should be disabled
Modified: trunk/LayoutTests/media/video-controls-captions-trackmenu.html (138218 => 138219)
--- trunk/LayoutTests/media/video-controls-captions-trackmenu.html 2012-12-20 05:28:21 UTC (rev 138218)
+++ trunk/LayoutTests/media/video-controls-captions-trackmenu.html 2012-12-20 05:30:25 UTC (rev 138219)
@@ -97,10 +97,10 @@
function testCaptionsVisible()
{
testExpected("video.textTracks.length", 4);
-consoleWrite("Track 0 should be disabled");
-testExpected("video.textTracks[0].mode", "disabled");
-consoleWrite("Track 1 should be showing");
-testExpected("video.textTracks[1].mode", "showing");
+consoleWrite("Track 0 should be showing");
+testExpected("video.textTracks[0].mode", "showing");
+consoleWrite("Track 1 should be disabled");
+testExpected("video.textTracks[1].mode", "disabled");
consoleWrite("Track 2 should be disabled");
testExpected("video.textTracks[2].mode", "disabled");
consoleWrite("Track 3 should be disabled");
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138218] trunk/Source/WebCore
Title: [138218] trunk/Source/WebCore
Revision 138218
Author commit-qu...@webkit.org
Date 2012-12-19 21:28:21 -0800 (Wed, 19 Dec 2012)
Log Message
[BlackBerry] RSS reader mangles UTF-8
https://bugs.webkit.org/show_bug.cgi?id=105440
RIM PR 235099
Patch by Cosmin Truta on 2012-12-19
Reviewed by Yong Li.
Reviewed internally by Liam Quinn.
The HTML string built from RSS parse data is encoded in UTF-8,
and it should not be converted to UTF-8 repeatedly.
* platform/network/blackberry/rss/RSSFilterStream.cpp:
(WebCore::RSSFilterStream::convertContentToHtml):
* platform/network/blackberry/rss/RSSGenerator.cpp:
(WebCore::RSSGenerator::generateHtml):
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp
trunk/Source/WebCore/platform/network/blackberry/rss/RSSGenerator.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (138217 => 138218)
--- trunk/Source/WebCore/ChangeLog 2012-12-20 05:27:12 UTC (rev 138217)
+++ trunk/Source/WebCore/ChangeLog 2012-12-20 05:28:21 UTC (rev 138218)
@@ -1,3 +1,21 @@
+2012-12-19 Cosmin Truta
+
+[BlackBerry] RSS reader mangles UTF-8
+https://bugs.webkit.org/show_bug.cgi?id=105440
+
+RIM PR 235099
+
+Reviewed by Yong Li.
+Reviewed internally by Liam Quinn.
+
+The HTML string built from RSS parse data is encoded in UTF-8,
+and it should not be converted to UTF-8 repeatedly.
+
+* platform/network/blackberry/rss/RSSFilterStream.cpp:
+(WebCore::RSSFilterStream::convertContentToHtml):
+* platform/network/blackberry/rss/RSSGenerator.cpp:
+(WebCore::RSSGenerator::generateHtml):
+
2012-12-19 Jon Lee
Leak in StringImpl::createCFString()
Modified: trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp (138217 => 138218)
--- trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp 2012-12-20 05:27:12 UTC (rev 138217)
+++ trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp 2012-12-20 05:28:21 UTC (rev 138218)
@@ -525,9 +525,16 @@
if (!success)
return false;
+// FIXME:
+// The HTML string generated below purports to be a UTF8-encoded
+// WTF::String, although its characters8() data should be Latin1.
+// We build then extract this string, pretending that we don't know
+// that we pass incorrectly-encoded char data both ways.
+// We should use BlackBerry::Platform::String instead of WTF::String.
OwnPtr generator = adoptPtr(new RSSGenerator());
String html = generator->generateHtml(parser->m_root);
-result = html.utf8(String::StrictConversion).data();
+ASSERT(html.is8Bit());
+result.assign(reinterpret_cast(html.characters8()), html.length());
return true;
}
Modified: trunk/Source/WebCore/platform/network/blackberry/rss/RSSGenerator.cpp (138217 => 138218)
--- trunk/Source/WebCore/platform/network/blackberry/rss/RSSGenerator.cpp 2012-12-20 05:27:12 UTC (rev 138217)
+++ trunk/Source/WebCore/platform/network/blackberry/rss/RSSGenerator.cpp 2012-12-20 05:28:21 UTC (rev 138218)
@@ -83,10 +83,10 @@
builder.append(articleName);
builder.appendLiteral("\" class=\"article\">\n if (!item->m_link.isEmpty())
-builder.append(item->m_link.utf8(String::StrictConversion).data());
+builder.append(item->m_link);
builder.appendLiteral("\">");
if (!item->m_title.isEmpty())
-builder.append(item->m_title.utf8(String::StrictConversion).data());
+builder.append(item->m_title);
else
builder.append(s_defaultEntryTitle);
builder.appendLiteral("\n");
@@ -94,13 +94,13 @@
if (!item->m_author.isEmpty()) {
builder.append(i18n("By"));
builder.appendLiteral(" ");
-builder.append(item->m_author.utf8(String::StrictConversion).data());
+builder.append(item->m_author);
builder.appendLiteral(" ");
} else {
if (!feed->m_author.isEmpty()) {
builder.append(i18n("By"));
builder.appendLiteral(" ");
-builder.append(feed->m_author.utf8(String::StrictConversion).data());
+builder.append(feed->m_author);
builder.appendLiteral(" ");
}
}
@@ -113,7 +113,7 @@
for (unsigned i = 0; i < item->m_categories.size() ; ++i) {
builder.appendLiteral("");
-builder.append(item->m_categories[i].utf8(String::StrictConversion).data());
+builder.append(item->m_categories[i]);
builder.appendLiteral("");
if (i < item->m_categories.size() - 1)
@@ -123,11 +123,11 @@
builder.appendLiteral("");
if (!item->m_pubDate.isEmpty())
-builder.append(item->m_pubDate.utf8(String::StrictConversion).data());
+builder.a
[webkit-changes] [138217] trunk
Title: [138217] trunk Revision 138217 Author commit-qu...@webkit.org Date 2012-12-19 21:27:12 -0800 (Wed, 19 Dec 2012) Log Message [EFL] Allow the build system to find OpenGL ES https://bugs.webkit.org/show_bug.cgi?id=104760 Patch by Yael Aharon on 2012-12-19 Reviewed by Laszlo Gombos. Add a way to find if GLESv2 is supported by the build system. Support for GLESv2 will be added separately. * Source/cmake/FindGLES.cmake: Added. Modified Paths trunk/ChangeLog Added Paths trunk/Source/cmake/FindGLES.cmake Diff Modified: trunk/ChangeLog (138216 => 138217) --- trunk/ChangeLog 2012-12-20 05:25:15 UTC (rev 138216) +++ trunk/ChangeLog 2012-12-20 05:27:12 UTC (rev 138217) @@ -1,3 +1,15 @@ +2012-12-19 Yael Aharon + +[EFL] Allow the build system to find OpenGL ES +https://bugs.webkit.org/show_bug.cgi?id=104760 + +Reviewed by Laszlo Gombos. + +Add a way to find if GLESv2 is supported by the build system. +Support for GLESv2 will be added separately. + +* Source/cmake/FindGLES.cmake: Added. + 2012-12-19 Alexis Menard Implement CSS parsing for CSS transitions unprefixed. Added: trunk/Source/cmake/FindGLES.cmake (0 => 138217) --- trunk/Source/cmake/FindGLES.cmake (rev 0) +++ trunk/Source/cmake/FindGLES.cmake 2012-12-20 05:27:12 UTC (rev 138217) @@ -0,0 +1,38 @@ +# - Try to find OpenGLES +# Once done this will define +# +# OPENGLES2_FOUND- system has OpenGLESv2 installed. +# OPENGLES2_INCLUDE_DIR - directories which contain the OpenGlEsv2 headers. +# OPENGLES2_LIBRARIES- libraries required to link against OpenGLESv2 +# +# Copyright (C) 2012 Intel Corporation. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS +# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +find_path(OPENGLES2_INCLUDE_DIR NAMES GLES2/gl2.h) + +find_library(OPENGLES2_LIBRARY NAMES GLESv2) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLESv2 DEFAULT_MSG OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY) + +mark_as_advanced(OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY) ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138216] trunk/Source/WebKit/chromium
Title: [138216] trunk/Source/WebKit/chromium
Revision 138216
Author commit-qu...@webkit.org
Date 2012-12-19 21:25:15 -0800 (Wed, 19 Dec 2012)
Log Message
[Chromium] Spellchecker should provide suggestions for non-caret selection, too
https://bugs.webkit.org/show_bug.cgi?id=104841
Patch by Rachel Blum on 2012-12-19
Reviewed by Anders Carlsson.
Allow spelling suggestions for a word if the word is already selected. No suggestion
if subset of a word or more than a word is selected.
* src/ContextMenuClientImpl.cpp:
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138215 => 138216)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:23:07 UTC (rev 138215)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:25:15 UTC (rev 138216)
@@ -1,3 +1,16 @@
+2012-12-19 Rachel Blum
+
+[Chromium] Spellchecker should provide suggestions for non-caret selection, too
+https://bugs.webkit.org/show_bug.cgi?id=104841
+
+Reviewed by Anders Carlsson.
+
+Allow spelling suggestions for a word if the word is already selected. No suggestion
+if subset of a word or more than a word is selected.
+
+* src/ContextMenuClientImpl.cpp:
+(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+
2012-12-19 Mark Pilgrim
[Chromium] Remove all references to sharedWorkerRepository()
Modified: trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (138215 => 138216)
--- trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-12-20 05:23:07 UTC (rev 138215)
+++ trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-12-20 05:25:15 UTC (rev 138216)
@@ -277,11 +277,19 @@
// a mouse on a word, Chrome just needs to find a spelling marker on the word instread of spellchecking it.
if (selectedFrame->settings() && selectedFrame->settings()->asynchronousSpellCheckingEnabled()) {
VisibleSelection selection = selectedFrame->selection()->selection();
-if (selection.isCaret()) {
-selection.expandUsingGranularity(WordGranularity);
+bool shouldUpdateSelection = false;
+if (selection.isCaretOrRange()) {
+if (selection.isCaret()) {
+selection.expandUsingGranularity(WordGranularity);
+shouldUpdateSelection = true;
+}
RefPtr range = selection.toNormalizedRange();
Vector markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
if (markers.size() == 1) {
+if (markers[0]->startOffset() != static_cast(range->startOffset()) || markers[0]->endOffset() != static_cast(range->endOffset()))
+markers.clear();
+}
+if (markers.size() == 1) {
range->setStart(range->startContainer(), markers[0]->startOffset());
range->setEnd(range->endContainer(), markers[0]->endOffset());
data.misspelledWord = range->text();
@@ -294,7 +302,7 @@
m_webView->spellCheckClient()->spellCheck(data.misspelledWord, misspelledOffset, misspelledLength, &data.dictionarySuggestions);
}
selection = VisibleSelection(range.get());
-if (selectedFrame->selection()->shouldChangeSelection(selection))
+if (shouldUpdateSelection && selectedFrame->selection()->shouldChangeSelection(selection))
selectedFrame->selection()->setSelection(selection, WordGranularity);
}
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138215] trunk/Source/WebKit/chromium
Title: [138215] trunk/Source/WebKit/chromium
Revision 138215
Author pilg...@chromium.org
Date 2012-12-19 21:23:07 -0800 (Wed, 19 Dec 2012)
Log Message
[Chromium] Remove all references to sharedWorkerRepository()
https://bugs.webkit.org/show_bug.cgi?id=104704
Reviewed by Darin Fisher.
Now that Chromium calls setSharedWorkerRepository upon
initializing WebKit (
https://codereview.chromium.org/10990121/ and
https://codereview.chromium.org/11576028/ ) and no longer
tries to override sharedWorkerRepository, it is safe to remove
all references to this function.
* public/platform/WebKitPlatformSupport.h:
(WebKit):
(WebKit::WebKitPlatformSupport::idbFactory):
* src/SharedWorkerRepository.cpp:
(WebKit::sharedWorkerRepository):
(WebCore::SharedWorkerRepository::isAvailable):
Modified Paths
trunk/Source/WebKit/chromium/ChangeLog
trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h
trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (138214 => 138215)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 04:07:42 UTC (rev 138214)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-12-20 05:23:07 UTC (rev 138215)
@@ -1,3 +1,24 @@
+2012-12-19 Mark Pilgrim
+
+[Chromium] Remove all references to sharedWorkerRepository()
+https://bugs.webkit.org/show_bug.cgi?id=104704
+
+Reviewed by Darin Fisher.
+
+Now that Chromium calls setSharedWorkerRepository upon
+initializing WebKit (
+https://codereview.chromium.org/10990121/ and
+https://codereview.chromium.org/11576028/ ) and no longer
+tries to override sharedWorkerRepository, it is safe to remove
+all references to this function.
+
+* public/platform/WebKitPlatformSupport.h:
+(WebKit):
+(WebKit::WebKitPlatformSupport::idbFactory):
+* src/SharedWorkerRepository.cpp:
+(WebKit::sharedWorkerRepository):
+(WebCore::SharedWorkerRepository::isAvailable):
+
2012-12-19 Alexis Menard
Implement CSS parsing for CSS transitions unprefixed.
Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (138214 => 138215)
--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-12-20 04:07:42 UTC (rev 138214)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2012-12-20 05:23:07 UTC (rev 138215)
@@ -36,7 +36,6 @@
namespace WebKit {
class WebIDBFactory; // FIXME: Does this belong in platform?
-class WebSharedWorkerRepository; // FIXME: Does this belong in platform?
// FIXME: Eventually all these API will need to move to WebKit::Platform.
class WebKitPlatformSupport : public Platform {
@@ -45,11 +44,6 @@
virtual WebIDBFactory* idbFactory() { return 0; }
-
-// Shared Workers --
-
-virtual WebSharedWorkerRepository* sharedWorkerRepository() { return 0; }
-
protected:
~WebKitPlatformSupport() { }
};
Modified: trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp (138214 => 138215)
--- trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp 2012-12-20 04:07:42 UTC (rev 138214)
+++ trunk/Source/WebKit/chromium/src/SharedWorkerRepository.cpp 2012-12-20 05:23:07 UTC (rev 138215)
@@ -69,15 +69,8 @@
static WebSharedWorkerRepository* sharedWorkerRepository()
{
-WebSharedWorkerRepository* repository;
-
-repository = s_sharedWorkerRepository;
-if (!repository) {
-repository = webKitPlatformSupport()->sharedWorkerRepository();
-setSharedWorkerRepository(repository);
-}
-
-return repository;
+// Will only be non-zero if the embedder has set the shared worker repository upon initialization. Nothing in WebKit sets this.
+return s_sharedWorkerRepository;
}
}
@@ -218,8 +211,6 @@
bool SharedWorkerRepository::isAvailable()
{
-// Allow the WebKitPlatformSupport to determine if SharedWorkers
-// are available.
return WebKit::sharedWorkerRepository();
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138214] trunk/Source
Title: [138214] trunk/Source Revision 138214 Author lforsch...@apple.com Date 2012-12-19 20:07:42 -0800 (Wed, 19 Dec 2012) Log Message Versioning. Modified Paths trunk/Source/_javascript_Core/Configurations/Version.xcconfig trunk/Source/WebCore/Configurations/Version.xcconfig trunk/Source/WebKit/mac/Configurations/Version.xcconfig trunk/Source/WebKit2/Configurations/Version.xcconfig Diff Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (138213 => 138214) --- trunk/Source/_javascript_Core/Configurations/Version.xcconfig 2012-12-20 03:48:12 UTC (rev 138213) +++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig 2012-12-20 04:07:42 UTC (rev 138214) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 537; -MINOR_VERSION = 22; +MINOR_VERSION = 24; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (138213 => 138214) --- trunk/Source/WebCore/Configurations/Version.xcconfig 2012-12-20 03:48:12 UTC (rev 138213) +++ trunk/Source/WebCore/Configurations/Version.xcconfig 2012-12-20 04:07:42 UTC (rev 138214) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 537; -MINOR_VERSION = 22; +MINOR_VERSION = 24; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (138213 => 138214) --- trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2012-12-20 03:48:12 UTC (rev 138213) +++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2012-12-20 04:07:42 UTC (rev 138214) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 537; -MINOR_VERSION = 22; +MINOR_VERSION = 24; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (138213 => 138214) --- trunk/Source/WebKit2/Configurations/Version.xcconfig 2012-12-20 03:48:12 UTC (rev 138213) +++ trunk/Source/WebKit2/Configurations/Version.xcconfig 2012-12-20 04:07:42 UTC (rev 138214) @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 537; -MINOR_VERSION = 22; +MINOR_VERSION = 24; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138213] tags/Safari-537.23/
Title: [138213] tags/Safari-537.23/ Revision 138213 Author lforsch...@apple.com Date 2012-12-19 19:48:12 -0800 (Wed, 19 Dec 2012) Log Message New Tag. Added Paths tags/Safari-537.23/ Diff Property changes: tags/Safari-537.23 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138212] trunk/Source/WebKit/win
Title: [138212] trunk/Source/WebKit/win
Revision 138212
Author ander...@apple.com
Date 2012-12-19 18:00:32 -0800 (Wed, 19 Dec 2012)
Log Message
Build WebKit2ExportGenerator before WebKitLib
https://bugs.webkit.org/show_bug.cgi?id=105487
Reviewed by Tim Horton.
* WebKit.vcproj/WebKit.sln:
Modified Paths
trunk/Source/WebKit/win/ChangeLog
trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (138211 => 138212)
--- trunk/Source/WebKit/win/ChangeLog 2012-12-20 01:43:15 UTC (rev 138211)
+++ trunk/Source/WebKit/win/ChangeLog 2012-12-20 02:00:32 UTC (rev 138212)
@@ -1,3 +1,12 @@
+2012-12-19 Anders Carlsson
+
+Build WebKit2ExportGenerator before WebKitLib
+https://bugs.webkit.org/show_bug.cgi?id=105487
+
+Reviewed by Tim Horton.
+
+* WebKit.vcproj/WebKit.sln:
+
2012-12-18 Alexey Proskuryakov
Remove unnecessary functions from CookiesStrategy
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln (138211 => 138212)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-12-20 01:43:15 UTC (rev 138211)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKit.sln 2012-12-20 02:00:32 UTC (rev 138212)
@@ -3,8 +3,8 @@
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_javascript_Core", "..\..\..\_javascript_Core\_javascript_Core.vcproj\_javascript_Core\_javascript_Core.vcproj", "{011D10F1-B656-4A1B-A0C3-3842F02122C5}"
ProjectSection(ProjectDependencies) = postProject
- {9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
+ {9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\..\..\WebCore\WebCore.vcproj\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
@@ -49,7 +49,6 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\..\..\WebKit2\win\WebKit2.vcproj", "{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}"
ProjectSection(ProjectDependencies) = postProject
{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}
- {BAE88FEF-509E-4D49-870B-7357922C276F} = {BAE88FEF-509E-4D49-870B-7357922C276F}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit2 Folder", "WebKit2 Folder", "{9AB9C96C-9039-4FA9-8F83-BBFC8F8B2182}"
@@ -73,7 +72,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitLib", "WebKit.vcproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
ProjectSection(ProjectDependencies) = postProject
- {B8437A41-67BC-4769-9452-45203827F821} = {B8437A41-67BC-4769-9452-45203827F821}
+ {BAE88FEF-509E-4D49-870B-7357922C276F} = {BAE88FEF-509E-4D49-870B-7357922C276F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKitGUID", "WebKitGUID.vcproj", "{B8437A41-67BC-4769-9452-45203827F821}"
@@ -154,9 +153,9 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntDesiredOffsets", "..\..\..\_javascript_Core\_javascript_Core.vcproj\LLIntDesiredOffsets\LLIntDesiredOffsets.vcproj", "{877150A0-41B3-4730-9D98-1B8298098B14}"
ProjectSection(ProjectDependencies) = postProject
- {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
- {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
{5AE5F5E4-782D-4F63-B4D7-3977B52B9950} = {5AE5F5E4-782D-4F63-B4D7-3977B52B9950}
+ {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
+ {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A} = {4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "..\..\..\_javascript_Core\_javascript_Core.vcproj\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
@@ -171,8 +170,7 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit2ExportGenerator", "..\..\..\WebKit2\win\WebKit2ExportGenerator.vcproj", "{BAE88FEF-509E-4D49-870B-7357922C276F}"
ProjectSection(ProjectDependencies) = postProject
- {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
- {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB} = {2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}
+ {B8437A41-67BC-4769-9452-45203827F821} = {B8437A41-67BC-4769-9452-45203827F821}
EndProjectSection
EndProject
Global
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138211] branches/chromium/1364/Source/WebCore/loader
Title: [138211] branches/chromium/1364/Source/WebCore/loader
Revision 138211
Author k...@chromium.org
Date 2012-12-19 17:43:15 -0800 (Wed, 19 Dec 2012)
Log Message
Merge 138174
> REGRESSION(r137607): PluginDocument loads consume huge amounts of memory
> https://bugs.webkit.org/show_bug.cgi?id=105359
>
> Reviewed by Alexey Proskuryakov.
>
> No new tests, verified manually that http://www.scb.se/statistik/_publikationer/NR0001_2012K02_TI_A28TI1203.pdf
> no longer consumes several GB of memory.
>
> * loader/ResourceLoader.cpp:
> (WebCore::ResourceLoader::setShouldBufferData): shouldBufferData is an enum, not a boolean, so this is reversed.
> * loader/cache/CachedRawResource.cpp:
> (WebCore::CachedRawResource::data): If the dataReceived() callback tells us to stop buffering data, be sure to
> notify the ResourceLoader and clear the data buffer.
>
TBR=jap...@chromium.org
Review URL: https://codereview.chromium.org/11571073
Modified Paths
branches/chromium/1364/Source/WebCore/loader/ResourceLoader.cpp
branches/chromium/1364/Source/WebCore/loader/cache/CachedRawResource.cpp
Diff
Modified: branches/chromium/1364/Source/WebCore/loader/ResourceLoader.cpp (138210 => 138211)
--- branches/chromium/1364/Source/WebCore/loader/ResourceLoader.cpp 2012-12-20 01:40:57 UTC (rev 138210)
+++ branches/chromium/1364/Source/WebCore/loader/ResourceLoader.cpp 2012-12-20 01:43:15 UTC (rev 138211)
@@ -194,7 +194,7 @@
m_options.shouldBufferData = shouldBufferData;
// Reset any already buffered data
-if (!shouldBufferData)
+if (shouldBufferData == DoNotBufferData)
m_resourceData = 0;
}
Modified: branches/chromium/1364/Source/WebCore/loader/cache/CachedRawResource.cpp (138210 => 138211)
--- branches/chromium/1364/Source/WebCore/loader/cache/CachedRawResource.cpp 2012-12-20 01:40:57 UTC (rev 138210)
+++ branches/chromium/1364/Source/WebCore/loader/cache/CachedRawResource.cpp 2012-12-20 01:43:15 UTC (rev 138211)
@@ -56,19 +56,26 @@
incrementalData = data->data() + previousDataLength;
incrementalDataLength = data->size() - previousDataLength;
}
-
+
if (m_options.shouldBufferData == BufferData) {
if (data)
setEncodedSize(data->size());
m_data = data;
}
-
+
+DataBufferingPolicy dataBufferingPolicy = m_options.shouldBufferData;
if (incrementalDataLength) {
CachedResourceClientWalker w(m_clients);
while (CachedRawResourceClient* c = w.next())
c->dataReceived(this, incrementalData, incrementalDataLength);
}
CachedResource::data(m_data, allDataReceived);
+
+if (dataBufferingPolicy == BufferData && m_options.shouldBufferData == DoNotBufferData) {
+if (m_loader)
+m_loader->setShouldBufferData(DoNotBufferData);
+clear();
+}
}
void CachedRawResource::didAddClient(CachedResourceClient* c)
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138210] trunk/Source/WebCore
Title: [138210] trunk/Source/WebCore
Revision 138210
Author jon...@apple.com
Date 2012-12-19 17:40:57 -0800 (Wed, 19 Dec 2012)
Log Message
Leak in StringImpl::createCFString()
https://bugs.webkit.org/show_bug.cgi?id=105485
Reviewed by Anders Carlsson.
* platform/text/cf/StringImplCF.cpp:
(WTF::StringImpl::createCFString): Missing adoptCF()'s.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (138209 => 138210)
--- trunk/Source/WebCore/ChangeLog 2012-12-20 01:40:41 UTC (rev 138209)
+++ trunk/Source/WebCore/ChangeLog 2012-12-20 01:40:57 UTC (rev 138210)
@@ -1,3 +1,14 @@
+2012-12-19 Jon Lee
+
+Leak in StringImpl::createCFString()
+https://bugs.webkit.org/show_bug.cgi?id=105485
+
+
+Reviewed by Anders Carlsson.
+
+* platform/text/cf/StringImplCF.cpp:
+(WTF::StringImpl::createCFString): Missing adoptCF()'s.
+
2012-12-19 Alexey Proskuryakov
[WK2 NetworkProcess] Client doesn't receive SSL certificates
Modified: trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp (138209 => 138210)
--- trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp 2012-12-20 01:40:41 UTC (rev 138209)
+++ trunk/Source/WebCore/platform/text/cf/StringImplCF.cpp 2012-12-20 01:40:57 UTC (rev 138210)
@@ -137,8 +137,8 @@
{
if (!m_length || !isMainThread()) {
if (is8Bit())
-return CFStringCreateWithBytes(0, reinterpret_cast(characters8()), m_length, kCFStringEncodingISOLatin1, false);
-return CFStringCreateWithCharacters(0, reinterpret_cast(characters16()), m_length);
+return adoptCF(CFStringCreateWithBytes(0, reinterpret_cast(characters8()), m_length, kCFStringEncodingISOLatin1, false));
+return adoptCF(CFStringCreateWithCharacters(0, reinterpret_cast(characters16()), m_length));
}
CFAllocatorRef allocator = StringWrapperCFAllocator::allocator();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [138208] branches/chromium/1364
Title: [138208] branches/chromium/1364 Revision 138208 Author k...@chromium.org Date 2012-12-19 17:36:29 -0800 (Wed, 19 Dec 2012) Log Message Revert 138189 > Merge 138095 > > Input elements with default touch handlers don't update handler counts when changing documents > > https://bugs.webkit.org/show_bug.cgi?id=105334 > > > > Reviewed by James Robinson. > > > > Source/WebCore: > > > > When an Input element with default touch event handlers changes documents, it failed to > > update the touch event handler sets in both the old and new document. This patch fixes this > > case. > > > > Test: fast/events/touch/touch-input-element-change-documents.html > > > > * dom/Document.h: > > (WebCore::Document::didRemoveTouchEventTargetNode) This function makes sense when touch > > handling is enabled, regardless of whether we're tracking the rects. > > * dom/Document.cpp: > > * html/HTMLInputElement.cpp: > > (WebCore::HTMLInputElement::~HTMLInputElement): Switch from didRemoveTouchEventHandler to > > didRemoveTouchEventTargetNode, since we don't care about counts in the destructor. > > (WebCore::HTMLInputElement::updateType): Fixing incorrect indentation. > > (WebCore::HTMLInputElement::didMoveToNewDocument): Adding the node to the new document and > > removing it from the old. > > > > LayoutTests: > > > > * fast/events/touch/touch-input-element-change-documents-expected.txt: Added. > > * fast/events/touch/touch-input-element-change-documents.html: Added. > > > > TBR=le...@chromium.org > Review URL: https://codereview.chromium.org/11649024 TBR=le...@chromium.org Review URL: https://codereview.chromium.org/11571072 Modified Paths branches/chromium/1364/Source/WebCore/dom/Document.cpp branches/chromium/1364/Source/WebCore/dom/Document.h branches/chromium/1364/Source/WebCore/html/HTMLInputElement.cpp Removed Paths branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html Diff Deleted: branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt (138207 => 138208) --- branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt 2012-12-20 01:34:41 UTC (rev 138207) +++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt 2012-12-20 01:36:29 UTC (rev 138208) @@ -1,12 +0,0 @@ -This test checks that we correctly update the touch event handler count when an Input element with default touch handlers changes documents. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS window.internals.touchEventHandlerCount(document) is 0 -PASS window.internals.touchEventHandlerCount(document) is 0 -PASS window.internals.touchEventHandlerCount(document) is 2 -PASS window.internals.touchEventHandlerCount(document) is 3 -PASS window.internals.touchEventHandlerCount(document) is 2 -PASS window.internals.touchEventHandlerCount(document) is 0 - Deleted: branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html (138207 => 138208) --- branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html 2012-12-20 01:34:41 UTC (rev 138207) +++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html 2012-12-20 01:36:29 UTC (rev 138208) @@ -1,30 +0,0 @@ -