Merge 78548 - 2011-02-15 Gavin Peters <gavinp@chromium.org>...

Source/WebCore/inspector/InspectorResourceAgent.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 85 matching lines @@
 bool InspectorResourceAgent::resourceContentBase64(Frame* frame, const KURL& url, String* result)
 {
     Vector<char> out;
     String textEncodingName;
     RefPtr<SharedBuffer> data = InspectorResourceAgent::resourceData(frame, url, &textEncodingName);
     if (!data) {
         *result = String();
         return false;
     }
 
-    base64Encode(data->buffer(), out);
+    base64Encode(data->data(), data->size(), out);
     *result = String(out.data(), out.size());
     return true;
 }
 
 PassRefPtr<SharedBuffer> InspectorResourceAgent::resourceData(Frame* frame, const KURL& url, String* textEncodingName)
 {
     FrameLoader* frameLoader = frame->loader();
     DocumentLoader* loader = frameLoader->documentLoader();
     if (equalIgnoringFragmentIdentifier(url, loader->url())) {
         *textEncodingName = frame->document()->inputEncoding();
@@ skipping 372 matching lines @@
     : m_page(page)
     , m_state(state)
     , m_frontend(frontend)
 {
     m_state->setBoolean(InspectorState::resourceAgentEnabled, true);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)