Enabled WebFrameTest, stubbed out a gtk test shell function.

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 107 matching lines @@
 #include "Settings.h"
 #include "SkiaUtils.h"
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
 #include "XPathResult.h"
 
 MSVC_POP_WARNING();
 
 #undef LOG
+#include "base/basictypes.h"
 #include "base/gfx/bitmap_platform_device.h"
 #include "base/gfx/platform_canvas.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/dom_operations.h"
@@ skipping 78 matching lines @@
   RefPtr<Range> range(doc->createRange());
   ExceptionCode exception = 0;
   range->selectNodeContents(doc->body(), exception);
 
   if (exception == 0) {
     // The text iterator will walk nodes giving us text. This is similar to
     // the plainText() function in TextIterator.h, but we implement the maximum
     // size and also copy the results directly into a wstring, avoiding the
     // string conversion.
     for (TextIterator it(range.get()); !it.atEnd(); it.advance()) {
-      const wchar_t* chars = reinterpret_cast<const wchar_t*>(it.characters());
+      const uint16* chars = reinterpret_cast<const uint16*>(it.characters());
       if (!chars) {
         if (it.length() != 0) {
           // It appears from crash reports that an iterator can get into a state
           // where the character count is nonempty but the character pointer is
           // NULL. advance()ing it will then just add that many to the NULL
           // pointer which won't be caught in a NULL check but will crash.
           //
           // A NULL pointer and 0 length is common for some nodes.
           //
           // IF YOU CATCH THIS IN A DEBUGGER please let brettw know. We don't
           // currently understand the conditions for this to occur. Ideally, the
           // iterators would never get into the condition so we should fix them
           // if we can.
           NOTREACHED();
           break;
         }
 
         // Just got a NULL node, we can forge ahead!
         continue;
       }
       int to_append = std::min(it.length(),
                                max_chars - static_cast<int>(output->size()));
-      output->append(chars, to_append);
+      std::wstring wstr;
+      UTF16ToWide(reinterpret_cast<const char16*>(chars), to_append, &wstr);
+      output->append(wstr.c_str(), to_append);
       if (output->size() >= static_cast<size_t>(max_chars))
         return;  // Filled up the buffer.
     }
   }
 
   // Recursively walk the children.
   FrameTree* frame_tree = frame->tree();
   for (Frame* cur_child = frame_tree->firstChild(); cur_child;
        cur_child = cur_child->tree()->nextSibling()) {
     // Make sure the frame separator won't fill up the buffer, and give up if
@@ skipping 1627 matching lines @@
   if (loader) {
     return WebCore::FrameLoadTypeReloadAllowingStaleData ==
            loader->policyLoadType();
   }
   return false;
 }
 
 int WebFrameImpl::PendingFrameUnloadEventCount() const {
   return frame()->eventHandler()->pendingFrameUnloadEventCount();
 }