-
Notifications
You must be signed in to change notification settings - Fork 3.9k
/
webkit.patch
305 lines (285 loc) · 12.8 KB
/
webkit.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
diff --git a/Source/WebCore/bindings/v8/ScriptController.cpp b/Source/WebCore/bindings/v8/ScriptController.cpp
index 9b967d9..3c672a0 100644
--- a/Source/WebCore/bindings/v8/ScriptController.cpp
+++ b/Source/WebCore/bindings/v8/ScriptController.cpp
@@ -178,7 +178,8 @@ void ScriptController::updatePlatformScriptObjects()
bool ScriptController::processingUserGesture()
{
- return UserGestureIndicator::processingUserGesture();
+ // Enable scripts to emulate all kinds of user guesture
+ return true;
}
v8::Local<v8::Value> ScriptController::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[])
diff --git a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
index 1936ae8..4835851 100644
--- a/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/Source/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -509,6 +509,9 @@ void V8DOMWindowShell::clearDocumentProperty()
void V8DOMWindowShell::setSecurityToken()
{
+ if (m_frame->loader()->client()->willSetSecurityToken(m_context.get()))
+ return;
+
ASSERT(m_world->isMainWorld());
Document* document = m_frame->document();
diff --git a/Source/WebCore/bindings/v8/V8RecursionScope.h b/Source/WebCore/bindings/v8/V8RecursionScope.h
index 64c6c8a..aeeaccd 100644
--- a/Source/WebCore/bindings/v8/V8RecursionScope.h
+++ b/Source/WebCore/bindings/v8/V8RecursionScope.h
@@ -77,7 +77,7 @@ public:
#ifndef NDEBUG
static bool properlyUsed()
{
- return recursionLevel() > 0 || V8PerIsolateData::current()->internalScriptRecursionLevel() > 0;
+ return true;
}
#endif
diff --git a/Source/WebCore/fileapi/File.idl b/Source/WebCore/fileapi/File.idl
index 7c0de43..1a22eb5 100644
--- a/Source/WebCore/fileapi/File.idl
+++ b/Source/WebCore/fileapi/File.idl
@@ -31,6 +31,7 @@ module html {
JSNoStaticTables
] File : Blob {
readonly attribute DOMString name;
+ readonly attribute DOMString path;
#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
readonly attribute Date lastModifiedDate;
#endif
diff --git a/Source/WebCore/html/FileInputType.cpp b/Source/WebCore/html/FileInputType.cpp
index 89fcc87..eafbfd3 100644
--- a/Source/WebCore/html/FileInputType.cpp
+++ b/Source/WebCore/html/FileInputType.cpp
@@ -190,6 +190,8 @@ void FileInputType::handleDOMActivateEvent(Event* event)
#else
settings.allowsMultipleFiles = input->fastHasAttribute(multipleAttr);
#endif
+ settings.directoryChooser = input->fastHasAttribute(nwdirectoryAttr);
+ settings.saveAs = input->fastHasAttribute(nwsaveasAttr);
settings.acceptMIMETypes = input->acceptMIMETypes();
settings.acceptFileExtensions = input->acceptFileExtensions();
settings.selectedFiles = m_fileList->paths();
@@ -208,7 +210,7 @@ RenderObject* FileInputType::createRenderer(RenderArena* arena, RenderStyle*) co
bool FileInputType::canSetStringValue() const
{
- return false;
+ return true;
}
bool FileInputType::canChangeFromAnotherType() const
@@ -218,7 +220,7 @@ bool FileInputType::canChangeFromAnotherType() const
// field's value to something like /etc/passwd and then change it to a file input.
// I don't think this would actually occur in WebKit, but this rule still may be
// important for compatibility.
- return false;
+ return true;
}
FileList* FileInputType::files()
@@ -248,7 +250,10 @@ bool FileInputType::getTypeSpecificValue(String& value)
// decided to try to parse the value by looking for backslashes
// (because that's what Windows file paths use). To be compatible
// with that code, we make up a fake path for the file.
- value = "C:\\fakepath\\" + m_fileList->item(0)->name();
+ unsigned numFiles = m_fileList->length();
+ value = m_fileList->item(0)->path();
+ for (unsigned i = 1; i < numFiles; ++i)
+ value.append(String(";") + m_fileList->item(i)->path());
return true;
}
diff --git a/Source/WebCore/html/HTMLAttributeNames.in b/Source/WebCore/html/HTMLAttributeNames.in
index 459078f..bfa3636 100644
--- a/Source/WebCore/html/HTMLAttributeNames.in
+++ b/Source/WebCore/html/HTMLAttributeNames.in
@@ -163,6 +163,8 @@ noresize
noshade
novalidate
nowrap
+nwdirectory
+nwsaveas
object
onabort
onbeforecopy
diff --git a/Source/WebCore/html/HTMLInputElement.idl b/Source/WebCore/html/HTMLInputElement.idl
index 4266b4f..5e14343 100644
--- a/Source/WebCore/html/HTMLInputElement.idl
+++ b/Source/WebCore/html/HTMLInputElement.idl
@@ -91,6 +91,7 @@ module html {
// Non-standard attributes
attribute [Reflect] DOMString align;
attribute [Conditional=DIRECTORY_UPLOAD, Reflect] boolean webkitdirectory;
+ attribute [Reflect] boolean nwdirectory;
attribute [Reflect] DOMString useMap;
attribute [Reflect] boolean incremental;
attribute [Conditional=INPUT_SPEECH, Reflect, V8EnabledAtRuntime] boolean webkitSpeech;
diff --git a/Source/WebCore/loader/EmptyClients.h b/Source/WebCore/loader/EmptyClients.h
index 3902790..a245857 100644
--- a/Source/WebCore/loader/EmptyClients.h
+++ b/Source/WebCore/loader/EmptyClients.h
@@ -364,6 +364,7 @@ public:
#if USE(V8)
virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId) { }
virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) { }
+ virtual bool willSetSecurityToken(v8::Handle<v8::Context>) { return false; };
virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) { return false; }
#endif
diff --git a/Source/WebCore/loader/FrameLoaderClient.h b/Source/WebCore/loader/FrameLoaderClient.h
index 703fd3b..1d910b3 100644
--- a/Source/WebCore/loader/FrameLoaderClient.h
+++ b/Source/WebCore/loader/FrameLoaderClient.h
@@ -285,6 +285,7 @@ namespace WebCore {
#if USE(V8)
virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId) = 0;
virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId) = 0;
+ virtual bool willSetSecurityToken(v8::Handle<v8::Context>) = 0;
virtual bool allowScriptExtension(const String& extensionName, int extensionGroup, int worldId) = 0;
#endif
diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index 71ade41..df038ea 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -908,6 +908,8 @@ void DOMWindow::focus(ScriptExecutionContext* context)
allowFocus = true;
}
+ allowFocus = true;
+
// If we're a top level window, bring the window to the front.
if (m_frame == page->mainFrame() && allowFocus)
page->chrome()->focus();
@@ -928,8 +930,10 @@ void DOMWindow::blur()
if (!page)
return;
+#if 0
if (m_frame->settings()->windowFocusRestricted())
return;
+#endif
if (m_frame != page->mainFrame())
return;
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 659c9c9..6cdf8ed 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -202,10 +202,12 @@ FrameView::FrameView(Frame* frame)
if (!page)
return;
+#if 0
if (m_frame == page->mainFrame()) {
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
}
+#endif
}
PassRefPtr<FrameView> FrameView::create(Frame* frame)
diff --git a/Source/WebCore/page/SecurityOrigin.cpp b/Source/WebCore/page/SecurityOrigin.cpp
index d53750a..3a83030 100644
--- a/Source/WebCore/page/SecurityOrigin.cpp
+++ b/Source/WebCore/page/SecurityOrigin.cpp
@@ -120,7 +120,7 @@ SecurityOrigin::SecurityOrigin(const KURL& url)
, m_host(url.host().isNull() ? "" : url.host().lower())
, m_port(url.port())
, m_isUnique(false)
- , m_universalAccess(false)
+ , m_universalAccess(true)
, m_domainWasSetInDOM(false)
, m_storageBlockingPolicy(AllowAllStorage)
, m_enforceFilePathSeparation(false)
@@ -145,7 +145,7 @@ SecurityOrigin::SecurityOrigin()
, m_domain("")
, m_port(InvalidPort)
, m_isUnique(true)
- , m_universalAccess(false)
+ , m_universalAccess(true)
, m_domainWasSetInDOM(false)
, m_canLoadLocalResources(false)
, m_storageBlockingPolicy(AllowAllStorage)
diff --git a/Source/WebCore/platform/FileChooser.h b/Source/WebCore/platform/FileChooser.h
index e6f6146..b20c11f 100644
--- a/Source/WebCore/platform/FileChooser.h
+++ b/Source/WebCore/platform/FileChooser.h
@@ -53,6 +53,8 @@ struct FileChooserSettings {
bool allowsMultipleFiles;
#if ENABLE(DIRECTORY_UPLOAD)
bool allowsDirectoryUpload;
+ bool directoryChooser;
+ bool saveAs;
#endif
Vector<String> acceptMIMETypes;
Vector<String> acceptFileExtensions;
diff --git a/Source/WebKit/chromium/public/WebFileChooserParams.h b/Source/WebKit/chromium/public/WebFileChooserParams.h
index f15e224..08ef670 100644
--- a/Source/WebKit/chromium/public/WebFileChooserParams.h
+++ b/Source/WebKit/chromium/public/WebFileChooserParams.h
@@ -45,6 +45,8 @@ struct WebFileChooserParams {
// If |saveAs| is true, the dialog allows the user to select a possibly
// non-existent file. This can be used for a "Save As" dialog.
bool saveAs;
+ // If |extractDirectory| is true, directory chosen will be seen as file.
+ bool extractDirectory;
// |title| is the title for a file chooser dialog. It can be an empty string.
WebString title;
// |initialValue| is a filename which the dialog should select by default.
@@ -77,6 +79,7 @@ struct WebFileChooserParams {
: multiSelect(false)
, directory(false)
, saveAs(false)
+ , extractDirectory(true)
{
}
};
diff --git a/Source/WebKit/chromium/public/WebFrameClient.h b/Source/WebKit/chromium/public/WebFrameClient.h
index 73980bf..777fb12 100644
--- a/Source/WebKit/chromium/public/WebFrameClient.h
+++ b/Source/WebKit/chromium/public/WebFrameClient.h
@@ -301,6 +301,9 @@ public:
// WebKit is about to release its reference to a v8 context for a frame.
virtual void willReleaseScriptContext(WebFrame*, v8::Handle<v8::Context>, int worldId) { }
+
+ // WebKit will set page's security token
+ virtual bool willSetSecurityToken(WebFrame*, v8::Handle<v8::Context>) { return false; };
#endif
// Geometry notifications ----------------------------------------------
diff --git a/Source/WebKit/chromium/src/ChromeClientImpl.cpp b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
index 65810b9..5e6c226 100644
--- a/Source/WebKit/chromium/src/ChromeClientImpl.cpp
+++ b/Source/WebKit/chromium/src/ChromeClientImpl.cpp
@@ -722,10 +722,12 @@ void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh
WebFileChooserParams params;
params.multiSelect = fileChooser->settings().allowsMultipleFiles;
#if ENABLE(DIRECTORY_UPLOAD)
- params.directory = fileChooser->settings().allowsDirectoryUpload;
+ params.directory = fileChooser->settings().directoryChooser || fileChooser->settings().allowsDirectoryUpload;
#else
params.directory = false;
#endif
+ params.extractDirectory = fileChooser->settings().allowsDirectoryUpload;
+ params.saveAs = fileChooser->settings().saveAs;
params.acceptTypes = fileChooser->settings().acceptTypes();
params.selectedFiles = fileChooser->settings().selectedFiles;
if (params.selectedFiles.size() > 0)
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index 49e780b..42b8a9a 100644
--- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -165,6 +165,14 @@ void FrameLoaderClientImpl::willReleaseScriptContext(v8::Handle<v8::Context> con
if (m_webFrame->client())
m_webFrame->client()->willReleaseScriptContext(m_webFrame, context, worldId);
}
+
+bool FrameLoaderClientImpl::willSetSecurityToken(v8::Handle<v8::Context> context)
+{
+ if (m_webFrame->client())
+ return m_webFrame->client()->willSetSecurityToken(m_webFrame, context);
+ else
+ return false;
+}
#endif
bool FrameLoaderClientImpl::allowScriptExtension(const String& extensionName,
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.h b/Source/WebKit/chromium/src/FrameLoaderClientImpl.h
index f2c4d07..b0939ef 100644
--- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.h
+++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.h
@@ -67,6 +67,7 @@ public:
#if USE(V8)
virtual void didCreateScriptContext(v8::Handle<v8::Context>, int extensionGroup, int worldId);
virtual void willReleaseScriptContext(v8::Handle<v8::Context>, int worldId);
+ virtual bool willSetSecurityToken(v8::Handle<v8::Context>);
#endif
// Returns true if we should allow the given V8 extension to be added to