| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ScriptDebugServer::topStackFrame()
Change https://android-git.corp.google.com/g/50673 introduced a temporary fix to avoid calling
ScriptDebugServer::topStackFrame(). This was required while WebKit Bug
https://bugs.webkit.org/show_bug.cgi?id=37502 was being fixed.
The fix for this bug was committed in WebKit r60083 so we can now remove the hack.
See also https://bugs.webkit.org/show_bug.cgi?id=38531
Change-Id: I1e26e71637faeec5c5806b7792a89a7fa63737d3
|
|/
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=40290
and remove the hack of including V8Proxy.h via V8CustomVoidCallback.h
Change-Id: I5e3a2aca573d4fa196e5db68514adf5dddfa39b5
|
|
|
|
|
|
|
|
| |
Custom bindings signatures have changed in JSC following this change
http://trac.webkit.org/changeset/60392
so isApplicationInstalled (which isn't upstreamed) needs to be updated to match the new style.
Change-Id: I7e837d61cdc7d4e5a4cd294c11e6ad4d827d5a2a
|
|
|
|
| |
Change-Id: Ib2ec92fa65ee46f3c76093d9ff6b6eb18f863736
|
|
|
|
|
|
|
|
| |
following @60330
http://trac.webkit.org/changeset/60330
Change-Id: I92e05b09e6cfc1703759b2c351e341a44b5eab0c
|
|
|
|
|
|
|
| |
The changes to DomWindow.cpp are needed by @60104 moving things from the frame to the FrameView
http://trac.webkit.org/changeset/60104
Change-Id: I8a7aa0478c2f0239bc52bb5078c446e5c8c84972
|
|
|
|
| |
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
|
|\ |
|
| |
| |
| |
| | |
The change has been submitted to WebKit.
https://bugs.webkit.org/show_bug.cgi?id=39835
|
|/
|
|
| |
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
|
|
|
|
| |
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
|
|
|
|
|
|
|
|
|
| |
hijacking for mobile adsense.
Fix http://b/issue?id=2695688
cherry-pick the change from WebKit
https://bugs.webkit.org/show_bug.cgi?id=39452
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=38990 landed as r59459. Fixes touch event support with V8.
Change-Id: I5fb7da6570ce7ba5ed14f54e78ecb9a24664613a
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to
recently upstreamed change http://trac.webkit.org/changeset/58110
Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can
be removed post-merge.
Fix conflict: WebCore/platform/ScrollView.cpp
Fix conflict: WebCore/platform/ScrollView.h
Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove
ScrollView::platformProhibitsScrolling and
ScrollView::scrollRectIntoViewRecursively as they have been
removed upstream in http://trac.webkit.org/changeset/58428,
http://trac.webkit.org/changeset/58445 and
http://trac.webkit.org/changeset/58611.
platformProhibitsScrolling was an Android specific function
called only from scrollRectIntoViewRecursively.
Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both
(we have an Android specific addition).
Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs,
our fix has been upstreamed in
http://trac.webkit.org/changeset/58490.
Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs.
See http://trac.webkit.org/changeset/58177
Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android
specific addition).
Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific
addition).
Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs.
see http://trac.webkit.org/changeset/58775
Fix conflict: FileSystemAndroid.cpp:
Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been
upstreamed but beyond 58596. See
http://trac.webkit.org/changeset/59226
Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
|
|
|
|
| |
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
ScriptDebugServer::topStackFrame() on Android
ScriptDebugServer is guarded with (JAVASCRIPT_DEBUGGER), which is not defined on
Android. An attempt was made in https://bugs.webkit.org/show_bug.cgi?id=38531 to
move ScriptDebugServer::topStackFrame() to ScriptCallStack to avoid the linker
error. However, this causes crashes on Android as our version of the V8 snapshot
is not consistent with this.
This fix is a temporary work-around to avoid the problem by simply not calling
ScriptDebugServer::topStackFrame(). The problem will be fixed properly upstream
when this code is refactored, as described in the WebKit bug.
Change-Id: I3952eed2e56dbb5a6f6204276bd499e79bba2227
|
|
|
|
|
|
|
|
|
| |
Some V8 bindings files have been removed now that more of the bindings are
auto-generated. Android has some modifications due to the addition of
navigator.connection, which causes conflicts. However, we can safely delete
these files.
Change-Id: I7188894a3d1dbe380eae7e2cc18409836ce8cafc
|
|
|
|
|
|
|
| |
This file has been deleted upstream now that more V8 bindings are
auto-generated, but we have local modifications, so we must keep these parts.
Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
|
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/56825
Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
|
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/57738
Change-Id: I1d10e7858488f40013bffa3e8f8339db7fff7de0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f
- CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447
- Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request
- Document.h - Take both, conflicts due to ANDROID_META_SUPPORT
- DragImage.h - Take both, conflict due to Android addition
- EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request
- EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS
- EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909
- FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS
- FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE
- FrameView.cpp - Take both, conflict due to Android frame flattening
- Geolocation.h - Merge conflicts due to Android-specific changes
- Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge
- GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards
- Gradient.h - Take both, conflict due to Android addition
- HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7
- HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element
- JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging
- MediaPlayer.cpp/h - Take both, conflict due to Android-specific change
- PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff
- RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening
- RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code
- Settings.cpp/h - Conflict due to ANDROID_PLUGINS
- TextInputController.h - Take upstream, git got confused
- V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29
- V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards
- WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge
- Widget.h - Take both, conflict due to Android addition
- jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset
- mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request
Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
|
|
|
|
| |
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
|
|
|
|
|
|
|
|
|
|
| |
- Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp
- V8Index.h - Keep ours, conflict due to upstreaming of touch events
- GeolocationService.h - Take both, conflict due to Android-specific change for pausing service
- PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers
- V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards
Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
|
|
|
|
| |
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
|
|
|
|
|
|
| |
Fix bug: 2588887
Change-Id: I06d64e58a95d9dd8d7e4308e1601c55d6d33663f
|
|
|
|
|
|
|
|
| |
Check the frame's context at PageCache save and restore time to avoid crashing when it's null.
Fix bug: 2564844
Change-Id: Ifef3fcf271b1366d4f63c42da1a9ac08bb8b78ed
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
createScriptInstanceForWidget(widget) is called,
we need to release the reference of the matching
npObject to avoid leak.
HTMLPlugInElement::getInstance() only calls
createScriptInstanceForWidget(widget) once. But
HTMLEmbedElement is using its closest ancestor who
has objectTag to get the widget. So the same widget
can exist in the HashMap if both <object> and its
child <embed>'s getInstance() are called.
Fix http://b/issue?id=2553266
|
|
|
|
|
|
|
|
| |
which adds V8 bindings for page cache.
Fix b: 2533219
Change-Id: I57f067adbbef76b4f8ec6c50b9e85fb2b7fc619a
|
|
|
|
| |
Change-Id: Icffc7b0d5f9a9b2da66dca37c0c8d084c11491b7
|
|
|
|
|
|
|
|
|
|
|
|
| |
The motivation for this change is to allow us to disable workers on Android,
because V8 on Android does not have the required locking.
This change will not be upstreamed because the code has been refactored in
tip-of-tree WebKit.
See http://trac.webkit.org/changeset/55096
Change-Id: I23ce1e5aecc2897da240b5229585b8e6617d8ebf
|
|
|
|
|
|
|
|
|
| |
The motivation for this change is to allow us to disable workers on Android,
because V8 on Android does not have the required locking.
See http://trac.webkit.org/changeset/56112
Change-Id: Ieee214f4765af3188bbdc51c56f14883f6a6779c
|
|
|
|
|
|
|
|
|
|
|
| |
globalObjectPrototypeIsDOMWindow
The motivation for this change is to allow us to disable workers on Android,
because V8 on Android does not have the required locking.
See http://trac.webkit.org/changeset/55084
Change-Id: If72cb478fb7dad6be44eaa2c1ca19e9790a9dda0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
wrapping in V8 bindings
The motivation for this change is to disable workers on Android, because V8 on
Android does not have the required locking.
The current version of WebKit in Android (54731) uses workers features without
ENABLE(WORKERS) guards in the V8 bindings. In particular,
V8DOMWrapper::instantiateV8ObjectInWorkerContext is used from generated code
without guards.
Fixing the code generator would be difficult and would be wasted effort as
V8DOMWrapper::instantiateV8ObjectInWorkerContext no longer exists in tip-of-tree
WebKit. Instead, we cherry-pick the WebKit change which removes this method.
See http://trac.webkit.org/changeset/54972
Change-Id: Ie6365073d7a4d92aa7c1553d87a7e1c1ed514118
|
|
|
|
|
|
|
|
| |
inside forgetV8ObjectForNPObject is causing a double deletion."
Right problem, wrong fix.
This reverts commit 9e0d526d0170e26b1dc2d0da8347cca28b5f3507.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
forgetV8ObjectForNPObject is causing a double deletion.
In ScriptController::clearScriptObjects, we call Unregister (which without this change causes Release to get called in forgetV8ObjectForNpObject).
If the ref count gets to 0, we free the object in Release. Then when Unregister returns, we call Release again in the ScriptController with the
same just-free'd pointer. If we're unlucky, then the Deallocate and free gets called again. We're also trying to access members such as the reference
count and deallocation function through a dead pointer.
Also, in the case where the Flash does not clear it's window object, we call Deallocate directly inside ScriptController::clearScriptObjects. This causes
Unregister to get called (as the object is still alive) which calls Release through forgetV8ObjectForNPObject, which results in a recursive call to Deallocate,
which frees the memory. Then the stack unwinds and we happily try to free again from the first call to Deallocate.
Fix these issues by removing the extra call to NPN_ReleaseObject in forgetV8ObjectForNpObject.
Change-Id: I7f6d21cd4ff38e29bd1a178e4816d023560b6b16
|
| |
|
| |
|
|
|
|
| |
javascript having been initialised.
|
|
|
|
|
|
|
|
| |
values
See http://trac.webkit.org/changeset/55020
Change-Id: I4d6c067dcafc43d2798c55e042e446d4964b326f
|
|
|
|
|
|
| |
This matches Chromium
Change-Id: I386e4e307e16d8b06eaf258a73d78dfdd9645bf8
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
This updates Android to match Chromium
See http://trac.webkit.org/changeset/54957
Change-Id: I41c082460f00e1c0ec32bf180205ca40fd2f190a
|
|\ \
| |/
|/|
| | |
landed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=35094"
|
| |
| |
| |
| |
| |
| | |
webkit.org in https://bugs.webkit.org/show_bug.cgi?id=35094
Change-Id: Id8bfd38800bf38de704efbad3afe9b8e53367d13
|
|/
|
|
| |
Change-Id: I28ccbf06e6490f6be5e024218ec823dd156d79b2
|
|
|
|
|
|
| |
http://trac.webkit.org.changeset/54950
Change-Id: I7da830fcd1d996a23e3f9ca61fa668a99ad80431
|
|\
| |
| |
| | |
in V8 bindings"
|
| |
| |
| |
| |
| |
| |
| |
| | |
bindings
See http://trac.webkit.org/changeset/54881
Change-Id: I7bf987cbdc8e88e39317551c098475d8f92cd582
|
|/
|
|
|
|
| |
See http://trac.webkit.org/changeset/54880
Change-Id: I5665991bb4f7d3680c00b42194a9208d1daa90f0
|
|\
| |
| |
| | |
on an include in V8DocumentCustom.cpp"
|