Diff
Modified: trunk/Source/WebCore/ChangeLog (119776 => 119777)
--- trunk/Source/WebCore/ChangeLog 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebCore/ChangeLog 2012-06-08 00:48:40 UTC (rev 119777)
@@ -1,3 +1,20 @@
+2012-06-07 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move didStartWorkerRunLoop to Platform.h
+ https://bugs.webkit.org/show_bug.cgi?id=88562
+
+ Reviewed by Adam Barth.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * WebCore.gyp/WebCore.gyp:
+ * bindings/v8/WorkerScriptController.cpp:
+ (WebCore::WorkerScriptController::~WorkerScriptController):
+ * platform/chromium/PlatformSupport.h:
+ (WebCore):
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThread::workerThread):
+
2012-06-07 Mike West <mk...@chromium.org>
Dropping m_startingLineNumber property from StyledElement.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (119776 => 119777)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-06-08 00:48:40 UTC (rev 119777)
@@ -1841,6 +1841,9 @@
{
'target_name': 'webcore_remaining',
'type': 'static_library',
+ 'defines': [
+ 'WEBKIT_IMPLEMENTATION=1',
+ ],
'dependencies': [
'webcore_prerequisites',
'<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
Modified: trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp (119776 => 119777)
--- trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebCore/bindings/v8/WorkerScriptController.cpp 2012-06-08 00:48:40 UTC (rev 119777)
@@ -47,6 +47,11 @@
#include "WorkerThread.h"
#include <v8.h>
+#if PLATFORM(CHROMIUM)
+#include <public/Platform.h>
+#include <public/WebWorkerRunLoop.h>
+#endif
+
namespace WebCore {
WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
@@ -69,7 +74,7 @@
// The corresponding call to didStartWorkerRunLoop is in
// WorkerThread::workerThread().
// See http://webkit.org/b/83104#c14 for why this is here.
- PlatformSupport::didStopWorkerRunLoop(&m_workerContext->thread()->runLoop());
+ WebKit::Platform::current()->didStopWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_workerContext->thread()->runLoop()));
#endif
m_proxy.clear();
m_isolate->Exit();
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (119776 => 119777)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-06-08 00:48:40 UTC (rev 119777)
@@ -81,7 +81,6 @@
class KURL;
class SerializedScriptValue;
class Widget;
-class WorkerRunLoop;
struct Cookie;
struct FontRenderStyle;
@@ -331,9 +330,6 @@
// Visited links ------------------------------------------------------
static LinkHash visitedLinkHash(const UChar* url, unsigned length);
static LinkHash visitedLinkHash(const KURL& base, const AtomicString& attributeURL);
-
- static void didStartWorkerRunLoop(WorkerRunLoop*);
- static void didStopWorkerRunLoop(WorkerRunLoop*);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (119776 => 119777)
--- trunk/Source/WebCore/workers/WorkerThread.cpp 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2012-06-08 00:48:40 UTC (rev 119777)
@@ -20,7 +20,7 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
@@ -47,6 +47,11 @@
#include "DatabaseTracker.h"
#endif
+#if PLATFORM(CHROMIUM)
+#include <public/Platform.h>
+#include <public/WebWorkerRunLoop.h>
+#endif
+
namespace WebCore {
static Mutex& threadCountMutex()
@@ -144,7 +149,7 @@
#if PLATFORM(CHROMIUM)
// The corresponding call to didStopWorkerRunLoop is in
// ~WorkerScriptController.
- PlatformSupport::didStartWorkerRunLoop(&m_runLoop);
+ WebKit::Platform::current()->didStartWorkerRunLoop(WebKit::WebWorkerRunLoop(&m_runLoop));
#endif
WorkerScriptController* script = m_workerContext->script();
Modified: trunk/Source/WebKit/chromium/ChangeLog (119776 => 119777)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-08 00:48:40 UTC (rev 119777)
@@ -1,3 +1,15 @@
+2012-06-07 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move didStartWorkerRunLoop to Platform.h
+ https://bugs.webkit.org/show_bug.cgi?id=88562
+
+ Reviewed by Adam Barth.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
2012-06-05 James Robinson <jam...@chromium.org>
[chromium] Move deferral-related logic out of Canvas2DLayerChromium
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (119776 => 119777)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-06-08 00:36:22 UTC (rev 119776)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-06-08 00:48:40 UTC (rev 119777)
@@ -96,7 +96,6 @@
#include <public/WebCookie.h>
#include <public/WebCookieJar.h>
#include <public/WebMimeRegistry.h>
-#include <public/WebWorkerRunLoop.h>
#include <wtf/Assertions.h>
// We are part of the WebKit implementation.
@@ -721,16 +720,6 @@
}
#if ENABLE(WORKERS)
-void PlatformSupport::didStartWorkerRunLoop(WorkerRunLoop* loop)
-{
- WebKit::Platform::current()->didStartWorkerRunLoop(WebWorkerRunLoop(loop));
-}
-
-void PlatformSupport::didStopWorkerRunLoop(WorkerRunLoop* loop)
-{
- WebKit::Platform::current()->didStopWorkerRunLoop(WebWorkerRunLoop(loop));
-}
-
WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
{
return WebWorkerClientImpl::createWorkerContextProxy(worker);
