| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
|
|
|
|
| |
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
|
|
|
|
| |
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
|
|
|
|
| |
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
|
|
|
|
| |
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
WebCore/page/FrameView.cpp
http://trac.webkit.org/changeset/69896
WebCore/html/parser/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/69283
WebCore/html/HTMLPlugInElement.h
http://trac.webkit.org/changeset/69596
WebCore/html/HTMLInputElement.cpp
http://trac.webkit.org/changeset/68996
http://trac.webkit.org/changeset/69378
WebCore/plugins/npapi.cpp
http://trac.webkit.org/changeset/69808
WebCore/css/CSSComputedStyleDeclaration.cpp
http://trac.webkit.org/changeset/69220
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/69196
WebCore/rendering/style/RenderStyle.h
http://trac.webkit.org/changeset/68680
WebCore/rendering/RenderImage.cpp
http://trac.webkit.org/changeset/68917
WebCore/platform/android/FileSystemAndroid.cpp
http://trac.webkit.org/changeset/69594
WebCore/inspector/InspectorController.h
http://trac.webkit.org/changeset/68767
See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which
is why this is a conflict.
JavaScriptCore/parser/Parser.cpp
http://trac.webkit.org/changeset/69516
Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
|
|
|
|
| |
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
|
|
|
|
|
|
|
|
|
|
|
| |
Move the call to WebViewCore::updateTextfield() to the PlatformBridge
so that WebCore code does not depend on WebKit code to compile.
In addition to being a layering violation, the inclusion of
WebViewCore.h includes WebCoreJni.h, which in a future change
causes LOG to get #undefined when using the chromium net stack.
Change-Id: Id88d332624323e03ce82120ef55db200cbabe63b
|
|
|
|
| |
Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Whitespace difference in config.h - http://trac.webkit.org/changeset/67323
- WebCore/config.h
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882
- WebCore/css/CSSComputedStyleDeclaration.cpp
Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704
- WebCore/css/CSSParser.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667
- WebCore/css/CSSParser.cpp
- WebCore/css/CSSStyleSelector.cpp
Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292
- WebCore/dom/Document.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903
- WebCore/html/HTMLInputElement.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198
- WebCore/loader/DocumentLoader.cpp
- WebCore/loader/FrameLoader.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253
- WebCore/loader/FrameLoader.cpp
Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762
- WebCore/page/DOMWindow.cpp
Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375
- WebCore/platform/MIMETypeRegistry.cpp
Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325
- WebCore/plugins/PluginView.cpp
Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBox.h
- WebCore/rendering/RenderTable.cpp
Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862
- WebCore/rendering/RenderTableCell.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667
- WebCore/rendering/style/RenderStyle.h
Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c
fix conflicts
Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
|
|
|
|
| |
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
|
|
|
|
|
|
| |
This is an Android addition
Change-Id: I2784049bd97d970c5a21a08b256a2eb528700cd1
|
|
|
|
| |
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
|
|
|
|
| |
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
|
|
|
|
| |
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
|
|
|
|
| |
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
|
|
|
|
| |
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
|
|
|
|
| |
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
|
|
|
|
| |
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
|
|
|
|
| |
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
|
|
|
|
| |
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
|
|
|
|
| |
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
|
|
|
|
| |
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
|
|
|
|
| |
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
|
|
|
|
| |
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
|
|
|
|
| |
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
|
|
|
|
| |
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
|
|
|
|
| |
Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
|
|
|
|
| |
Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a
|
|
|
|
| |
Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44
|
|
|
|
| |
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
|
|
|
|
|
|
|
|
| |
upstreamed to webkit.org.
See https://bugs.webkit.org/show_bug.cgi?id=32675
Change-Id: Ife24867a1c96a3b46226d06862198a2e6dfeb216
|
|
|
|
|
|
|
| |
The new WebKit merge caused a build break when auto-merged from eclair-mr2 to
master, due to the fact that master uses stl_port.
Change-Id: I1437352a3439f3e103572ed3e1bb523ec65e98ef
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Notes ...
For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644
For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636
For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257
For Geolocation.cpp, see http://trac.webkit.org/changeset/50605
For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004
For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523
For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996
For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465
Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial.
Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
|
|
|
|
| |
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
|
|
|
|
| |
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
|
|
|
|
| |
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
|
|
|
|
| |
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
|
|
|
|
|
|
|
| |
Even if the input element doesn't have focus, synchronize
the WebTextView if the pointers match.
fixes http://b/issue?id=2096746
|
| |
|
| |
|
|
|
|
| |
Automated import of CL 145796
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|