summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Revert Android specific method nameKristian Monsen2011-06-292-2/+2
| | | | | | | | | The name change was reverted in external/chromium in: https://android-git.corp.google.com/g/#change,118320 This fixes external/webkit after that change. Change-Id: I21ff90a8759deee1799e718e0bac06b165477606
* Merge "Browser ST: Support both OES and 2D texture target"Teng-Hui Zhu2011-06-248-37/+193
|\
| * Browser ST: Support both OES and 2D texture targetTeng-Hui Zhu2011-06-248-37/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | B/c of driver limitation, we are using 2D texture target for our Surface Texture, this will be switched to EXTERNAL_OES soon. In order to have smooth transition, I added the code which can handle both types and it depends on what Surface Texture itself reports. Tested with both modes on Crespo since its driver support both. bug:4905428 Change-Id: Ic91702e7b8f75329f7d948e9217f7fc689a95bbb
* | Better way to determine not to reflow.Shimeng (Simon) Wang2011-06-231-2/+2
|/ | | | | | | | | Instead of using border which may be too broad, using whether an object is floating to fix flickr's reflow issue. Checked sites like slashdot.org and nytimes.com, this works better. issue: 4596265 Change-Id: Ic263b1e6fddedb47e410687ed04cd2ac7ccb7bed
* Merge "Do not reflow text if a div has border."Shimeng (Simon) Wang2011-06-231-1/+1
|\
| * Do not reflow text if a div has border.Shimeng (Simon) Wang2011-06-231-1/+1
| | | | | | | | | | | | | | | | This also fixes the case where flickr header's position is not good since it's reflowed for issue 4596265. issue: 4596265 Change-Id: I8445ec408a813935871c5d011b23b70e569105d3
* | Merge "Remove legacy fps cap"John Reck2011-06-232-12/+0
|\ \
| * | Remove legacy fps capJohn Reck2011-06-222-12/+0
| | | | | | | | | | | | | | | | | | Bug: 4743033 Change-Id: Ic0603ecf3af9290bd6d374aa8ddf4342948064ac
* | | Tiles: increase the minimal number to cover the whole screenTeng-Hui Zhu2011-06-221-5/+4
| |/ |/| | | | | Change-Id: Iad5ef9dc1f9944a326e45dd2721cb0005e69f425
* | Browser ST: Lower the upper limit for texture allocationTeng-Hui Zhu2011-06-221-2/+6
|/ | | | Change-Id: Ie88de19e89e298b69b106fbb42d2b9d26bb98014
* Merge "Fix compiler error when DEBUG is turned on"Teng-Hui Zhu2011-06-222-2/+2
|\
| * Fix compiler error when DEBUG is turned onTeng-Hui Zhu2011-06-212-2/+2
| | | | | | | | Change-Id: I1a9d8eab3e5259eade94fc9e825ec4d162a1e392
* | Merge "Remove old customized code."Shimeng (Simon) Wang2011-06-211-7/+0
|\ \
| * | Remove old customized code.Shimeng (Simon) Wang2011-06-211-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes slashdot.org after recent webkit merge, since the removed code will sometimes require extra layout. This code is two years old, and related to iframe flattening, which is not used any more in Android. Android still does frameset flattening. Verified sites such as developer.android.com are still working. issue: 4753055 Change-Id: I69f78bec53671eb488b629bde7cc2c3158f1a510
* | | Merge "Fix the Surface Texture Issue on the phones"Teng-Hui Zhu2011-06-212-0/+3
|\ \ \ | | |/ | |/|
| * | Fix the Surface Texture Issue on the phonesTeng-Hui Zhu2011-06-212-0/+3
| | | | | | | | | | | | Change-Id: Ibee33c53d65a6c1b98f5e88ed79862cd30418347
* | | Merge changes I1f457d1e,I365930f3,Iad35a220Ben Murdoch2011-06-211-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | * changes: Fix storage/transaction-error-callback.html Fix fast/encoding/dumpAsText//utf-16-no-bom.xml Add android-specific result for fast/encoding/meta-in-script.html
| * | Fix fast/encoding/dumpAsText//utf-16-no-bom.xmlBen Murdoch2011-06-211-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | This test now expects us to use the XMLTreeViewer, so make sure that it's enabled. SetDeveloperExtras enables the XMLTreeViewer and Inspector, but we have no inspector on Android, so this is just toggling the XMLTreeViewer on. Change-Id: I365930f34003d6e97aed88af77746c784a3c3bd1
* | The background image should be opaqueTeng-Hui Zhu2011-06-201-2/+2
| | | | | | | | | | bug:4406718 Change-Id: Iea532c639bf41aad2488819d42c315a0e3d747fd
* | Copied into Surface Texture line by line instead of pixel by pixel.Teng-Hui Zhu2011-06-201-7/+4
|/ | | | Change-Id: Ide38fce4ba0be0eb506cb4c5497915e11812b6bd
* Merge "Turn the Surface Texture path on for baseTile"Teng-Hui Zhu2011-06-178-65/+156
|\
| * Turn the Surface Texture path on for baseTileTeng-Hui Zhu2011-06-178-65/+156
| | | | | | | | Change-Id: I852c546b2c62419ccfb96ed1c0d157e49a3b1aef
* | Merge "Ignore the initial empty document when setting viewport size."Shimeng (Simon) Wang2011-06-171-0/+5
|\ \
| * | Ignore the initial empty document when setting viewport size.Shimeng (Simon) Wang2011-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the issue where "google legal" dialog will show empty content, since the initial empty document will get laid out and used in some circumstances. issue: 4501857 Change-Id: I779d983f3c81724663391872de81ceed025adec1
* | | Merge "Change mTextSize to be a percentage"John Reck2011-06-171-9/+3
|\ \ \
| * | | Change mTextSize to be a percentageJohn Reck2011-06-161-9/+3
| | | | | | | | | | | | | | | | Change-Id: I22720665be2900121acaa3801adc36f3d7fddeae
* | | | Merge "Interface clean up for porting Surface Texture, no functional change."Teng-Hui Zhu2011-06-178-76/+176
|\ \ \ \ | | |_|/ | |/| |
| * | | Interface clean up for porting Surface Texture, no functional change.Teng-Hui Zhu2011-06-168-76/+176
| | | | | | | | | | | | | | | | Change-Id: I0d43dd94a1bb4666d20a39b2b272337e89a21d8b
* | | | Fix rounded rectangle background colour.Ben Murdoch2011-06-161-0/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Apply WebKit change http://trac.webkit.org/changeset/83002 to our GraphicsContext port. Bug: 4674341 Change-Id: I1399ae0f12aff3f24417a7d6f36006a73e8e48ff
* | | Merge "Set appropriate initial viewport bounds."Shimeng (Simon) Wang2011-06-151-1/+8
|\ \ \ | | |/ | |/|
| * | Set appropriate initial viewport bounds.Shimeng (Simon) Wang2011-06-151-1/+8
| |/ | | | | | | | | | | | | | | This fixes lots of cases where various legal/license dialog show empty content. issue: 4501857 Change-Id: I113b1b43ec1b2f17fad4bf9fbf6aa17f8b10240c
* | Merge "Rmove unnecessary passing of unused parameter"Ben Murdoch2011-06-151-1/+1
|\ \
| * | Rmove unnecessary passing of unused parameterBen Murdoch2011-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Requires a change in external/chromium, see If349cd2ffd56b9f539d4ebdb8944964fc57289e5 Change-Id: I88d7c291ee1ffd1b1c413ffaf59acf5e4ae57c78
* | | Fix the crash caused by recent webkit RenderLayerCompositor changeTeng-Hui Zhu2011-06-151-0/+9
| |/ |/| | | | | | | | | | | | | | | | | | | | | We used to rely on the fact that RenderLayerBacking is the only subclass of GraphicsLayerClient, but now the RenderLayerCompositor also inherit it and is used for iframe. That cause us to get invalid pointer in GraphicsLayerAndroid. The solution here is to disable the new webkit approach b/c we have our own iframe support already. bug:4592195 Change-Id: Ia786233907d83028fdc6865c28fbbd5291564ad0
* | Merge "Support for getting the background color"John Reck2011-06-151-0/+15
|\ \ | |/ |/|
| * Support for getting the background colorJohn Reck2011-06-141-0/+15
| | | | | | | | Change-Id: Ia8b0f97a5d50b3c16b8d59bb7af42899a614b676
* | Merge changes I637b26fb,Icf028ea9Kristian Monsen2011-06-146-9/+12
|\ \ | | | | | | | | | | | | | | | * changes: Merge Chromium at r11.0.672.0: Fix autofill Merge Chromium at r11.0.672.0: Compile fixes
| * | Merge Chromium at r11.0.672.0: Fix autofillKristian Monsen2011-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major refactoring in CL: http://codereview.chromium.org/5958021 Created wrapper function to call in chromium CL: https://android-git.corp.google.com/g/#change,113980 Change-Id: I637b26fb2e3ccb544adfc818b94047ef5a2c5aad
| * | Merge Chromium at r11.0.672.0: Compile fixesKristian Monsen2011-06-085-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebRequestContext.h: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924 Other files: base/lock.h moved to base/synchronization/lock.h contents to base namespace: http://codereview.chromium.org/6018013 Change-Id: Icf028ea9cd32746c6681751bc86935aefb7c0084
* | | Fix build by adding missing WebTiming bindings fileSteve Block2011-06-151-0/+1
| | | | | | | | | | | | Change-Id: I959b25a9447154395f168132f908c0f4512d4be6
* | | Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMINGSteve Block2011-06-143-2/+9
| | | | | | | | | | | | | | | Bug: 4442995 Change-Id: I9c37d7022946fd66e1ee635328182bf1456b0de7
* | | Cherry-pick WebKit change 85873 to fix a performance timing bugSteve Block2011-06-141-3/+0
| |/ |/| | | | | | | | | | | See http://trac.webkit.org/changeset/85873 Bug: 4442995 Change-Id: I27c5d678a534ec0b64d59868f6f77e51c477e89d
* | Merge WebKit at branches/chromium/742 r88085: Implement new ↵Steve Block2011-06-141-0/+2
| | | | | | | | | | | | | | | | | | ChromeViewClient::webView() This is only required on Chromoium See http://trac.webkit.org/changeset/85823 Change-Id: I61069d27bfbdabb88474c759e2bb8723e5913783
* | Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-14145-778/+23142
| | | | | | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* | Move all ANDROID defines to wtf/Platform.hSteve Block2011-06-142-148/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves many defines from WebCore/config.h to keep all of the Android defines together. Also, WebCore/config.h should not be used by JavaScriptCore (though currently it is on Android), whereas wtf/Platform.h is always included. Some Android defines in WebCore/config.h are already usptreamed, but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602 Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af
* | Merge "Add javascript 'select' event"Russell Brenner2011-06-131-0/+6
|\ \
| * | Add javascript 'select' eventRussell Brenner2011-06-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The jni code uses lower-level apis for controlling text selections that are hard-wired as non-user actions. This change adds an additional call from the jni code to signal that the selection changed due to user action. Bug: 4444489 Change-Id: I5a637ad9826455e21d43d1e28476b1c814cb65f7
* | | Merge "Ignore webkit-text-size-adjust: none"John Reck2011-06-131-0/+13
|\ \ \
| * | | Ignore webkit-text-size-adjust: noneJohn Reck2011-06-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 4486008 Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
* | | | Clarify comments about initialising V8 in WebViewCore ctor.Ben Murdoch2011-06-101-2/+3
| | | | | | | | | | | | | | | | Change-Id: Icad45701d81d3ff07470ee2f6d2087c3a3252e84