Changeset 32523 in webkit

Timestamp:

Apr 24, 2008 4:20:16 PM (16 years ago)

Author:

mitz@apple.com

Message:

WebKit/gtk:

• build fix

• webkit/webkitwebview.cpp:

WebKit/win:

• build fix

• WebView.cpp: (WebView::handleContextMenuEvent):

Location:

trunk/WebKit

Files:

• gtk/ChangeLog (modified) (1 diff)
• gtk/webkit/webkitwebview.cpp (modified) (1 diff)
• win/ChangeLog (modified) (1 diff)
• win/WebView.cpp (modified) (1 diff)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-04-24  Dan Bernstein  <mitz@apple.com>
+
+        - build fix
+
+        * webkit/webkitwebview.cpp:
+
 2008-04-24  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -174 +174 @@
         // Calculate the rect of the first line of the selection (cribbed from -[WebCoreFrameBridge firstRectForDOMRange:]).
         int extraWidthToEndOfLine = 0;
-        IntRect startCaretRect = renderer->caretRect(start.offset(), DOWNSTREAM, &extraWidthToEndOfLine);
-        IntRect endCaretRect = renderer->caretRect(end.offset(), UPSTREAM);
+
+        InlineBox* startInlineBox;
+        int startCaretOffset;
+        start.getInlineBoxAndOffset(DOWNSTREAM, startInlineBox, startCaretOffset);
+        IntRect startCaretRect = renderer->caretRect(startInlineBox, startCaretOffset, &extraWidthToEndOfLine);
+
+        InlineBox* endInlineBox;
+        int endCaretOffset;
+        end.getInlineBoxAndOffset(UPSTREAM, endInlineBox, endCaretOffset);
+        IntRect endCaretRect = renderer->caretRect(endInlineBox, endCaretOffset);
 
         IntRect firstRect;

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2008-04-24  Dan Bernstein  <mitz@apple.com>
+
+        - build fix
+
+        * WebView.cpp:
+        (WebView::handleContextMenuEvent):
+
 2008-04-24  Brady Eidson  <beidson@apple.com>
 

trunk/WebKit/win/WebView.cpp

@@ -1024 +1024 @@
             // Calculate the rect of the first line of the selection (cribbed from -[WebCoreFrameBridge firstRectForDOMRange:]).
             int extraWidthToEndOfLine = 0;
-            IntRect startCaretRect = renderer->caretRect(start.offset(), DOWNSTREAM, &extraWidthToEndOfLine);
-            IntRect endCaretRect = renderer->caretRect(end.offset(), UPSTREAM);
+
+            InlineBox* startInlineBox;
+            int startCaretOffset;
+            start.getInlineBoxAndOffset(DOWNSTREAM, startInlineBox, startCaretOffset);
+            IntRect startCaretRect = renderer->caretRect(startInlineBox, startCaretOffset, &extraWidthToEndOfLine);
+
+            InlineBox* endInlineBox;
+            int endCaretOffset;
+            end.getInlineBoxAndOffset(UPSTREAM, endInlineBox, endCaretOffset);
+            IntRect endCaretRect = renderer->caretRect(endInlineBox, endCaretOffset);
 
             IntRect firstRect;