summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframeloaderclient_impl.cc
Commit message (Collapse)AuthorAgeFilesLines
* DevTools: Migrate to InspectorController for network and console events.pfeldman@chromium.org2009-05-271-54/+0
| | | | | | | | | | | | | | - introduced bound object on the agent side; - established remote dispatch of WebInspector calls - using fake InspectorFrontend for serializing events and sending them over the ipc - removed net agents from both sides - moved GetResource stuff to tools agent Assumes following is landed: https://bugs.webkit.org/show_bug.cgi?id=26010 Review URL: http://codereview.chromium.org/113836 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16980 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS and fix build bustage. Propagate rename of policyBaseURL -> ↵abarth@chromium.org2009-05-221-10/+0
| | | | | | | | | | | | firstPartyForCookies a bit further. TBR=darin TEST=It complies! BUG=None Review URL: http://codereview.chromium.org/112055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16804 0039d316-1c4b-4281-b951-d872f2087c98
* Roll webkit DEPS and fix compile errors.abarth@chromium.org2009-05-221-3/+4
| | | | | | | | | | TBR=wtc BUG=None TEST=It compiles Review URL: http://codereview.chromium.org/115717 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16784 0039d316-1c4b-4281-b951-d872f2087c98
* Make WebRequest be a wrapper for ResourceRequest instead of FrameLoadRequest.darin@chromium.org2009-05-221-1/+1
| | | | | | | | | | | | | It turns out that no one was ever reading the frameName field, so this change is quite trivial. BUG=10038 TEST=none R=brettw Review URL: http://codereview.chromium.org/115713 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16780 0039d316-1c4b-4281-b951-d872f2087c98
* Move ExtraData from WebRequest to WebDataSource.darin@chromium.org2009-05-211-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a DidCreateDataSource method to WebViewDelegate, which the embedder uses to know if their LoadRequest resulted in a navigation. The embedder then associates the ExtraData with the WebDataSource at that point. The WebDataSource then proceeds to be treated as the provisional data source, possibly failing or being committed. We then inspect WebFrame::GetDataSource in DidCommitLoadForFrame to recover the ExtraData. We have to take care to handle reference fragment navigations since those do not result in a new WebDataSource being created. So, in DidChangeLocationWithinPage, we update the ExtraData associated with the WebDataSource returned by WebFrame::GetDataSource. One thing that is important to note: In DidCommitLoadForFrame, we would previously always inspect the value of GetDataSource returned from the main frame instead of looking at the frame passed to DidCommitLoadForFrame. This explains why WebFrameImpl:: LoadRequest needed to cached ExtraData on the current WebDataSource, and I think doing so is awkward and wrong. My change is to always store the ExtraData on the first WebDataSource to be created as a result of LoadRequest. Then in DidCommitLoadForFrame, I always inspect the ExtraData from the given WebFrame. This means that for history navigations that only navigate a subframe, we'll end up with ExtraData associated with the WebDataSource of a subframe. I think this is OK even though the old code was trying to avoid this scenario. See the DCHECK removed in RenderView::UpdateURL. BUG=11423 R=brettw Review URL: http://codereview.chromium.org/115575 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16580 0039d316-1c4b-4281-b951-d872f2087c98
* Lookup the plugin for the mime type before attempting to open a channel for ↵ananta@chromium.org2009-05-191-3/+0
| | | | | | | | | | | | | | | | | the plugin. This ensures that the plugin will always be instantiated with the correct mime type at all times. Added plugin tests to cover this case where in the embed tag is specified with a URL but without a mime type. Fixes bug http://code.google.com/p/chromium/issues/detail?id=8973 Bug=8973 Test :- Added a plugin test for this case. Review URL: http://codereview.chromium.org/113326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16414 0039d316-1c4b-4281-b951-d872f2087c98
* Re-do r15244 again.darin@chromium.org2009-05-131-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally reviewed at http://codereview.chromium.org/100353 Eliminate webkit/glue/webhistoryitem* in favor of adding a NavigateBackForwardSoon method WebViewDelegate. This moves all of the hacky details of how we intercept "history.{back, forward,go}" into the webkit layer. My eventual plan is to teach WebCore how to make this not hacky. In this version of the CL, TestWebViewDelegate performs the back/forward navigation directly in NavigateBackForwardSoon instead of using PostTask to delay it. I'm doing this to minimize regressions so that I can hopefully get the rest of this CL landed. I also already made the changes to WebKit to force history. {back,forward,go} to be processed asynchronously. Finally, it was necessary to move DumpBackForwardList out of webkit_glue.cc since it was using itemAtIndex to generate those results, and now that we return synthetic URLs for that function, the results were very wrong. The fix is to move DumpBackForwardList into TestShell so that it can more directly inspect the TestNavigationController. Now, it is necessary for webkit_glue.h to expose a function to dump a content state string (aka a WebCore::HistoryItem). BUG=11423 R=mpcomplete Review URL: http://codereview.chromium.org/113328 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15997 0039d316-1c4b-4281-b951-d872f2087c98
* Page global contexts are assigned uniques ids.Script list now contain ↵yurys@google.com2009-05-131-0/+5
| | | | | | | | scripts from the inspected tab only.Also switched DebuggerAgentManager to MessageHandler2 that accepts v8::Debug::Message instead of string. Review URL: http://codereview.chromium.org/115032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15945 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r15940 again. Unexpected layout test failures :(darin@chromium.org2009-05-131-34/+16
| | | | | | | TBR=mpcomplete git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15942 0039d316-1c4b-4281-b951-d872f2087c98
* Re-do r15244 again.darin@chromium.org2009-05-131-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | Originally reviewed at http://codereview.chromium.org/100353 Eliminate webkit/glue/webhistoryitem* in favor of adding a NavigateBackForwardSoon method WebViewDelegate. This moves all of the hacky details of how we intercept "history.{back, forward,go}" into the webkit layer. My eventual plan is to teach WebCore how to make this not hacky. In this version of the CL, TestWebViewDelegate performs the back/forward navigation directly in NavigateBackForwardSoon instead of using PostTask to delay it. I'm doing this to minimize regressions so that I can hopefully get the rest of this CL landed. I also already made the changes to WebKit to force history. {back,forward,go} to be processed asynchronously. BUG=11423 TBR=mpcomplete Review URL: http://codereview.chromium.org/115288 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15940 0039d316-1c4b-4281-b951-d872f2087c98
* There are cases where a Frame may outlive its associated Page. Get thedarin@chromium.org2009-05-061-37/+38
| | | | | | | | | | | | | | | | WebViewImpl by accessing it indirectly through the Frame's Page so that we don't have to worry about cleaning up the WebFrameImpl -> WebViewImpl pointer. WebCore already clears the Frame's Page pointer when the Page is destroyed by the WebViewImpl. Patch by Marshall Greenblatt R=darin Review: http://codereview.chromium.org/99283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15458 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome changes for WebKit merge 43114:43242darin@chromium.org2009-05-051-0/+1
| | | | | | | | R=dglazkov Review URL: http://codereview.chromium.org/109042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15338 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r15278. More unexpected test failures :(darin@chromium.org2009-05-051-34/+16
| | | | | | | | TBR=mpcomplete Review URL: http://codereview.chromium.org/108005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15279 0039d316-1c4b-4281-b951-d872f2087c98
* Re-do r15244: Fix crash in ~TestWebViewDelegate caused bydarin@chromium.org2009-05-051-16/+34
| | | | | | | | | | | | | | | | | | shell_ being null. Moved the RevokeDragDrop call to the TestShell destructor instead. Eliminate webkit/glue/webhistoryitem* in favor of adding a NavigateBackForwardSoon method WebViewDelegate. This moves all of the hacky details of how we intercept "history.{back, forward,go}" into the webkit layer. My eventual plan is to teach WebCore how to make this not hacky. BUG=11423 R=mpcomplete Review URL: http://codereview.chromium.org/108004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15278 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r15244. Failed tests :(darin@chromium.org2009-05-041-34/+16
| | | | | | | | TBR=mpcomplete Review URL: http://codereview.chromium.org/99370 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15246 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate webkit/glue/webhistoryitem* in favor of adding adarin@chromium.org2009-05-041-16/+34
| | | | | | | | | | | | | | NavigateBackForwardSoon method WebViewDelegate. This moves all of the hacky details of how we intercept "history.{back, forward,go}" into the webkit layer. My eventual plan is to teach WebCore how to make this not hacky. BUG=11423 R=mpcomplete Review URL: http://codereview.chromium.org/100353 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15244 0039d316-1c4b-4281-b951-d872f2087c98
* revert r15223 to see if it fixes the security-context-with-base-tag.html crashdarin@chromium.org2009-05-041-5/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15230 0039d316-1c4b-4281-b951-d872f2087c98
* Adds a WillDestroyFrame(WebFrame*) notification method to WebViewDelegate thatdarin@chromium.org2009-05-041-0/+5
| | | | | | | | | | | | | | | | | | gets called from WebFrameLoaderClient::frameLoaderDestroyed(). The Chromium Embedded Framework needs this notification to properly clean up memory associated with specific WebFrame instances (for example, custom NPObject types bound to the WebFrame via BindToWindowObject()). This patch was contributed by Marshall Greenblatt. R=aa,darin Review: http://codereview.chromium.org/99283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15223 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: Support XmlHTTPRequests sniffing.pfeldman@chromium.org2009-05-041-2/+7
| | | | | | Review URL: http://codereview.chromium.org/100262 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15198 0039d316-1c4b-4281-b951-d872f2087c98
* Allow Frame.cpp to be unforked.levin@chromium.org2009-05-011-1/+7
| | | | | | | | | | BUG=11263 TEST=Go to any page and then click on a link to navigate to a new page. Review URL: http://codereview.chromium.org/99263 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15052 0039d316-1c4b-4281-b951-d872f2087c98
* Glue part for the provisional WebKit merge ↵pfeldman@chromium.org2009-05-011-0/+6
| | | | | | | | (https://bugs.webkit.org/show_bug.cgi?id=25347).TBR=yurys Review URL: http://codereview.chromium.org/99274 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15041 0039d316-1c4b-4281-b951-d872f2087c98
* linux: turn on no-op plugins code.evan@chromium.org2009-04-271-0/+14
| | | | | | | | | | | | | | If you don't have any plugins installed, this currently just shows an empty region on the page rather than the default plugin. If you do have plugins installed (and by "installed" I mean "copied into a 'plugins' subdir where your build output is) we now print a lot of NOTIMPLEMENTEDs and hang. Note that we need to #ifdef out some code related to in_process_plugins because we don't have gfx::NativeViewFromId on Linux. Review URL: http://codereview.chromium.org/102001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14646 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unused bits and pieces of #ifdefed code that isn't used.tim@chromium.org2009-04-241-6/+0
| | | | | | Review URL: http://codereview.chromium.org/93042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14402 0039d316-1c4b-4281-b951-d872f2087c98
* - Add a new time marker for loadtimes, the time of the first layoutdavemoore@chromium.org2009-04-211-0/+7
| | | | | | | | | | - Add new histograms for request -> first layout and start load -> first layout - Remove per navigation type histograms. They weren't being used and the logic was getting too complex. Review URL: http://codereview.chromium.org/88015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14100 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a couple of style issues.michaeln@google.com2009-04-171-1/+2
| | | | | | | TBR=darin Review URL: http://codereview.chromium.org/67259 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13978 0039d316-1c4b-4281-b951-d872f2087c98
* Relanding the following revisions.ananta@chromium.org2009-04-131-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r13555 Log: Remove the Activex shim registration for generic Activex controls. The Activex shim only handles windows media player in the wild and will continue to do so for the forseeable future. This fixes http://code.google.com/p/chromium/issues/detail?id=8584, which is basically related to our NPAPI plugin installer not getting instantiated on pages which instantiated flash using an object tag, which would result in webkit attempting to instantiate the activex shim. The shim only loads the windows media player classid, thus causing this issue. Added a test shell test which tests whether the default plugin loaded correctly. This is done by attempting to instantiate a special mime type application/chromium-test-default-plugin, which serves as an indicator to the default plugin to call a function in the page indicating that the test succeeded. I also made a change to ensure that the default plugin is loaded in test_shell_tests. Removed the activexshim dll project from chrome.sln Bug=8584 New Revision: 13558 Log: Removing the Activex shim plugin from the list of default plugins caused some activex shim tests to fail. This basically fails for pages which instantiate the media player like an activex only. To handle this case we attempt to map the clsid to a NPAPI mime type if possible in the shim. If we succeed then the shim is instantiated as an NPAPI plugin as before. It internally loads the media player activex. The other changes are to ensure that the default plugin is only enabled in test_shell for windows for now. Bug=8584 Review URL: http://codereview.chromium.org/72004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13610 0039d316-1c4b-4281-b951-d872f2087c98
* Revert change 13558 and 13555 because they broke the pluginnsylvain@chromium.org2009-04-131-15/+10
| | | | | | | | | | | tests and the test_shell_tests on linux. PLEASE back yourself out when you see you can't fix a bug instead of leaving it red for days. Review URL: http://codereview.chromium.org/67074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13575 0039d316-1c4b-4281-b951-d872f2087c98
* Removing the Activex shim plugin from the list of default plugins caused ↵ananta@chromium.org2009-04-111-10/+15
| | | | | | | | some activex shim tests to fail. This basically fails for pages which instantiate the media player like an activex only. To handle this case we attempt to map the clsid to a NPAPI mime type if possible in the shim. If we succeed then the shim is instantiated as an NPAPI plugin as before. It internally loads the media player activex. Review URL: http://codereview.chromium.org/66072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13558 0039d316-1c4b-4281-b951-d872f2087c98
* Adds new messages and widens some existing messages between the renderer and ↵michaeln@google.com2009-04-071-1/+5
| | | | | | | | browser processes to support an implementation of the HTML5AppCache spec with most of the logic running in the browser process. The gist of most of the changes are to indicate which frame each resource request is coming from, and to indicate which appcache each response was retrieved from (if any).See https://docs.google.com/a/google.com/Doc?docid=agv6ghfsqr_15f749cgt3&hl=en Review URL: http://codereview.chromium.org/9712 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13258 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: Glue part for the 'attach early' functionality.pfeldman@chromium.org2009-04-061-6/+9
| | | | | | | | | - Establish 2 main scenarios for attach: 'attach to live' and 'start attached' - Make WebFrameLoaderImpl call setMainFrameDocumentReady only for main frame document. Review URL: http://codereview.chromium.org/62038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13154 0039d316-1c4b-4281-b951-d872f2087c98
* - Added support for keeping track of load times.davemoore@chromium.org2009-04-031-21/+30
| | | | | | | | | | | | | | | | | For each document loaded we record the time the page was requested by the user (or as close as we can get to that), the time the load process started, the time the document and it's dependent resources (scripts) have been loaded (before onload()) and the time all the document's resources have been loaded. We use this data for two things: 1) We histogram the deltas between the time marks 2) We expose the times to javascript running on the page which was loaded Review URL: http://codereview.chromium.org/42527 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13116 0039d316-1c4b-4281-b951-d872f2087c98
* An empty MIME type doesn't match any plugin, no matter what they may claim.pam@chromium.org2009-04-021-1/+1
| | | | | | | | | | BUG=9549 TEST=install Silverlight, 'run_webkit_tests.sh --force LayoutTests/webarchive/loading', see no crashes (timeouts are OK) Review URL: http://codereview.chromium.org/60021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13051 0039d316-1c4b-4281-b951-d872f2087c98
* Switch the new tab key to command on the Mac. Popping new tabs still doesn't ↵avi@google.com2009-04-011-3/+7
| | | | | | | | | | work, but this is a step. BUG=9417 Review URL: http://codereview.chromium.org/56150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12956 0039d316-1c4b-4281-b951-d872f2087c98
* Make DevTools client survive 'refresh' of the inspectable tab.pfeldman@chromium.org2009-03-261-0/+5
| | | | | | Review URL: http://codereview.chromium.org/54002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12541 0039d316-1c4b-4281-b951-d872f2087c98
* Get rid of stashing a frame pointer with ResourceRequest and just store the ↵jam@chromium.org2009-03-161-6/+14
| | | | | | | | routing id directly. This simplifies the renderer code and also allow this code to be used in worker processes, where we don't have a frame. Review URL: http://codereview.chromium.org/46026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11763 0039d316-1c4b-4281-b951-d872f2087c98
* Wire DevTools agent in the Glue to the Renderer DevTools IPC transport: ↵pfeldman@chromium.org2009-03-161-9/+65
| | | | | | | | | | | | DevToolsAgent now implements WebDevToolsAgentDelegate, DevToolsClient covers WebDevToolsClientDelegate. WebDevToolsAgent instance is being created by the WebView early in the init code and belongs to it. WebView exposes interface for accessing the agent; it also extends its delegate interface to pass WebDevToolsAgentDelegate into it. Note that there is no call overhead unless particular sub-agents are enabled in the WebDevToolsAgent. WebDevToolsClient instance is being created externally by the DevToolsClient. Review URL: http://codereview.chromium.org/46032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11752 0039d316-1c4b-4281-b951-d872f2087c98
* Merge WebDocumentLoaderImpl into WebDataSourceImpl. They are peers, and it isdarin@chromium.org2009-03-131-18/+9
| | | | | | | | | | | | | really silly to have them be separate classes. I chose to eliminate WebDocumentLoaderImpl in favor of WebDataSourceImpl since the interface that the outside world sees is named WebDataSource. R=dglazkov Review URL: http://codereview.chromium.org/46028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11637 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 41498:41530.ericroman@google.com2009-03-101-1/+3
| | | | | | Review URL: http://codereview.chromium.org/41017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11312 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes CRLF and trailing white spaces.maruel@chromium.org2009-03-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10982 0039d316-1c4b-4281-b951-d872f2087c98
* Add early-injection capability to user scripts.aa@chromium.org2009-02-141-2/+4
| | | | | | Review URL: http://codereview.chromium.org/19624 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9822 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land the WebKit merge 40722:40785.darin@chromium.org2009-02-101-1/+1
| | | | | | | | TBR=amanda Review URL: http://codereview.chromium.org/21197 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9462 0039d316-1c4b-4281-b951-d872f2087c98
* Rollback WebKit merge since background images don't paint.darin@chromium.org2009-02-091-1/+1
| | | | | | | | TBR=amanda Review URL: http://codereview.chromium.org/21193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9434 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 40722:40785 (part 2)darin@chromium.org2009-02-091-1/+1
| | | | | | | | | Account for the renaming of toRange to toNormalizedRange done by Eric Seidel. R=amanda Review URL: http://codereview.chromium.org/20192 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9427 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 9394.ojan@google.com2009-02-091-0/+5
| | | | | | | Relanding merge for the third time. Darin will fix mac build. Review URL: http://codereview.chromium.org/20183 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9395 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 9393.ojan@google.com2009-02-091-5/+0
| | | | | | | Merge still broken on a mac clobber build. Review URL: http://codereview.chromium.org/20182 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9394 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 9383.ojan@google.com2009-02-091-0/+5
| | | | | | | Try again to land webkit merge. Review URL: http://codereview.chromium.org/21173 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9393 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 9380,9379,9378.ojan@google.com2009-02-091-5/+0
| | | | | | | Reverting merge. Mac build mysteriously broken Review URL: http://codereview.chromium.org/21164 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9383 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 40668:40722 part 2.ojan@google.com2009-02-091-0/+5
| | | | | | Review URL: http://codereview.chromium.org/20151 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9380 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 40500:40539 [Chromium side]levin@chromium.org2009-02-051-0/+3
| | | | | | | | | All code fix ups were due to r40508 which "Track redirects in global history." Review URL: http://codereview.chromium.org/20077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9214 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit merge 40474:40500 [chromium-side].ericroman@google.com2009-02-041-9/+11
| | | | | | Review URL: http://codereview.chromium.org/21029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9121 0039d316-1c4b-4281-b951-d872f2087c98