bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 187216.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1136 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-03-12 20:23:24 +00:00
parent 254cba733a
commit c3b02b7231
35 changed files with 368 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patch/patches/webkit_451.patch
View File

@@ -61,9 +61,9 @@ Added: svn:eol-style
Index: WebCore/bindings/v8/WorkerScriptController.cpp
===================================================================
--- WebCore/bindings/v8/WorkerScriptController.cpp (revision 142426)
--- WebCore/bindings/v8/WorkerScriptController.cpp (revision 145278)
+++ WebCore/bindings/v8/WorkerScriptController.cpp (working copy)
@@ -50,11 +50,23 @@
@@ -51,11 +51,23 @@
#if PLATFORM(CHROMIUM)
#include <public/Platform.h>
@@ -87,7 +87,7 @@ Index: WebCore/bindings/v8/WorkerScriptController.cpp
WorkerScriptController::WorkerScriptController(WorkerContext* workerContext)
: m_workerContext(workerContext)
, m_isolate(v8::Isolate::New())
@@ -72,6 +84,8 @@
@@ -73,6 +85,8 @@
WorkerScriptController::~WorkerScriptController()
{
m_domDataStore.clear();
@@ -96,7 +96,7 @@ Index: WebCore/bindings/v8/WorkerScriptController.cpp
#if PLATFORM(CHROMIUM)
// The corresponding call to didStartWorkerRunLoop is in
// WorkerThread::workerThread().
@@ -133,6 +147,8 @@
@@ -134,6 +148,8 @@
v8::Handle<v8::Object> globalObject = v8::Handle<v8::Object>::Cast(m_context->Global()->GetPrototype());
globalObject->SetPrototype(jsWorkerContext);
@@ -105,7 +105,7 @@ Index: WebCore/bindings/v8/WorkerScriptController.cpp
return true;
}
@@ -257,6 +273,39 @@
@@ -258,6 +274,39 @@
return workerContext->script();
}
@@ -147,7 +147,7 @@ Index: WebCore/bindings/v8/WorkerScriptController.cpp
#endif // ENABLE(WORKERS)
Index: WebCore/bindings/v8/WorkerScriptController.h
===================================================================
--- WebCore/bindings/v8/WorkerScriptController.h (revision 142426)
--- WebCore/bindings/v8/WorkerScriptController.h (revision 145278)
+++ WebCore/bindings/v8/WorkerScriptController.h (working copy)
@@ -40,6 +40,10 @@
#include <wtf/Threading.h>
@@ -180,7 +180,7 @@ Index: WebCore/bindings/v8/WorkerScriptController.h
ScopedPersistent<v8::Context> m_context;
Index: WebKit/chromium/public/WebWorkerInfo.h
===================================================================
--- WebKit/chromium/public/WebWorkerInfo.h (revision 142426)
--- WebKit/chromium/public/WebWorkerInfo.h (revision 145278)
+++ WebKit/chromium/public/WebWorkerInfo.h (working copy)
@@ -35,9 +35,15 @@
@@ -236,7 +236,7 @@ Added: svn:eol-style
Index: WebKit/chromium/src/WebWorkerInfo.cpp
===================================================================
--- WebKit/chromium/src/WebWorkerInfo.cpp (revision 142426)
--- WebKit/chromium/src/WebWorkerInfo.cpp (revision 145278)
+++ WebKit/chromium/src/WebWorkerInfo.cpp (working copy)
@@ -31,6 +31,7 @@
#include "config.h"

6
patch/patches/webkit_features.patch
View File

@@ -1,8 +1,8 @@
Index: features.gypi
===================================================================
--- features.gypi (revision 143980)
--- features.gypi (revision 145278)
+++ features.gypi (working copy)
@@ -190,7 +190,7 @@
@@ -193,7 +193,7 @@
'ENABLE_CALENDAR_PICKER=1',
'ENABLE_DATALIST_ELEMENT=1',
'ENABLE_INPUT_SPEECH=1',
@@ -11,7 +11,7 @@ Index: features.gypi
'ENABLE_INPUT_TYPE_WEEK=1',
'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',
'ENABLE_LEGACY_NOTIFICATIONS=1',
@@ -199,7 +199,7 @@
@@ -202,7 +202,7 @@
'ENABLE_NOTIFICATIONS=1',
'ENABLE_ORIENTATION_EVENTS=0',
'ENABLE_PAGE_POPUP=1',