summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLMetaElement.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash with meta data settingsPatrick Scott2010-12-131-0/+1
| | | | | Bug: 3275740 Change-Id: I6a65bdd52a3d044ee9a18c690930ca884a1baec1
* 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 r62496: Initial merge by gitSteve Block2010-07-091-25/+0
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-1/+1
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-301-0/+14
| | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-081-5/+6
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-2/+2
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+10
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Handle another old style meta tag, MobileOptimized. Also if the sites setGrace Kloba2009-09-041-2/+3
| | | | | | the width for the viewport to be less than 320, just use device-width. Fix http://b/issue?id=2098078
* Need to notify Java side when viewport tag is parsed.Grace Kloba2009-08-181-3/+17
|
* Fix #2058833. For mobile sites, add "width=device-width" if viewport widthGrace Kloba2009-08-171-0/+8
| | | | is not defined as our default viewport width is 800px now.
* Get WebKit r44544.Feng Qian2009-06-171-0/+2
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-4/+3
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+117
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-117/+0
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+6
|
* external/webkit r30707Upstream1970-01-121-0/+111
generated by cgit v1.1 at 2025-06-10 07:07:49 +0000