summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLBodyElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-1/+10
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Fix a WebCore/WebKit layering violationBen Murdoch2010-10-081-2/+2
| | | | | | | | | | | | Move the call to WebViewCore::updateViewport() from HTMLBodyElement and HTMLMetaElement 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: I1a9fd0b545080c9c0d9d26a3e5eb3b986c3986eb
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-22/+28
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-1/+1
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-2/+2
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-14/+24
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Add a special case to handle "wap" style html.Grace Kloba2010-03-231-1/+1
| | | | | | | | If we get here, it is html mimetype, not wap mimetype. Treat the "wap" style like "mobile" style by using device-width as viewport width. Fix http://b/issue?id=2538320
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-0/+2
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-201-110/+8
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* Fix a bunch of layout test crashesAndrei Popescu2009-08-201-10/+12
|
* Merge commit 'goog/master' into mergeAndrei Popescu2009-08-191-1/+9
|\
| * Need to notify Java side when viewport tag is parsed.Grace Kloba2009-08-181-1/+9
| |
* | Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-21/+11
| | | | | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* | Merge WebKit r47420Ben Murdoch2009-08-181-11/+21
| |
* | Merge commit 'goog/master' into mergeBen Murdoch2009-08-181-0/+13
|\ \ | |/ | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp
| * Fix #2058833. For mobile sites, add "width=device-width" if viewport widthGrace Kloba2009-08-171-0/+13
| | | | | | | | is not defined as our default viewport width is 800px now.
* | Merge in WebKit r47029.Ben Murdoch2009-08-111-19/+117
|/
* Get WebKit r44544.Feng Qian2009-06-171-19/+46
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-4/+7
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+303
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-303/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-42/+47
|
* Initial ContributionThe Android Open Source Project2008-10-211-9/+13
|
* external/webkit r30707Upstream1970-01-121-0/+294