summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Reduce the number of the composited layers."Chris Craik2012-01-251-1/+13
|\
| * Reduce the number of the composited layers.Chris Craik2012-01-121-1/+13
| | | | | | | | | | bug:5660814 Change-Id: I2205ba44c33cb7424fcd7f18648bd20d8ced07e8
* | Merge "Fix auto-complete for content-editable fields."George Mount2012-01-252-102/+160
|\ \
| * | Fix auto-complete for content-editable fields.George Mount2012-01-242-102/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5608192 Made text edit code also work with content editable fields. Added content-editable-specific text field initialization callback into java. Framework change: I5f1fcc13a0abe204db301e027954dc47c3a48db0 Change-Id: Idcf8d99d9e844669ea68122a7509990f5ce8dcca
* | | Fix form button layoutMichael Kolb2012-01-249-204/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5822424 Fixed by removing all padding adjustments and rendering buttons natively as draw commands Change-Id: I6adcdfbd75b3c586414b5e6e60aeca01f5d05b9d
* | | Merge changes Ie4655349,I8696c362,Ie18ec51fRussell Brenner2012-01-241-15/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix uninitialized return value for decoding Refine WebHistory log output Revert "Enable verbose debugging for WebHistory"
| * | | Fix uninitialized return value for decodingRussell Brenner2012-01-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::TextEncoding::decode() has a return flag, passed by reference, which is set only upon failure, remaining uninitialized upon success. The flag is now initted to false by the caller. If it then changes to true, it indicates an actual failure, so we exit early. Change-Id: Ie4655349b8e44d92e8d7cc7531a6bcc077efbb34
| * | | Refine WebHistory log outputRussell Brenner2012-01-241-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Log output is more explicit upon failure, but otherwise quiet. Bug: 5143832 Change-Id: I8696c36277b0fac12698b4ace9cf4131344f6a0c
| * | | Revert "Enable verbose debugging for WebHistory"Russell Brenner2012-01-231-1/+0
| | | | | | | | | | | | | | | | This reverts commit 5c18ff59df2320908e33f4b17675650073b5d22b.
* | | | Add tree swapping properties and statsChris Craik2012-01-244-8/+41
| |/ / |/| | | | | | | | Change-Id: I0033b8794ae33dade050069d6c209653f0d21fd1
* | | Merge "Delay the shader init till the draw time."Teng-Hui Zhu2012-01-231-3/+11
|\ \ \
| * | | Delay the shader init till the draw time.Teng-Hui Zhu2012-01-231-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLWebViewState::setupDrawing is checking whether or not the shader has been initialized and initialize it if necessary now, with that, we don't need to initialized the GL resource in the constuctor of ShaderProgram any more. TODO: create/destroy all GL resources as request. bug:5093097 Change-Id: I8b280a9060a8f8fc2f03b8427feb597928ea6d9f
* | | | Merge "Removed navcache from scrollToFrame() and nativeFindAll()."Victoria Lease2012-01-231-13/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Removed navcache from scrollToFrame() and nativeFindAll().Victoria Lease2012-01-201-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these functions now work with the current base layer's picture set. That should have the navcache completely out of find-on-page. Change-Id: I8ab4ac4a3a4d16cfff034e73aa817fad1fc426a7
* | | | Merge "Add cut and paste to ContentEditable."George Mount2012-01-233-0/+200
|\ \ \ \
| * | | | Add cut and paste to ContentEditable.George Mount2012-01-183-0/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5806267 Use visual selection to determine the webkit selection. The webkit selection can be used to cut text from an editable area. It can also be used to do better complex character text copy. Framework Change: I56543d17670a8c98484314c89c7fa6a94cb809e4 Change-Id: I194c6d9e2add67151b97092a1a54f5c081296000
* | | | | am 9d7bc9ea: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-200-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | * commit '9d7bc9eaf8882a80d7fb8dd157088d2a436766fe':
| * | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2012-01-190-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ibf6dbc7d7441925ba87642751888df2f5f15e347
| | * \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2012-01-130-0/+0
| | |\ \ \ \
* | | \ \ \ \ Merge "Remove ANDROID_CSS_RING"John Reck2012-01-1917-547/+25
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Remove ANDROID_CSS_RINGJohn Reck2012-01-1817-547/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7395a5f17b0ccfe8dafcc97fa3ab8897676608e9
* | | | | | | Merge "Support aspect ratio for the inline video"Teng-Hui Zhu2012-01-185-19/+69
|\ \ \ \ \ \ \
| * | | | | | | Support aspect ratio for the inline videoTeng-Hui Zhu2012-01-185-19/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the aspect ratio is using the element attributes, now we honor the aspect ratio reported by the video. bug:5880615 Change-Id: I1ed29e9e8df3f9ec3d67c027838ce3edfa3aefd4
* | | | | | | | Merge "Fix software extras on base layer"John Reck2012-01-184-12/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix software extras on base layerJohn Reck2012-01-184-12/+10
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to revist software drawing in general, but this gets it working for now Change-Id: I1745de7a67c75400c31a070f1e17a0602b0df190
* | | | | | | | Add tapHighlightColor supportJohn Reck2012-01-182-3/+14
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic49abd60a206e97c9a397e3f89c4acbdc3b982ff
* | | | | | | Merge "Support javascript to exit full screen video"Teng-Hui Zhu2012-01-173-0/+24
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Support javascript to exit full screen videoTeng-Hui Zhu2012-01-163-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When webkit side receive the webkitExitFullscreen, just send it over to the java side. framework change: https://android-git.corp.google.com/g/#/c/158653/ Change-Id: Ice2a5ea33458a8bf3e6990e288d94d5f032b0921
* | | | | | Merge changes Id68b9b29,I2f1a6b3d,I8cde579dRussell Brenner2012-01-171-150/+207
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Enable verbose debugging for WebHistory Refactor WebHistory Update unitTest to match current WebHistory
| * | | | | | Enable verbose debugging for WebHistoryRussell Brenner2012-01-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on logging of WebHistory read/write and activate ALOG_ASSERT. Change-Id: Id68b9b294f826f77bbfbc6f19d1e09d23cce98a1
| * | | | | | Refactor WebHistoryRussell Brenner2012-01-171-148/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code for reading strings and other data types has been refactored into support routines. Modified comparisons and pointer-based math to remove potential overflow errors when handling corrupted data. Remove unnecessary call to RefPtr::clear(). Bug: 5143832 Change-Id: I2f1a6b3d12cfeb2e8226e190dcd9e391609760a1
| * | | | | | Update unitTest to match current WebHistoryRussell Brenner2012-01-171-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New elements have been added to WebHistory over time without making corresponding changes to the unitTest code. This brings the test code in sync with the current WebHistory class. Change-Id: I8cde579d2820e8f5c72cf34b264ee2e57a4acbd9
* | | | | | | Merge "Basic code cleanup"Russell Brenner2012-01-171-114/+114
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Basic code cleanupRussell Brenner2012-01-171-114/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change function names for WebKit style, from this_style() to thisStyle(). Replace terse variable names with ones that are more expressive: l => fieldLength v => vector e => encoding Move from WebKit logging (LOG_VERBOSE) to platform logging (ALOGV). Change-Id: I303bb03cb29031ae39e79c2f722c2247dbf9f888
* | | | | | | Merge "Only draw cursor rings once."Victoria Lease2012-01-173-2/+29
|\ \ \ \ \ \ \
| * | | | | | | Only draw cursor rings once.Victoria Lease2012-01-133-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5853891 Drawing GLExtras for each layer might have fixed MatchInfo positions, but has had the side-effect of causing cursor rings to be drawn once per layer, resulting in multiple cursor rings being drawn when links are clicked. Oops! Making certain that cursor rings are only drawn when GLExtras are rendering the correct layer addresses this issue. This has a side-effect of rendering cursor rings in the correct position when layers have been scrolled, which was not hapening before this change. Bonus! Change-Id: Ie55e132dddd5b420b1738aa6049229996083008a
* | | | | | | | Merge "Honor 50 millisecond cap for WebKit JavaScript execution."George Mount2012-01-171-23/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Honor 50 millisecond cap for WebKit JavaScript execution.George Mount2012-01-131-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5843118 WebKit provides a 50 millisecond cap for executing JavaScript to ensure that UI remains responsive by allowing recordContent in the WebViewCore thread to run. JavaSharedClient::ServiceFunctionPtr processes functions until they are all complete, circumventing the timeout. This CL processes only a single function and then schedules additional calls if any remaining calls exist. Change-Id: I3e013ceeb02da475e0b1e37e715598a2fe048b12
* | | | | | | | | Merge "Refactor hit test object"John Reck2012-01-175-203/+361
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refactor hit test objectJohn Reck2012-01-135-203/+361
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9729ca695fda4eefd3aa57d96a872010a3cfba9a
* | | | | | | | | Merge "Implement the TODO items for VerticalTextMap.cpp"claireho2012-01-131-5/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Implement the TODO items for VerticalTextMap.cppclaireho2012-01-131-5/+2
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug5094208 : VerticalWriting mode support. Change the VerticalText mapping table after receiving the glyph for vertical comma from Monotype. Change-Id: I74a5d9922fa973c60ff3e2eb4beda25bbc52da4a
* | | | | | | | | Merge "fix jumpy scrolling on layers"Michael Kolb2012-01-131-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix jumpy scrolling on layersMichael Kolb2012-01-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5782062 added scrollbar size to layer size Change-Id: I66f91f7837edaca5d78b12a615360502f8016f31
* | | | | | | | | | am 03eb7752: am 3c049d2a: Prevent infinite loop when turning on then off ↵Nicolas Roard2012-01-131-0/+14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | composited mode * commit '03eb77527d30a22d267944a86c9336351d6020b5': Prevent infinite loop when turning on then off composited mode
| * | | | | | | | | am 3c049d2a: Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-131-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c049d2aded213c7bcc49cdb7283cf0fcb509644': Prevent infinite loop when turning on then off composited mode
| | * | | | | | | | Prevent infinite loop when turning on then off composited modeNicolas Roard2012-01-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5820635 Change-Id: I24b6eae6c76c29e44106b4ec87e74d945aad7b1b
* | | | | | | | | | Merge "Fix GPL build"Glenn Kasten2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix GPL buildGlenn Kasten2012-01-121-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idc6090204f7f91a395564e9436d744b6e78d7468
* | | | | | | | | | Merge "Fix use of DBG_SET_LOG in WebViewCore."Mangesh Ghiware2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |