DO NOT SUBMIT

Source/WebKit/chromium/src/WebViewImpl.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 96 matching lines @@
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "WebKit.h"
 #include "WebKitClient.h"
 #include "WebMediaPlayerAction.h"
 #include "WebNode.h"
 #include "WebPlugin.h"
 #include "WebPluginContainerImpl.h"
 #include "WebPoint.h"
 #include "WebPopupMenuImpl.h"
+#include "WebRange.h"
 #include "WebRect.h"
 #include "WebRuntimeFeatures.h"
 #include "WebSettingsImpl.h"
 #include "WebString.h"
 #include "WebVector.h"
 #include "WebViewClient.h"
 #include <wtf/ByteArray.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/RefPtr.h>
 
@@ skipping 1216 matching lines @@
         if (text.length())
             editor->confirmComposition(String(text));
         else
             editor->confirmComposition();
     } else
         editor->insertText(String(text), 0);
 
     return true;
 }
 
+WebRange WebViewImpl::compositionRange()
+{
+    Frame* focused = focusedWebCoreFrame();
+    if (!focused || !m_imeAcceptEvents)
+        return WebRange();
+    Editor* editor = focused->editor();
+    if (!editor || !editor->hasComposition())
+        return WebRange();
+    return editor->compositionRange();
+}
+
 WebTextInputType WebViewImpl::textInputType()
 {
     WebTextInputType type = WebTextInputTypeNone;
     const Frame* focused = focusedWebCoreFrame();
     if (!focused)
         return type;
 
     const Editor* editor = focused->editor();
     if (!editor || !editor->canEdit())
         return type;
@@ skipping 40 matching lines @@
     else if (controller->isRange()) {
         node = controller->end().deprecatedNode();
         if (!node || !node->renderer())
             return rect;
         RefPtr<Range> range = controller->toNormalizedRange();
         rect = view->contentsToWindow(focused->editor()->firstRectForRange(range.get()));
     }
     return rect;
 }
 
+WebRange WebViewImpl::caretOrSelectionRange()
+{
+    WebRange range;
+    const Frame* focused = focusedWebCoreFrame();
+    if (!focused)
+        return range;
+
+    SelectionController* controller = focused->selection();
+    if (!controller)
+        return range;
+
+    return controller->toNormalizedRange();
+}
+
 void WebViewImpl::setTextDirection(WebTextDirection direction)
 {
     // The Editor::setBaseWritingDirection() function checks if we can change
     // the text direction of the selected node and updates its DOM "dir"
     // attribute and its CSS "direction" property.
     // So, we just call the function as Safari does.
     const Frame* focused = focusedWebCoreFrame();
     if (!focused)
         return;
 
@@ skipping 1018 matching lines @@
                 m_temporaryOnscreenGraphicsContext3D->reshape(std::max(1, m_size.width), std::max(1, m_size.height));
             context = m_temporaryOnscreenGraphicsContext3D.get();
         }
         return GraphicsContext3DInternal::extractWebGraphicsContext3D(context);
     }
 #endif
     return 0;
 }
 
 } // namespace WebKit