Skip to content

Commit f356d22

Browse files
zcbenzzcbenz
committed
Update Chromium and WebKit code to upstream.
1 parent 7840d2f commit f356d22

5 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎patches/webkit.patch‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/Source/WebCore/bindings/v8/ScriptController.cpp b/Source/WebCore/bindings/v8/ScriptController.cpp
2-
index b2a9b96..d59cfe5 100644
2+
index 7836a0f..3f1417a 100644
33
--- a/Source/WebCore/bindings/v8/ScriptController.cpp
44
+++ b/Source/WebCore/bindings/v8/ScriptController.cpp
5-
@@ -177,7 +177,8 @@ void ScriptController::updatePlatformScriptObjects()
5+
@@ -174,7 +174,8 @@ void ScriptController::updatePlatformScriptObjects()
66

77
bool ScriptController::processingUserGesture()
88
{
@@ -13,7 +13,7 @@ index b2a9b96..d59cfe5 100644
1313

1414
v8::Local<v8::Value> ScriptController::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
1515
diff --git a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
16-
index de65721..f57f76e 100644
16+
index 4d37fc9..a89fd59 100644
1717
--- a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
1818
+++ b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
1919
@@ -518,6 +518,9 @@ void V8DOMWindowShell::clearDocumentProperty()
@@ -108,7 +108,7 @@ index 459078f..bfa3636 100644
108108
onabort
109109
onbeforecopy
110110
diff --git a/Source/WebCore/html/HTMLInputElement.idl b/Source/WebCore/html/HTMLInputElement.idl
111-
index 4a86fe2..bffed45 100644
111+
index 9315f67..6056bc6 100644
112112
--- a/Source/WebCore/html/HTMLInputElement.idl
113113
+++ b/Source/WebCore/html/HTMLInputElement.idl
114114
@@ -96,6 +96,7 @@ interface HTMLInputElement : HTMLElement {
@@ -144,10 +144,10 @@ index 4f2388a..5d86756 100644
144144
#endif
145145

146146
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
147-
index faa4ba0..0748173 100644
147+
index a84fec5..ca6e201 100644
148148
--- a/Source/WebCore/page/DOMWindow.cpp
149149
+++ b/Source/WebCore/page/DOMWindow.cpp
150-
@@ -908,6 +908,8 @@ void DOMWindow::focus(ScriptExecutionContext* context)
150+
@@ -926,6 +926,8 @@ void DOMWindow::focus(ScriptExecutionContext* context)
151151
allowFocus = true;
152152
}
153153

@@ -156,7 +156,7 @@ index faa4ba0..0748173 100644
156156
// If we're a top level window, bring the window to the front.
157157
if (m_frame == page->mainFrame() && allowFocus)
158158
page->chrome()->focus();
159-
@@ -928,8 +930,10 @@ void DOMWindow::blur()
159+
@@ -946,8 +948,10 @@ void DOMWindow::blur()
160160
if (!page)
161161
return;
162162

@@ -168,7 +168,7 @@ index faa4ba0..0748173 100644
168168
if (m_frame != page->mainFrame())
169169
return;
170170
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
171-
index 2d312a3..7492377 100644
171+
index 6959a8c..9d0bf11 100644
172172
--- a/Source/WebCore/page/FrameView.cpp
173173
+++ b/Source/WebCore/page/FrameView.cpp
174174
@@ -202,10 +202,12 @@ FrameView::FrameView(Frame* frame)
@@ -255,10 +255,10 @@ index 73980bf..777fb12 100644
255255

256256
// Geometry notifications ----------------------------------------------
257257
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
258-
index 9d0961c4..5a3bcae 100644
258+
index f71d677..1075998 100644
259259
--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
260260
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
261-
@@ -722,10 +722,12 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh
261+
@@ -708,10 +708,12 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh
262262
WebFileChooserParams params;
263263
params.multiSelect = fileChooser->settings().allowsMultipleFiles;
264264
#if ENABLE(DIRECTORY_UPLOAD)
@@ -273,7 +273,7 @@ index 9d0961c4..5a3bcae 100644
273273
params.selectedFiles = fileChooser->settings().selectedFiles;
274274
if (params.selectedFiles.size() > 0)
275275
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
276-
index 49e780b..42b8a9a 100644
276+
index 11c726a..bf3b661 100644
277277
--- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
278278
+++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
279279
@@ -165,6 +165,14 @@ void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handle<v8::Context> con

‎src/api/dispatcher.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void Dispatcher::OnEvent(int object_id,
7272
v8::Handle<v8::Context> context = web_frame->mainWorldScriptContext();
7373
v8::Context::Scope context_scope(context);
7474

75-
V8ValueConverterImpl converter;
75+
content::V8ValueConverterImpl converter;
7676
v8::Handle<v8::Value> args = converter.ToV8Value(&arguments, context);
7777
DCHECK(!args.IsEmpty()) << "Invalid 'arguments' in Dispatcher::OnEvent";
7878
v8::Handle<v8::Value> argv[] = {

‎src/browser/shell_download_manager_delegate.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ bool ShellDownloadManagerDelegate::DetermineDownloadTarget(
8686
FilePath generated_name = net::GenerateFileName(
8787
download->GetURL(),
8888
download->GetContentDisposition(),
89-
download->GetReferrerCharset(),
89+
EmptyString(),
9090
download->GetSuggestedFilename(),
9191
download->GetMimeType(),
9292
"download");

‎src/shell_browser_context.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,15 @@ net::URLRequestContextGetter*
139139

140140
net::URLRequestContextGetter*
141141
ShellBrowserContext::GetMediaRequestContextForStoragePartition(
142-
const std::string& partition_id) {
142+
const FilePath& partition_path,
143+
bool in_memory) {
143144
return GetRequestContext();
144145
}
145146

146147
net::URLRequestContextGetter*
147148
ShellBrowserContext::GetRequestContextForStoragePartition(
148-
const std::string& partition_id) {
149+
const FilePath& partition_path,
150+
bool in_memory) {
149151
return NULL;
150152
}
151153

‎src/shell_browser_context.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ class ShellBrowserContext : public BrowserContext {
4040
int renderer_child_id) OVERRIDE;
4141
virtual net::URLRequestContextGetter*
4242
GetMediaRequestContextForStoragePartition(
43-
const std::string& partition_id) OVERRIDE;
43+
const FilePath& partition_path,
44+
bool in_memory) OVERRIDE;
4445
virtual net::URLRequestContextGetter* GetRequestContextForStoragePartition(
45-
const std::string& partition_id) OVERRIDE;
46+
const FilePath& partition_path,
47+
bool in_memory) OVERRIDE;
4648
virtual ResourceContext* GetResourceContext() OVERRIDE;
4749
virtual GeolocationPermissionContext*
4850
GetGeolocationPermissionContext() OVERRIDE;

0 commit comments

Comments
 (0)