summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/android
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge Webkit at r65072 : Fix conflicts.Ben Murdoch2010-08-131-10/+0
| | | | | | | | | | | | HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-121-0/+10
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Provide PopupMenuAndroid and related ChromeClient ↵Steve Block2010-08-093-78/+66
| | | | | | | | methods See http://trac.webkit.org/changeset/64513 Change-Id: I9f55ae27989f7a246c0c1e5f771677c66a9b1556
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-042-6/+5
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge Webkit at r63859 : The static AccessibilityObject::getAttribute(Node*, ↵Ben Murdoch2010-07-271-6/+0
| | | | | | | | const QualfiedName&) function has been removed. See http://trac.webkit.org/changeset/63358 Change-Id: I89c6a0a98d04f0a0cd40492229fa03f2e9782622
* Merge Webkit at r63859 : PluginWidget class has been renamed and moved to ↵Ben Murdoch2010-07-271-5/+0
| | | | | | WebKit. See http://trac.webkit.org/changeset/63638 Change-Id: I97784c98b694f28804421637716afa649aa09a6e
* Merge "Set smaller minHeight for button."Shimeng (Simon) Wang2010-07-141-7/+4
|\
| * Set smaller minHeight for button.Shimeng (Simon) Wang2010-07-141-7/+4
| | | | | | | | | | | | | | | | | | The logic is similar to safari. In ChromimumSkia, seems there's no setting for the minHeight. Other settings in safari are not copied, since after trying, it's not working well. Issue: 2732674 Change-Id: I5235f092f44d9e70e3aede7b7c50f425473db163
* | am b47b5d4a: am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-131-68/+68
|\ \ | |/ |/| | | | | | | | | Merge commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf' * commit 'b47b5d4ad21fc9f19fc8e6c0f453032658cad4cf': Migrate to new keycode constants in keycodes.h.
| * am 652e9a01: Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-131-68/+68
| |\ | | | | | | | | | | | | | | | | | | Merge commit '652e9a017a7c5c772361bf57279fae0c26992329' into gingerbread-plus-aosp * commit '652e9a017a7c5c772361bf57279fae0c26992329': Migrate to new keycode constants in keycodes.h.
| | * Migrate to new keycode constants in keycodes.h.Jeff Brown2010-07-131-68/+68
| | | | | | | | | | | | Change-Id: I523d6fab2964cec4610424f6fd7bbe86d38b7306
* | | am b34d9d68: merge from open-source masterThe Android Open Source Project2010-07-091-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010' * commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010': Fix missing NL
| * | Fix missing NLBruce Beare2010-06-251-1/+1
| |/ | | | | | | | | Change-Id: I6757ab42e52b9d878f06da4bdc757c4626e3d0c5 Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
* | Combine base PictureSet with composite layers intoGrace Kloba2010-07-091-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | one SkLayer tree. The BaseLayerAndroid is the root of the composite layers and it has the PictureSet as its base content. Before, WebViewCore uses m_contentMutex and both UI and WebCore threads access the m_content. Now we use the layer approach. When WebCore thread updates its content in recordContent, it creates a new BaseLayerAndroid and copy both PictureSet and composite layers into it. Then it is sent to be consumed by UI thread. Clean up sync layer in both ChromeClientAndroid and GraphicsLayerAndroid. splitContent can be a little tricky with this change. Now UI has its own copy of PictureSet. When it takes too long to draw, it will send a request to WebCore to split the PictureSet. When it is done, a copy of the new PictureSet will be sent back to UI. There is a matching change in framework/base
* | Merge WebKit at r62496: PaintInfo is no longer a member of RenderObjectSteve Block2010-07-092-14/+14
| | | | | | | | | | | | See http://trac.webkit.org/changeset/62104 Change-Id: I89f38ef8d8e76b8e2872848dbab1bf103429783b
* | Merge WebKit at r62496: Fix conflictsSteve Block2010-07-092-8/+0
| | | | | | | | | | | | | | | | | | | | HTMLDocumentParser.cpp - Conflict due to Android instrumentation - http://trac.webkit.org/changeset/62033 FrameView.cpp - Conflict due to iframe flattening - http://trac.webkit.org/changeset/62135 Settings.cpp/h - Conflict due to Android plugins - http://trac.webkit.org/changeset/62284 DragData.h - Conflict due to Android special-case - http://trac.webkit.org/changeset/62124 RenderThemeAndroid.cpp/h - Conflict due to not-yet-upstreamed video - http://trac.webkit.org/changeset/62104 Change-Id: If5bd7bf0de525454166c3ccea050da55b29644c3
* | Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-092-17/+25
| | | | | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* | Enable composite layers for the sub frame.Grace Kloba2010-07-071-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the visibleContentRect for iframe. It should be relative to its parent instead of the viewport. For fixed position, we still check for the top frame as the current logic positions the object relative to the screen which only applied to the top frame. For plugin, it depends on PluginWidget's platformLayer(). The default is 0. For video, it depends on MediaPlayer's supportsAcceleratedRendering(). The default is false. Fix the crash in the GraphicsLayerAndroid. The root layer is a container layer, there is no need to draw them. As LayerAndroid doesn't create Picture for them, we should ensure to skip draw. Fix http://b/issue?id=2733947
* | Pass the WebView context to the GeolocationService from WebKitSteve Block2010-06-293-7/+19
| | | | | | | | | | Bug: 2798745 Change-Id: I429a1cb9fc6826419c62f1f30376692ede497085
* | Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-2/+2
| | | | | | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* | Merge webkit.org at r60469 : Fix conflicts.Leon Clarke2010-06-081-48/+1
| | | | | | | | | | | | | | 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
* | Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-0/+6
| | | | | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* | Fix platformVisibleContentRect() for the sub frame.Grace Kloba2010-06-031-5/+15
| | | | | | | | | | | | | | | | The visibleBounds is only set to the top frame. For sub frame, we need to intersect it with the sub frame's own bounds. Fix http://b/issue?id=2685194
* | Enable File Reader and blob.slice APIs.Ben Murdoch2010-06-022-6/+14
| | | | | | | | | | | | | | | | | | Notes: - the change to WebCore/html/FileStream.cpp is a cherry pick of http://trac.webkit.org/changeset/60325 - the change to WebCore/platform/posix/FileSystemPOSIX.cpp is a cherry pick of http://trac.webkit.org/changeset/60374 - this needs a corresponding frameworks/base change Change-Id: I05d1496e1e95adf1c6a61c6f07bbf62e9bc92820
* | Code clean up, http://b/issue?id=2724743Grace Kloba2010-05-282-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change Widget:screenWidth() to Widget:textWrapWidth() as the text wrap width may be different than the screen width after pinch zoom. Change AndroidWebHistoryBridge's m_screenWidthScale to m_textWrapScale to reflect its meaning. Remove unused screenWidth/screenHeight in PlatformBridge. Merge two restore methods to one. There is a matching CL in framework/base. Only setUseFixedLayout if layout width is different than screen width. Change from Node* to Ref<Node> to avoid a crash. Fix http://b/issue?id=2660396
* | Use the real visibleBounds for the ScrollView'sGrace Kloba2010-05-281-1/+1
| | | | | | | | | | | | | | | | | | visibleContentRect. Use the fixedLayout for the main FramView so that the virtual viewport is set up correctly for the css percent calculation. Fix http://b/issue?id=2685194
* | Report correct window.innerWidth and window.innerHeight.Grace Kloba2010-05-271-0/+28
| | | | | | | | | | | | | | | | | | | | | | I agree with this article that we should have a way to report the visible viewport to the JavaScript. http://www.quirksmode.org/mobile/viewports2.html#link6 Fix http://b/issue?id=2717861 I will try to upstream the code to WebKit separately.
* | Merge WebKit at r60074: RenderStyle color accessors are now privateSteve Block2010-05-271-1/+1
| | | | | | | | | | | | See http://trac.webkit.org/changeset/59956 Change-Id: If1839f65ad960250c7dda5b565bd47278aa7df14
* | Refix http://b/issue?id=2509597.Grace Kloba2010-05-261-16/+10
| | | | | | | | | | | | | | | | | | | | Instead of changing the screenRect for the Screen object, change createWindow() logic to depend on the WebCoreViewBridge width/height instead of Screen as Screen is supposed to be in device pixel and it is not proper to be used here. Update the comment for the screenRect so that we won't mistakenly modify it. Fix http://b/issue?id=2690479
* | Provide a string for the case where a file upload control has not had a file ↵Ben Murdoch2010-05-213-5/+8
| | | | | | | | | | | | | | | | attached to it. Requires a frameworks/base change. Change-Id: Ia50d4b8cceb943166198888dad364b09a2dc06a1
* | Add a method to the PlatformBridge to resolve the filename of a fileBen Murdoch2010-05-213-8/+16
| | | | | | | | | | | | | | | | | | given its representation as a content:// URI, and the associated JNI plumbing. Requires a frameworks/base change. Change-Id: I9b8b8bb3fbfa31c86f4212f91c140fe62c6c6682
* | Fix build.Leon Scroggins III2010-05-191-0/+1
| | | | | | | | Change-Id: Ic8251cd255785f7ad1081eba9a0eb8db84697b97
* | Prohibit scrolling not initiated by the user.Leon Scroggins III2010-05-192-1/+4
| | | | | | | | | | | | | | | | | | | | We used to have an ANDROID specific change that was removed when webkit changed. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=57a47dd4f75b9c15804c3c61479540cfdc11bd6e Bug 1330729 Bug 2694223 Change-Id: Id51edbb4943eb0a1357477d4bcd31d838febb8fb
* | Merge "Make sure Geolocation is robust to location providers being absent on ↵Steve Block2010-05-183-6/+6
|\ \ | | | | | | | | | the device."
| * | Make sure Geolocation is robust to location providers being absent on the ↵Steve Block2010-05-183-6/+6
| | | | | | | | | | | | | | | | | | | | | device. Bug: 2692830 Change-Id: Ib6395a04ec916a04cdd3a09569c4ea373fb422e9
* | | ignore offscreen drawing in SVGCary Clark2010-05-171-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing outside of the visible window is recorded so that future scrolls have the correct picture data. When SVG triggers this code path on its way to drawing to an offscreen bitmap, it has not instantiated a WebViewCore object. Since in SVG's case, there's no reason to record drawing outside if the offscreen bitmap, it's correct to do nothing. Offscreen bitmaps do not work with SVG; but that problem is independent of this bug fix. Change-Id: I0b9c6d5506b6a35b2992abfa6bcb1db6cb872fd0 http://b/2682606
* | Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-142-30/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-142-1/+18
| | | | | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* | Merge "Fix crash in fast/frames/iframe-access-screen-of-deleted.html"Ben Murdoch2010-05-131-0/+6
|\ \
| * | Fix crash in fast/frames/iframe-access-screen-of-deleted.htmlBen Murdoch2010-05-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new layout test and triggers a crash inside screenRect() by accessing the null page pointer. Other platform implementations perform a null check on page in this function, so we now do the same to prevent the crash. Change-Id: I2403d7adc157daae69f6fb53bbbf212d9d04341c
* | | Cherry-pick WebKit change 59226 to use standard POSIX version of writeToFile()Steve Block2010-05-121-14/+0
|/ / | | | | | | | | | | | | | | | | | | | | The Android version of writeToFile() tries to support interrupted writes, but has a bug as the data pointer is not updated. So instead we take the standard POSIX version. See https://mondrian.corp.google.com/changelist/75998-p9 and https://bugs.webkit.org/show_bug.cgi?id=38908 Change-Id: I011671211017005a06727e436f92e8458902a7db
* | Merge webkit.org at r58033 : Cherry-pick WebKit change 58774 to avoid ↵Steve Block2010-05-111-8/+0
| | | | | | | | | | | | | | | | conflicts with FileSystemPOSIX.cpp See http://trac.webkit.org/changeset/58774 Change-Id: I646d82752feaafaf0ece6e1cdd099ae2a200995e
* | Merge webkit.org at r58033 : Provide link stub for ↵Steve Block2010-05-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | AccessibilityObject::getAttribute This is used in RenderMenuList. Neither implementation nor call site are guarded with HAVE(ACCESSIBILITY) but Android does not compile any accessibility code. See http://trac.webkit.org/changeset/55425 Change-Id: I3e94a80052287d38c6266e4f01b1b31b127e7781
* | Merge webkit.org at r58033 : Provide new localized string methods for pluginsSteve Block2010-05-111-0/+10
| | | | | | | | | | | | See http://trac.webkit.org/changeset/56337 and http://trac.webkit.org/changeset/57095 Change-Id: I79098600dd15de6c4d699bb75bbbc7dcb6b87754
* | Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-114-550/+13
| | | | | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* | Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-05-072-1/+107
| | | | | | | | | | | | https://android-git.corp.google.com/g/#change,41406 Change-Id: Ief37a7d9879308f0749fcd569e82fddc3f989a8a
* | Add more padding round select boxes, use different assets atLeon Clarke2010-04-261-1/+4
|/ | | | | | different resolutions, use new assets and don't deform the arrows when stretching the select box. http://b/issue?id=2506670
* Pass scroll mode to Java so that we can handleGrace Kloba2010-04-131-1/+10
| | | | | overflow on html and body correctly. Fix http://b/issue?id=2512549
* When we stopUpdating(), we should cancel the outstandingGrace Kloba2010-04-021-1/+4
| | | | | | | | timer. When timer fired, we should check m_lastError before calling errorOccurred(). Fix http://b/issue?id=2560897
* Add on-demand plugin support.Patrick Scott2010-03-232-3/+7
| | | | | | | | | | | | | | | | The Settings object now has an on-demand flag for plugins (this was to avoid more edits to webkit code). If plugins are on-demand and a plugin is installed that can handle the content, insert a placeholder widget. If the user clicks on the placeholder, the plugin will be enabled. The widget currently does not clip the context correctly. It only clips based on the widget frame. This is due to a bug (already filed) where the scroll offset is producing bad clip rectangles. Requires a framework change. Bug: 2411524 Change-Id: If3931da8da2339a2385ae78b609c49fa069892ab
generated by cgit v1.1 at 2025-08-17 22:29:45 +0000