summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Special file uris have to be handled in Java.Kristian Monsen2010-08-2411-20/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This depends on: https://android-git.corp.google.com/g/#change,62112 Request an java.io.InputStream from java and queries this for that until all is read. Change-Id: Ia3e7ad973700bd49be9cae9b432661d61a5470b8
* | | | | | | | am 0ee15178: (-s ours) am e4be1fd5: DO NOT MERGE Refactor find and select ↵Cary Clark2010-08-240-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialogs Merge commit '0ee151789837b0429171a2eeeedc93ce2f8d8d10' * commit '0ee151789837b0429171a2eeeedc93ce2f8d8d10': DO NOT MERGE Refactor find and select dialogs
| * | | | | | am e4be1fd5: DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-204-220/+1430
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e4be1fd5f14137de249ee66c000f9dadfb2862d7' into gingerbread-plus-aosp * commit 'e4be1fd5f14137de249ee66c000f9dadfb2862d7': DO NOT MERGE Refactor find and select dialogs
| | * | | | | DO NOT MERGE Refactor find and select dialogsCary Clark2010-08-204-220/+1430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Change imported by hand from master, based on https://android-git.corp.google.com/g/#change,53489 ) SelectText now permits incremental extension of the selection using either touch or trackball data. SelectText adds word selection and select all interfaces. SelectText has been rewritten to do a better job of finding space characters and selecting text outside of the visible window. Companion changes in frameworks/base and packages/apps/Browser Change-Id: I28a815375345d842f79464edbf0cb3a2019b7fe8 http://b/2626451
* | | | | | | Merge changes ↵Steve Block2010-08-241200-14004/+31088
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339,I268dfe7d,Icaf70d9f,Ie234f1a0,Iff5c7aaa,I69b75bf0,Ifbf384f4 * changes: Merge WebKit at r65615 : Update WebKit revision number Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html Merge WebKit at r65615 : Android-specific results for Geolocation tests. Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer. Merge WebKit at r65615 : processingUserGesture() is now static. Merge WebKit at r65615 : UTF8String() becomes utf8(). Merge WebKit at r65615 : Fix include paths for string headers. Merge WebKit at r65615 : Fix Makefiles. Merge WebKit at r65615 : Fix conflicts. Merge WebKit at r65615 : Initial merge by git.
| * | | | | | | Merge WebKit at r65615 : Update WebKit revision numberIain Merrick2010-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e7e23173a0204b92bcb959f051588341aeb1dac
| * | | | | | | Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.htmlIain Merrick2010-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test added in http://trac.webkit.org/changeset/64613 Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196 Change-Id: Ie6ccde3a2fa034f58676f6359af351a3544c9541
| * | | | | | | Merge WebKit at r65615 : Android-specific results for Geolocation tests.Iain Merrick2010-08-242-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests added in http://trac.webkit.org/changeset/65416 On Android, we currently aren't printing the onunload handler message. Change-Id: I3e89f23127f82be75c6e90825b87489f460195ff
| * | | | | | | Merge WebKit at r65615 : Fix GraphicsContext and ImageBuffer.Iain Merrick2010-08-242-40/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was refactored in http://trac.webkit.org/changeset/65449 Clipping is unimplemented (same as before). Change-Id: Id06ff3396676f044ffdc06bf40edd1d323fb1dcb
| * | | | | | | Merge WebKit at r65615 : processingUserGesture() is now static.Iain Merrick2010-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/65082 Change-Id: I268dfe7d9ab60453129f00b00cdd5f8ac954855c
| * | | | | | | Merge WebKit at r65615 : UTF8String() becomes utf8().Iain Merrick2010-08-235-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was changed for JSC strings in http://trac.webkit.org/changeset/65305, but the V8 implementation was not updated. Fix upstream in WebKit -- see https://bugs.webkit.org/show_bug.cgi?id=44419 Change-Id: Icaf70d9f8a3120613ab3e80b69d4ce0c7af89d46
| * | | | | | | Merge WebKit at r65615 : Fix include paths for string headers.Iain Merrick2010-08-2311-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These moved to <wtf/text> in http://trac.webkit.org/changeset/65077 Change-Id: Ie234f1a09013e48a5241d9e240c5b2e85ca75125
| * | | | | | | Merge WebKit at r65615 : Fix Makefiles.Iain Merrick2010-08-232-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebkitTools/Scripts/create-html-entity-table was added in http://trac.webkit.org/changeset/65351. Change-Id: Iff5c7aaa13e79f3666ef4176ca12d284c985b005
| * | | | | | | Merge WebKit at r65615 : Fix conflicts.Iain Merrick2010-08-233-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing call to Geolocation::stop(), which was lost in the merge with http://trac.webkit.org/changeset/65416 We may still have memory leaks here. This is being tracked in https://bugs.webkit.org/show_bug.cgi?id=39288 Change-Id: I69b75bf07775536ac603a450dbde8c2935c4db16
| * | | | | | | Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-231176-13904/+30985
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* | | | | | | Merge "Enable cookies for files."Kristian Monsen2010-08-241-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Enable cookies for files.Kristian Monsen2010-08-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the page cycler, and is probably more compatible with the old http stack. Maybe we should tweak this later, but for now just enabling all file cookies. Change-Id: Ic21bbb6f82d3667671818d9b325de46901f43f33
* | | | | | | | Fix WebView saveState and restoreState for private browsing mode.Elliott Slaughter2010-08-232-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a handler for browser:incognito url to simplify WebView implementation. Change-Id: Ic453bbee7436a210b3d596fb2e7fa96791cd5fc9
* | | | | | | | Merge "Fix location of several Android-specific LayoutTest expected results"Steve Block2010-08-236-18/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix location of several Android-specific LayoutTest expected resultsSteve Block2010-08-236-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These results were previsouly duplicated in the JSC and V8-specific directories. This change moves them to the general android directory. Change-Id: I65c7db3759f91b62502e8f5b2c8673305f05d0f5
* | | | | | | | | Merge "Complete implementation of PathAndroid.cpp"Cary Clark2010-08-231-19/+8
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Complete implementation of PathAndroid.cppCary Clark2010-08-231-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completing the implementation fixes these bugs http://b/2941002 http://b/2869593 Change-Id: I7bf8964bd91c86c89d7d29007c9a33647c399080
* | | | | | | | | Merge "Bug2857086 - memory leak in FontCustomPlatformData. The change can ↵claireho2010-08-201-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | also fix Chrome issue32353 - need to patch to Chrome."
| * | | | | | | | Bug2857086 - memory leak in FontCustomPlatformData.claireho2010-08-201-0/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change can also fix Chrome issue32353 - need to patch to Chrome. Change-Id: I08df08f2316156e78e9b63415e9c8720ab193090
* | | | | | | | Merge "order text selection by line centers"Cary Clark2010-08-201-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | order text selection by line centersCary Clark2010-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The older logic assumed that lines don't overlap, but in the case of Google news, the lines do overlap. The new logic uses the line centers for ordering. Change-Id: I56074d289f76ed5027e3a498753caf50644b97f0 http://b/262451
* | | | | | | | | Merge "Cleanspec so the reverting of the chrome http stack takes effect."Kristian Monsen2010-08-191-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cleanspec so the reverting of the chrome http stack takes effect.Kristian Monsen2010-08-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If55cf19f648c58d0042925ad616c3357d7e136f0
* | | | | | | | | | Merge "Switching back to java http stack for tonights build"Kristian Monsen2010-08-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Switching back to java http stack for tonights buildKristian Monsen2010-08-191-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27900e81e58905c76fe9c62c532571451aa2abd7
* | | | | | | | | Fixes a race condition in the Chrome HTTP stackSteve Block2010-08-191-3/+8
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a possible race condition between the IO thread finishing the request and the WebCore thread cancelling it. If the request has already finished, ignore subsequent calls to finish to avoid sending duplicate finish messages to WebCore. Change-Id: I44f61c1b29baef686e59b66b40b32d9b1d9699c2
* | | | | | | | Implement DeviceOrientationSteve Block2010-08-197-12/+269
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I12d5632b37db581065db9bcbd49f3dc28ecd7719
* | | | | | | Merge "Fix for incognito mode cookies from WebCore."Elliott Slaughter2010-08-183-16/+29
|\ \ \ \ \ \ \
| * | | | | | | Fix for incognito mode cookies from WebCore.Elliott Slaughter2010-08-183-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id7c2ae708c166da035f1fdda8351b921d86d78de
* | | | | | | | Remove calls to change the state of the focus controller.Leon Scroggins2010-08-184-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2582455 Never modify the focused state of the focus controller. A corresponding java change make the active state get changed only when the webview gains/loses focus. Change-Id: I6f17f82c772ea4410c0209bf57d251c9bd384e6c
* | | | | | | | Merge "Add CSS cursor ring definitions"Cary Clark2010-08-1822-42/+593
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add CSS cursor ring definitionsCary Clark2010-08-1822-42/+593
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows web pages to have fine-grain control over the appearance of the rings drawn around nodes. Generated links (email, addresses, phone numbers) are no longer given unique colors. To preserve this feature, a separate change could add an HTML extension similar to vlink to provide the cursor ring defintions for theses links. The mechanism implemented below isn't appropriate since these links don't necessarily correspond to single DOM nodes or other DOM elements. ------------ CSS examples ------------ The CSS to specify the ring looks like: -webkit-ring-fill-color:rgba(0,0,255,0.4); -webkit-ring-inner-width:2 px; -webkit-ring-outer-width:3.5 px; -webkit-ring-outset: 8 px; -webkit-ring-pressed-inner-color:rgba(0,0,255,0.8); -webkit-ring-pressed-outer-color:rgba(0,0,127,0.3); -webkit-ring-radius: 10 px; -webkit-ring-selected-inner-color:rgba(63,63,255,0.8); -webkit-ring-selected-outer-color:rgba(63,63,127,0.3); and may be alternately defined with a property shortcut: -webkit-ring:rgba(255,0,0,0.4) 5px 7px rgba(255,0,0,0.8) rgba(127,0,0,0.3) 20px rgba(255,63,63,0.8) rgba(127,63,63,0.3); -------------------- Property definitions -------------------- A vertical cross-section of the ring corresponds to these parameters as shown: ______ R / ___O_ R = corner radius / / __I_ o I = inner ring / / / _O_ ^ O = outer ring | | | / F | F = fill |O|I|O| L o = outset | | | \_F_ | L = original link \ \ \__O_ V \ \___I_ o R \____O_ The fill color specifies what to draw inside the ring when the link is followed. The fill area consists of the original link area plus the outset. The inner and outer widths specify the stoke width of the inner and outer rings, respectively. The widths may be specified in fractional pixels. The implementation captures 4 bits of the fraction. The outset specifies the distance from the edge of the original link to the rings' center. Both rings are drawn at the same center location. The radius specifies the curvature of the corners at the center of the rings. ------------- Data lifetime ------------- The selected colors specify the colors of the inner and outer rings when the trackball or D-pad hovers over the link. The pressed colors specify the colors of the rings when the trackball center is pressed or the link is tapped. The CSS data is recorded in the RenderStyle when the DOM is parsed. The widths are scaled up by 16 to preserve the fraction. When the nav cache is built, the CSS style information is recorded in the CachedColor class. Only unique style sets are recorded; many CachedNode instances can share the same CachedColor instance. When the cursor ring is drawn, the CachedColor is retrieved by getting the index from the CachedNode, and looking up the entry in the CachedFrame. The widths are scaled down by 16 since Lengths are stored by the webkit as integers. ---------- File Edits ---------- WebCore/Android.derived.mk - Build the CSS data property tables by concatentating Android specific data and optionally SVG data. WebCore/config.h - Add switch for these rings. This switch is meant as a convenience for finding the code in WebKit that was added to enable this feature. Since the old code in DrawCursor has been removed, it does not revert to the old behavior if the switch is turned off. WebCore/css/AndroidCSSPropertyNames.in - The new ring properties, plus an old one we added before. WebCore/css/CSSComputedStyleDeclaration.cpp WebCore/css/CSSMutableStyleDeclaration.cpp WebCore/css/CSSParser.cpp WebCore/css/CSSStyleSelector.cpp - I can guess what these functions are for as well as anyone, but I really don't know. Do I need all of them? Do I need to modify Mutable at all? WebCore/css/CSSPropertyNames.in - Moved Android addition to AndroidCSSPropertyNames.in WebCore/platform/graphics/Color.h - Added initial color values here. WebCore/platform/graphics/android/android_graphics.* - This draws the cursor ring. The code that draws 'synthetic' links has been discarded. WebCore/rendering/style/RenderStyle.h - Functions to get, set, and initialize the style data. WebCore/rendering/style/StyleRareInheritedData.* - The storage for the style data and an equivalence function. WebKit/Android.mk - Added CachedColor to the build. WebKit/android/nav/CacheBuilder.cpp - Record the color from the DOM into the cache. WebKit/android/nav/CachedColor.* - Store the cached color info. WebKit/android/nav/CachedFrame.* - Where the array of colors is stored. WebKit/android/nav/CachedNode.* - Where the index to the colors is stored. Change-Id: Ia3a931f41d6545e47678e245aafe7c84d4658f94 http://b/2603197
* | | | | | | Merge "Geolocation delayed permission LayoutTests now pass"Steve Block2010-08-181-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Geolocation delayed permission LayoutTests now passSteve Block2010-08-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#change,61829 Bug: 2914450 Change-Id: Ica6864fc4dc28d92b1a98eee3c588e4007b7e803
* | | | | | | | Merge "Get the build bot to use the chrome stack."Patrick Scott2010-08-181-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Get the build bot to use the chrome stack.Patrick Scott2010-08-181-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib44e439bc272810e409f61477612dbbf30bb6371
* | | | | | | | Get user agent and accept language from the UI settings.Kristian Monsen2010-08-183-4/+47
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding alternate http in the end of the UA string to identify which http stack is used. Finally, cleaning up some old includes. Change-Id: If165403a066009ca85dbf28d6024f1419cfae4fa
* | | | | | | Merge "Make V8 the default JS engine on all builds (except sim)."Ben Murdoch2010-08-182-10/+10
|\ \ \ \ \ \ \
| * | | | | | | Make V8 the default JS engine on all builds (except sim).Ben Murdoch2010-08-182-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to use the ARCH_ARM_HAVE_VFP build flag to determine which JS engine to use as we wanted to use JSC for performance reasons on older hardware. This is not necessary anymore and so unless specified with the JS_ENGINE environment variable or when building on the simulator, we default to V8 instead of JSC. Change-Id: I773af968d5a7e7a7882d8763de4f90f1d08104b3
* | | | | | | | Fix acid3 crash.Patrick Scott2010-08-181-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2928878, 2928899 Change-Id: I90ca6f93a61c921b520731e6a143e5b4457fa44c
* | | | | | | Browser incognito mode support for cookies and cache with chrome http stack.Elliott Slaughter2010-08-1711-33/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib097f8fda80cf33185d9b6a3a00a47ca83a7e678
* | | | | | | Merge "Don't show text/vnd* mime types in the Browser."Patrick Scott2010-08-171-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't show text/vnd* mime types in the Browser.Patrick Scott2010-08-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2809660 Change-Id: Idb0bdc33dae6e1148dc92ff1d0137550cc054e3a
* | | | | | | | am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes crash in ↵Henrik Baard2010-08-171-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCoreFrameBridge.cpp Merge commit '3c54ece08a0ea9e5dc5d5788a4c49c8dc94b501f' * commit '3c54ece08a0ea9e5dc5d5788a4c49c8dc94b501f': activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
| * | | | | | am 5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cppHenrik Baard2010-08-171-2/+13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5dc34a8555dde1ae4a2c174870c4296cc44f8a22' into gingerbread-plus-aosp * commit '5dc34a8555dde1ae4a2c174870c4296cc44f8a22': activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp