--- a/org.chromium.debug.core/src/org/chromium/debug/core/model/ChromiumLineBreakpoint.java	Mon Jun 07 16:33:07 2010 -0700
+++ b/org.chromium.debug.core/src/org/chromium/debug/core/model/ChromiumLineBreakpoint.java	Mon Jun 07 16:51:19 2010 -0700
@@ -4,13 +4,21 @@
 
 package org.chromium.debug.core.model;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.chromium.debug.core.ChromiumDebugPlugin;
 import org.chromium.sdk.Breakpoint;
+import org.chromium.sdk.JavascriptVm;
+import org.chromium.sdk.SyncCallback;
+import org.chromium.sdk.JavascriptVm.BreakpointCallback;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.IBreakpointManager;
 import org.eclipse.debug.core.model.IBreakpoint;
 import org.eclipse.debug.core.model.LineBreakpoint;
 import org.eclipse.osgi.util.NLS;
@@ -26,25 +34,14 @@
   /** Condition */
   private static final String CONDITION_ATTR = ChromiumDebugPlugin.PLUGIN_ID + ".condition"; //$NON-NLS-1$
 
-  private Breakpoint browserBreakpoint;
-
   /**
    * Default constructor is required for the breakpoint manager to re-create
    * persisted breakpoints. After instantiating a breakpoint, the setMarker
    * method is called to restore this breakpoint's attributes.
    */
-  // FIXME(apavlov): now this does not restore the browserBreakpoint value
   public ChromiumLineBreakpoint() {
   }
 
-  public void setBreakpoint(Breakpoint breakpoint) {
-    this.browserBreakpoint = breakpoint;
-  }
-
-  public Breakpoint getBrowserBreakpoint() {
-    return browserBreakpoint;
-  }
-
   /**
    * Constructs a line breakpoint on the given resource at the given line number
    * (line number is 1-based).
@@ -53,15 +50,15 @@
    * @param lineNumber 1-based line number of the breakpoint
    * @throws CoreException if unable to create the breakpoint
    */
-  public ChromiumLineBreakpoint(final IResource resource, final int lineNumber)
-      throws CoreException {
+  public ChromiumLineBreakpoint(final IResource resource, final int lineNumber,
+      final String modelId) throws CoreException {
     IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
       public void run(IProgressMonitor monitor) throws CoreException {
         IMarker marker = resource.createMarker(ChromiumDebugPlugin.BP_MARKER);
         setMarker(marker);
         marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE);
         marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
-        marker.setAttribute(IBreakpoint.ID, getModelIdentifier());
+        marker.setAttribute(IBreakpoint.ID, modelId);
         marker.setAttribute(IMarker.MESSAGE, NLS.bind(
             Messages.JsLineBreakpoint_MessageMarkerFormat, resource.getName(), lineNumber));
       }
@@ -104,21 +101,100 @@
   }
 
   public String getModelIdentifier() {
-    return VProjectWorkspaceBridge.DEBUG_MODEL_ID;
+    return getMarker().getAttribute(IBreakpoint.ID, "");
   }
 
-  public void changed() {
-    if (browserBreakpoint != null) {
-      browserBreakpoint.setCondition(getCondition());
-      browserBreakpoint.setEnabled(isEnabled());
-      browserBreakpoint.setIgnoreCount(getIgnoreCount());
-      browserBreakpoint.flush(null);
+  /**
+   * A helper that propagates changes in Eclipse Debugger breakpoints (i.e.
+   * {@link ChromiumLineBreakpoint}) to ChromeDevTools SDK breakpoints. Note that
+   * {@link ChromiumLineBreakpoint} can't do it itself, because it may correspond to several
+   * SDK {@link JavascriptVm}'s simultaneously.
+   */
+  public static class Helper {
+    public interface CreateOnRemoveCallback {
+      void success(Breakpoint breakpoint);
+      void failure(String errorMessage);
+    }
+
+    public static void createOnRemote(ChromiumLineBreakpoint uiBreakpoint,
+        VmResourceId scriptId, DebugTargetImpl debugTarget,
+        final CreateOnRemoveCallback createOnRemoveCallback,
+        SyncCallback syncCallback) throws CoreException {
+      JavascriptVm javascriptVm = debugTarget.getJavascriptEmbedder().getJavascriptVm();
+
+      // ILineBreakpoint lines are 1-based while V8 lines are 0-based
+      final int line = (uiBreakpoint.getLineNumber() - 1);
+      BreakpointCallback callback = new BreakpointCallback() {
+        public void success(Breakpoint sdkBreakpoint) {
+          createOnRemoveCallback.success(sdkBreakpoint);
+        }
+        public void failure(String errorMessage) {
+          createOnRemoveCallback.failure(errorMessage);
+        }
+      };
+
+      javascriptVm.setBreakpoint(scriptId.getTypeForBreakpoint(),
+          scriptId.getTargetForBreakpoint(),
+          line,
+          Breakpoint.EMPTY_VALUE,
+          uiBreakpoint.isEnabled(),
+          uiBreakpoint.getCondition(),
+          uiBreakpoint.getIgnoreCount(),
+          callback, syncCallback);
+    }
+
+    public static void updateOnRemote(Breakpoint sdkBreakpoint,
+        ChromiumLineBreakpoint uiBreakpoint) {
+      sdkBreakpoint.setCondition(uiBreakpoint.getCondition());
+      sdkBreakpoint.setEnabled(uiBreakpoint.isEnabled());
+      sdkBreakpoint.setIgnoreCount(uiBreakpoint.getIgnoreCount());
+      sdkBreakpoint.flush(null, null);
+    }
+
+    public static ChromiumLineBreakpoint createLocal(Breakpoint sdkBreakpoint,
+        IBreakpointManager breakpointManager, IFile resource, int script_line_offset,
+        String debugModelId) throws CoreException {
+      ChromiumLineBreakpoint uiBreakpoint = new ChromiumLineBreakpoint(resource,
+          (int) sdkBreakpoint.getLineNumber() + 1 + script_line_offset,
+          debugModelId);
+      uiBreakpoint.setCondition(sdkBreakpoint.getCondition());
+      uiBreakpoint.setEnabled(sdkBreakpoint.isEnabled());
+      uiBreakpoint.setIgnoreCount(sdkBreakpoint.getIgnoreCount());
+      ignoreList.add(uiBreakpoint);
+      try {
+        breakpointManager.addBreakpoint(uiBreakpoint);
+      } finally {
+        ignoreList.remove(uiBreakpoint);
+      }
+      return uiBreakpoint;
     }
   }
 
-  public void clear() {
-    if (browserBreakpoint != null) {
-      browserBreakpoint.clear(null);
+  private static final BreakpointIgnoreList ignoreList = new BreakpointIgnoreList();
+
+  public static BreakpointIgnoreList getIgnoreList() {
+    return ignoreList;
+  }
+
+  public static class BreakpointIgnoreList {
+    private final List<ChromiumLineBreakpoint> list = new ArrayList<ChromiumLineBreakpoint>(1);
+
+    public boolean contains(IBreakpoint breakpoint) {
+      return list.contains(breakpoint);
+    }
+
+    public void remove(ChromiumLineBreakpoint lineBreakpoint) {
+      boolean res = list.remove(lineBreakpoint);
+      if (!res) {
+        throw new IllegalStateException();
+      }
+    }
+
+    public void add(ChromiumLineBreakpoint lineBreakpoint) {
+      if (list.contains(lineBreakpoint)) {
+        throw new IllegalStateException();
+      }
+      list.add(lineBreakpoint);
     }
   }
 }